From 93d3e5b1bf523d28335621945b0496b6df7f3ffa Mon Sep 17 00:00:00 2001 From: Steven Bennetts Date: Sat, 5 May 2018 01:14:50 +0000 Subject: [PATCH] Move ash_constants.h to ash/public This also converts everything to inlined constexpr. Bug: 798569 Change-Id: Ia5f026a2e30b8a590e761860d063d42cfdf54bbc Reviewed-on: https://chromium-review.googlesource.com/1043647 Reviewed-by: James Cook Reviewed-by: Michael Wasserman Commit-Queue: Michael Wasserman Cr-Commit-Position: refs/heads/master@{#556284} --- ash/BUILD.gn | 2 -- ash/accessibility/accessibility_controller.h | 2 +- .../accessibility_controller_unittest.cc | 2 +- ash/ash_constants.cc | 21 ----------------- ash/autoclick/autoclick_controller.cc | 3 +-- ash/autoclick/autoclick_controller.h | 4 ---- .../autoclick/autoclick_application.cc | 11 +++------ ash/display/cursor_window_controller.cc | 2 +- ash/display/cursor_window_controller.h | 2 +- .../caption_buttons/frame_caption_button.cc | 2 +- ash/frame/frame_border_hit_test.cc | 2 +- ash/login/ui/login_bubble.cc | 2 +- ash/login/ui/login_button.cc | 2 +- ash/login/ui/login_pin_view.cc | 2 +- ash/login/ui/login_user_view.cc | 2 +- ash/public/cpp/BUILD.gn | 1 + ash/{ => public/cpp}/ash_constants.h | 23 ++++++++++--------- ash/root_window_controller.cc | 2 +- ash/shelf/login_shelf_view.cc | 2 +- ash/shelf/shelf_button.cc | 2 +- ash/shelf/shelf_view.cc | 2 +- ash/shell.cc | 2 +- ash/system/ime_menu/ime_menu_tray.cc | 2 +- ash/system/tray/actionable_view.cc | 2 +- ash/system/tray/system_menu_button.cc | 2 +- ash/system/tray/tray_background_view.cc | 2 +- ash/system/tray/tray_popup_utils.cc | 2 +- ash/system/user/button_from_view.cc | 2 +- ash/wm/non_client_frame_controller.cc | 2 +- ash/wm/resize_handle_window_targeter.cc | 2 +- ash/wm/resize_shadow_and_cursor_unittest.cc | 2 +- ash/wm/splitview/split_view_divider.cc | 2 +- ash/wm/window_util.cc | 2 +- ...multi_window_resize_controller_unittest.cc | 2 +- chrome/browser/chromeos/preferences.cc | 7 ++---- ...chrome_native_app_window_views_aura_ash.cc | 2 +- .../browser_non_client_frame_view_ash.cc | 2 +- ...r_non_client_frame_view_ash_browsertest.cc | 2 +- 38 files changed, 49 insertions(+), 83 deletions(-) delete mode 100644 ash/ash_constants.cc rename ash/{ => public/cpp}/ash_constants.h (63%) diff --git a/ash/BUILD.gn b/ash/BUILD.gn index cde1f9b2ba679b..d1da1f068229bd 100644 --- a/ash/BUILD.gn +++ b/ash/BUILD.gn @@ -92,8 +92,6 @@ component("ash") { "app_list/app_list_presenter_impl.h", "app_list/app_list_view_delegate_mash.cc", "app_list/app_list_view_delegate_mash.h", - "ash_constants.cc", - "ash_constants.h", "ash_export.h", "ash_layout_constants.cc", "ash_layout_constants.h", diff --git a/ash/accessibility/accessibility_controller.h b/ash/accessibility/accessibility_controller.h index c49d1eddb73a75..1a9edb7537455c 100644 --- a/ash/accessibility/accessibility_controller.h +++ b/ash/accessibility/accessibility_controller.h @@ -7,8 +7,8 @@ #include -#include "ash/ash_constants.h" #include "ash/ash_export.h" +#include "ash/public/cpp/ash_constants.h" #include "ash/public/interfaces/accessibility_controller.mojom.h" #include "ash/session/session_observer.h" #include "base/macros.h" diff --git a/ash/accessibility/accessibility_controller_unittest.cc b/ash/accessibility/accessibility_controller_unittest.cc index 5888d253ac5fbf..e29d7955d3b2d3 100644 --- a/ash/accessibility/accessibility_controller_unittest.cc +++ b/ash/accessibility/accessibility_controller_unittest.cc @@ -8,8 +8,8 @@ #include "ash/accessibility/accessibility_observer.h" #include "ash/accessibility/test_accessibility_controller_client.h" -#include "ash/ash_constants.h" #include "ash/magnifier/docked_magnifier_controller.h" +#include "ash/public/cpp/ash_constants.h" #include "ash/public/cpp/ash_features.h" #include "ash/public/cpp/ash_pref_names.h" #include "ash/public/cpp/config.h" diff --git a/ash/ash_constants.cc b/ash/ash_constants.cc deleted file mode 100644 index 07ca148301aee2..00000000000000 --- a/ash/ash_constants.cc +++ /dev/null @@ -1,21 +0,0 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#include "ash/ash_constants.h" - -#include "third_party/skia/include/core/SkColor.h" -#include "ui/gfx/color_palette.h" - -namespace ash { - -const int kResizeAreaCornerSize = 16; -const int kResizeOutsideBoundsSize = 6; -const int kResizeOutsideBoundsScaleForTouch = 5; -const int kResizeInsideBoundsSize = 1; - -const SkColor kChromeOsBootColor = SkColorSetRGB(0xfe, 0xfe, 0xfe); - -const int kDefaultLargeCursorSize = 64; - -} // namespace ash diff --git a/ash/autoclick/autoclick_controller.cc b/ash/autoclick/autoclick_controller.cc index c7be010d77eea7..020f0cb55da305 100644 --- a/ash/autoclick/autoclick_controller.cc +++ b/ash/autoclick/autoclick_controller.cc @@ -6,6 +6,7 @@ #include "ash/autoclick/common/autoclick_controller_common.h" #include "ash/autoclick/common/autoclick_controller_common_delegate.h" +#include "ash/public/cpp/ash_constants.h" #include "ash/public/cpp/shell_window_ids.h" #include "ash/shell.h" #include "ash/wm/root_window_finder.h" @@ -26,8 +27,6 @@ base::TimeDelta AutoclickController::GetDefaultAutoclickDelay() { return base::TimeDelta::FromMilliseconds(int64_t{kDefaultAutoclickDelayMs}); } -const int AutoclickController::kDefaultAutoclickDelayMs = 1000; - class AutoclickControllerImpl : public AutoclickController, public ui::EventHandler, public AutoclickControllerCommonDelegate, diff --git a/ash/autoclick/autoclick_controller.h b/ash/autoclick/autoclick_controller.h index 3c99b30bdf53ba..5b64af5e11d810 100644 --- a/ash/autoclick/autoclick_controller.h +++ b/ash/autoclick/autoclick_controller.h @@ -30,10 +30,6 @@ class ASH_EXPORT AutoclickController { static AutoclickController* CreateInstance(); - // The default wait time between last mouse movement and sending - // the autoclick. - static const int kDefaultAutoclickDelayMs; - // Gets the default wait time as a base::TimeDelta object. static base::TimeDelta GetDefaultAutoclickDelay(); diff --git a/ash/components/autoclick/autoclick_application.cc b/ash/components/autoclick/autoclick_application.cc index b4219f2743a2ea..5f5ba8e2ebdeba 100644 --- a/ash/components/autoclick/autoclick_application.cc +++ b/ash/components/autoclick/autoclick_application.cc @@ -6,6 +6,7 @@ #include +#include "ash/public/cpp/ash_constants.h" #include "ash/public/cpp/shell_window_ids.h" #include "base/bind_helpers.h" #include "base/macros.h" @@ -29,13 +30,6 @@ #include "ui/views/widget/widget_delegate.h" namespace autoclick { -namespace { - -// The default wait time between last mouse movement and sending -// the autoclick. -const int kDefaultAutoclickDelayMs = 1000; - -} // namespace // AutoclickUI handles events to the autoclick app. class AutoclickUI : public views::WidgetDelegateView, @@ -110,7 +104,8 @@ void AutoclickApplication::OnStart() { } autoclick_controller_common_ = std::make_unique( - base::TimeDelta::FromMilliseconds(kDefaultAutoclickDelayMs), this); + base::TimeDelta::FromMilliseconds(ash::kDefaultAutoclickDelayMs), + this); } void AutoclickApplication::OnBindInterface( diff --git a/ash/display/cursor_window_controller.cc b/ash/display/cursor_window_controller.cc index d7aa1a6395e1eb..b028491a925cf2 100644 --- a/ash/display/cursor_window_controller.cc +++ b/ash/display/cursor_window_controller.cc @@ -4,12 +4,12 @@ #include "ash/display/cursor_window_controller.h" -#include "ash/ash_constants.h" #include "ash/components/cursor/cursor_view.h" #include "ash/display/display_color_manager.h" #include "ash/display/mirror_window_controller.h" #include "ash/display/window_tree_host_manager.h" #include "ash/magnifier/magnification_controller.h" +#include "ash/public/cpp/ash_constants.h" #include "ash/public/cpp/ash_pref_names.h" #include "ash/public/cpp/ash_switches.h" #include "ash/public/cpp/shell_window_ids.h" diff --git a/ash/display/cursor_window_controller.h b/ash/display/cursor_window_controller.h index 3cbf6dc8d89c5e..9b1c6ce881da1c 100644 --- a/ash/display/cursor_window_controller.h +++ b/ash/display/cursor_window_controller.h @@ -7,8 +7,8 @@ #include -#include "ash/ash_constants.h" #include "ash/ash_export.h" +#include "ash/public/cpp/ash_constants.h" #include "base/macros.h" #include "ui/aura/window.h" #include "ui/base/cursor/cursor.h" diff --git a/ash/frame/caption_buttons/frame_caption_button.cc b/ash/frame/caption_buttons/frame_caption_button.cc index fe6c13e97ba9fd..d357ba738f9029 100644 --- a/ash/frame/caption_buttons/frame_caption_button.cc +++ b/ash/frame/caption_buttons/frame_caption_button.cc @@ -4,7 +4,7 @@ #include "ash/frame/caption_buttons/frame_caption_button.h" -#include "ash/ash_constants.h" +#include "ash/public/cpp/ash_constants.h" #include "ui/gfx/animation/slide_animation.h" #include "ui/gfx/animation/throb_animation.h" #include "ui/gfx/canvas.h" diff --git a/ash/frame/frame_border_hit_test.cc b/ash/frame/frame_border_hit_test.cc index d174386dbf27b4..d3cf03b1649e25 100644 --- a/ash/frame/frame_border_hit_test.cc +++ b/ash/frame/frame_border_hit_test.cc @@ -4,8 +4,8 @@ #include "ash/frame/frame_border_hit_test.h" -#include "ash/ash_constants.h" #include "ash/frame/caption_buttons/frame_caption_button_container_view.h" +#include "ash/public/cpp/ash_constants.h" #include "ash/shell_port.h" #include "ui/base/hit_test.h" #include "ui/views/widget/widget.h" diff --git a/ash/login/ui/login_bubble.cc b/ash/login/ui/login_bubble.cc index ed4da725b08455..b804f7f211a7ee 100644 --- a/ash/login/ui/login_bubble.cc +++ b/ash/login/ui/login_bubble.cc @@ -7,7 +7,6 @@ #include #include -#include "ash/ash_constants.h" #include "ash/focus_cycler.h" #include "ash/login/ui/layout_util.h" #include "ash/login/ui/lock_screen.h" @@ -15,6 +14,7 @@ #include "ash/login/ui/login_button.h" #include "ash/login/ui/login_menu_view.h" #include "ash/login/ui/non_accessible_view.h" +#include "ash/public/cpp/ash_constants.h" #include "ash/resources/vector_icons/vector_icons.h" #include "ash/shell.h" #include "ash/strings/grit/ash_strings.h" diff --git a/ash/login/ui/login_button.cc b/ash/login/ui/login_button.cc index bea98effc2d406..9b1ae0f3e1ab1a 100644 --- a/ash/login/ui/login_button.cc +++ b/ash/login/ui/login_button.cc @@ -4,7 +4,7 @@ #include "ash/login/ui/login_button.h" -#include "ash/ash_constants.h" +#include "ash/public/cpp/ash_constants.h" #include "ui/views/animation/flood_fill_ink_drop_ripple.h" #include "ui/views/animation/ink_drop_highlight.h" #include "ui/views/animation/ink_drop_impl.h" diff --git a/ash/login/ui/login_pin_view.cc b/ash/login/ui/login_pin_view.cc index 443a5bd1909818..eec6593062b02d 100644 --- a/ash/login/ui/login_pin_view.cc +++ b/ash/login/ui/login_pin_view.cc @@ -6,8 +6,8 @@ #include -#include "ash/ash_constants.h" #include "ash/login/ui/login_button.h" +#include "ash/public/cpp/ash_constants.h" #include "ash/public/cpp/login_constants.h" #include "ash/resources/vector_icons/vector_icons.h" #include "ash/strings/grit/ash_strings.h" diff --git a/ash/login/ui/login_user_view.cc b/ash/login/ui/login_user_view.cc index 59aa0c5b83f7d5..3b3f768f5f0bef 100644 --- a/ash/login/ui/login_user_view.cc +++ b/ash/login/ui/login_user_view.cc @@ -6,7 +6,6 @@ #include -#include "ash/ash_constants.h" #include "ash/login/ui/animated_rounded_image_view.h" #include "ash/login/ui/hover_notifier.h" #include "ash/login/ui/image_parser.h" @@ -15,6 +14,7 @@ #include "ash/login/ui/login_button.h" #include "ash/login/ui/non_accessible_view.h" #include "ash/login/ui/user_switch_flip_animation.h" +#include "ash/public/cpp/ash_constants.h" #include "ash/public/cpp/login_constants.h" #include "ash/public/interfaces/user_info.mojom.h" #include "ash/resources/vector_icons/vector_icons.h" diff --git a/ash/public/cpp/BUILD.gn b/ash/public/cpp/BUILD.gn index 455bbdf0c761b1..11df2f35661067 100644 --- a/ash/public/cpp/BUILD.gn +++ b/ash/public/cpp/BUILD.gn @@ -30,6 +30,7 @@ component("cpp") { "app_list/tokenized_string_match.cc", "app_list/tokenized_string_match.h", "app_types.h", + "ash_constants.h", "ash_features.cc", "ash_features.h", "ash_pref_names.cc", diff --git a/ash/ash_constants.h b/ash/public/cpp/ash_constants.h similarity index 63% rename from ash/ash_constants.h rename to ash/public/cpp/ash_constants.h index fc30becc72ae03..0c429737269dac 100644 --- a/ash/ash_constants.h +++ b/ash/public/cpp/ash_constants.h @@ -2,10 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef ASH_ASH_CONSTANTS_H_ -#define ASH_ASH_CONSTANTS_H_ - -#include "ash/ash_export.h" +#ifndef ASH_PUBLIC_CPP_ASH_CONSTANTS_H_ +#define ASH_PUBLIC_CPP_ASH_CONSTANTS_H_ #include "third_party/skia/include/core/SkColor.h" @@ -15,25 +13,28 @@ namespace ash { // In the window corners, the resize areas don't actually expand bigger, but the // 16 px at the end of each edge triggers diagonal resizing. -ASH_EXPORT extern const int kResizeAreaCornerSize; +constexpr int kResizeAreaCornerSize = 16; // Ash windows do not have a traditional visible window frame. Window content // extends to the edge of the window. We consider a small region outside the // window bounds and an even smaller region overlapping the window to be the // "non-client" area and use it for resizing. -ASH_EXPORT extern const int kResizeOutsideBoundsSize; -ASH_EXPORT extern const int kResizeOutsideBoundsScaleForTouch; -ASH_EXPORT extern const int kResizeInsideBoundsSize; +constexpr int kResizeOutsideBoundsSize = 6; +constexpr int kResizeOutsideBoundsScaleForTouch = 5; +constexpr int kResizeInsideBoundsSize = 1; // Background color used for the Chrome OS boot splash screen. -extern const SkColor kChromeOsBootColor; +constexpr SkColor kChromeOsBootColor = SkColorSetRGB(0xfe, 0xfe, 0xfe); // The border color of keyboard focus for launcher items and system tray. constexpr SkColor kFocusBorderColor = SK_ColorTRANSPARENT; constexpr int kFocusBorderThickness = 0; -ASH_EXPORT extern const int kDefaultLargeCursorSize; +constexpr int kDefaultLargeCursorSize = 64; + +// The default wait time between last mouse movement and sending autoclick. +constexpr int kDefaultAutoclickDelayMs = 1000; } // namespace ash -#endif // ASH_ASH_CONSTANTS_H_ +#endif // ASH_PUBLIC_CPP_ASH_CONSTANTS_H_ diff --git a/ash/root_window_controller.cc b/ash/root_window_controller.cc index c25651585fdd41..9f297a2c045784 100644 --- a/ash/root_window_controller.cc +++ b/ash/root_window_controller.cc @@ -12,12 +12,12 @@ #include "ash/accessibility/accessibility_panel_layout_manager.h" #include "ash/accessibility/touch_exploration_controller.h" #include "ash/accessibility/touch_exploration_manager.h" -#include "ash/ash_constants.h" #include "ash/focus_cycler.h" #include "ash/high_contrast/high_contrast_controller.h" #include "ash/host/ash_window_tree_host.h" #include "ash/lock_screen_action/lock_screen_action_background_controller.h" #include "ash/login_status.h" +#include "ash/public/cpp/ash_constants.h" #include "ash/public/cpp/ash_switches.h" #include "ash/public/cpp/config.h" #include "ash/public/cpp/shelf_types.h" diff --git a/ash/shelf/login_shelf_view.cc b/ash/shelf/login_shelf_view.cc index b6cd2945c1999a..afb06513a02e21 100644 --- a/ash/shelf/login_shelf_view.cc +++ b/ash/shelf/login_shelf_view.cc @@ -7,13 +7,13 @@ #include #include -#include "ash/ash_constants.h" #include "ash/focus_cycler.h" #include "ash/lock_screen_action/lock_screen_action_background_controller.h" #include "ash/lock_screen_action/lock_screen_action_background_state.h" #include "ash/login/login_screen_controller.h" #include "ash/login/ui/lock_screen.h" #include "ash/login/ui/lock_window.h" +#include "ash/public/cpp/ash_constants.h" #include "ash/resources/vector_icons/vector_icons.h" #include "ash/root_window_controller.h" #include "ash/session/session_controller.h" diff --git a/ash/shelf/shelf_button.cc b/ash/shelf/shelf_button.cc index afddd54a157f02..95b555d676c436 100644 --- a/ash/shelf/shelf_button.cc +++ b/ash/shelf/shelf_button.cc @@ -7,7 +7,7 @@ #include #include -#include "ash/ash_constants.h" +#include "ash/public/cpp/ash_constants.h" #include "ash/shelf/ink_drop_button_listener.h" #include "ash/shelf/shelf.h" #include "ash/shelf/shelf_constants.h" diff --git a/ash/shelf/shelf_view.cc b/ash/shelf/shelf_view.cc index 185fe6348e1268..2e6d3e6736f361 100644 --- a/ash/shelf/shelf_view.cc +++ b/ash/shelf/shelf_view.cc @@ -7,9 +7,9 @@ #include #include -#include "ash/ash_constants.h" #include "ash/drag_drop/drag_image_view.h" #include "ash/metrics/user_metrics_recorder.h" +#include "ash/public/cpp/ash_constants.h" #include "ash/public/cpp/shelf_item_delegate.h" #include "ash/public/cpp/shelf_model.h" #include "ash/scoped_root_window_for_new_windows.h" diff --git a/ash/shell.cc b/ash/shell.cc index 7115bb5913a632..fda0577f6edae8 100644 --- a/ash/shell.cc +++ b/ash/shell.cc @@ -19,7 +19,6 @@ #include "ash/accessibility/accessibility_focus_ring_controller.h" #include "ash/accessibility/key_accessibility_enabler.h" #include "ash/app_list/app_list_controller_impl.h" -#include "ash/ash_constants.h" #include "ash/assistant/ash_assistant_controller.h" #include "ash/autoclick/autoclick_controller.h" #include "ash/cast_config_controller.h" @@ -66,6 +65,7 @@ #include "ash/multi_device_setup/multi_device_notification_presenter.h" #include "ash/new_window_controller.h" #include "ash/note_taking_controller.h" +#include "ash/public/cpp/ash_constants.h" #include "ash/public/cpp/ash_features.h" #include "ash/public/cpp/ash_switches.h" #include "ash/public/cpp/config.h" diff --git a/ash/system/ime_menu/ime_menu_tray.cc b/ash/system/ime_menu/ime_menu_tray.cc index 3bb44a8a337842..562517dbcf4d41 100644 --- a/ash/system/ime_menu/ime_menu_tray.cc +++ b/ash/system/ime_menu/ime_menu_tray.cc @@ -5,8 +5,8 @@ #include "ash/system/ime_menu/ime_menu_tray.h" #include "ash/accessibility/accessibility_controller.h" -#include "ash/ash_constants.h" #include "ash/ime/ime_controller.h" +#include "ash/public/cpp/ash_constants.h" #include "ash/root_window_controller.h" #include "ash/session/session_controller.h" #include "ash/shelf/shelf.h" diff --git a/ash/system/tray/actionable_view.cc b/ash/system/tray/actionable_view.cc index 93b54129dce178..65e4b0fa11cd8b 100644 --- a/ash/system/tray/actionable_view.cc +++ b/ash/system/tray/actionable_view.cc @@ -4,7 +4,7 @@ #include "ash/system/tray/actionable_view.h" -#include "ash/ash_constants.h" +#include "ash/public/cpp/ash_constants.h" #include "ash/system/tray/system_tray.h" #include "ash/system/tray/system_tray_item.h" #include "ash/system/tray/tray_constants.h" diff --git a/ash/system/tray/system_menu_button.cc b/ash/system/tray/system_menu_button.cc index e45756a5a78a3a..7ec1b44550eeb9 100644 --- a/ash/system/tray/system_menu_button.cc +++ b/ash/system/tray/system_menu_button.cc @@ -4,7 +4,7 @@ #include "ash/system/tray/system_menu_button.h" -#include "ash/ash_constants.h" +#include "ash/public/cpp/ash_constants.h" #include "ash/public/cpp/ash_features.h" #include "ash/system/tray/system_tray.h" #include "ash/system/tray/tray_constants.h" diff --git a/ash/system/tray/tray_background_view.cc b/ash/system/tray/tray_background_view.cc index 3cc18625f2d567..7852b9e5e964e8 100644 --- a/ash/system/tray/tray_background_view.cc +++ b/ash/system/tray/tray_background_view.cc @@ -7,10 +7,10 @@ #include #include -#include "ash/ash_constants.h" #include "ash/focus_cycler.h" #include "ash/login/ui/lock_screen.h" #include "ash/login/ui/lock_window.h" +#include "ash/public/cpp/ash_constants.h" #include "ash/public/cpp/shell_window_ids.h" #include "ash/shelf/shelf.h" #include "ash/shelf/shelf_constants.h" diff --git a/ash/system/tray/tray_popup_utils.cc b/ash/system/tray/tray_popup_utils.cc index c75711966821b7..9b309b0ad5a2cc 100644 --- a/ash/system/tray/tray_popup_utils.cc +++ b/ash/system/tray/tray_popup_utils.cc @@ -8,8 +8,8 @@ #include #include -#include "ash/ash_constants.h" #include "ash/ash_view_ids.h" +#include "ash/public/cpp/ash_constants.h" #include "ash/public/cpp/ash_features.h" #include "ash/resources/vector_icons/vector_icons.h" #include "ash/session/session_controller.h" diff --git a/ash/system/user/button_from_view.cc b/ash/system/user/button_from_view.cc index 2afb7f591a0ea5..fa6b3f2e199333 100644 --- a/ash/system/user/button_from_view.cc +++ b/ash/system/user/button_from_view.cc @@ -6,7 +6,7 @@ #include "ash/system/user/button_from_view.h" -#include "ash/ash_constants.h" +#include "ash/public/cpp/ash_constants.h" #include "ash/public/cpp/ash_features.h" #include "ash/system/tray/tray_constants.h" #include "ash/system/tray/tray_popup_utils.h" diff --git a/ash/wm/non_client_frame_controller.cc b/ash/wm/non_client_frame_controller.cc index 091ef456fbfbb2..308e1838bf0b91 100644 --- a/ash/wm/non_client_frame_controller.cc +++ b/ash/wm/non_client_frame_controller.cc @@ -10,10 +10,10 @@ #include #include -#include "ash/ash_constants.h" #include "ash/ash_layout_constants.h" #include "ash/frame/custom_frame_view_ash.h" #include "ash/frame/detached_title_area_renderer.h" +#include "ash/public/cpp/ash_constants.h" #include "ash/public/cpp/immersive/immersive_fullscreen_controller_delegate.h" #include "ash/window_manager.h" #include "ash/wm/move_event_handler.h" diff --git a/ash/wm/resize_handle_window_targeter.cc b/ash/wm/resize_handle_window_targeter.cc index 146be4bf529fad..03e59101f529aa 100644 --- a/ash/wm/resize_handle_window_targeter.cc +++ b/ash/wm/resize_handle_window_targeter.cc @@ -4,7 +4,7 @@ #include "ash/wm/resize_handle_window_targeter.h" -#include "ash/ash_constants.h" +#include "ash/public/cpp/ash_constants.h" #include "ash/public/cpp/immersive/immersive_fullscreen_controller.h" #include "ash/wm/window_state.h" #include "ui/aura/window.h" diff --git a/ash/wm/resize_shadow_and_cursor_unittest.cc b/ash/wm/resize_shadow_and_cursor_unittest.cc index b479f1d0708a75..9153c4e0b1a35d 100644 --- a/ash/wm/resize_shadow_and_cursor_unittest.cc +++ b/ash/wm/resize_shadow_and_cursor_unittest.cc @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/ash_constants.h" #include "ash/frame/custom_frame_view_ash.h" +#include "ash/public/cpp/ash_constants.h" #include "ash/shell.h" #include "ash/test/ash_test_base.h" #include "ash/wm/cursor_manager_test_api.h" diff --git a/ash/wm/splitview/split_view_divider.cc b/ash/wm/splitview/split_view_divider.cc index 7b6558b8b84ff4..1f4a93c5b2c4f6 100644 --- a/ash/wm/splitview/split_view_divider.cc +++ b/ash/wm/splitview/split_view_divider.cc @@ -6,8 +6,8 @@ #include -#include "ash/ash_constants.h" #include "ash/display/screen_orientation_controller.h" +#include "ash/public/cpp/ash_constants.h" #include "ash/public/cpp/shell_window_ids.h" #include "ash/shell.h" #include "ash/wm/overview/rounded_rect_view.h" diff --git a/ash/wm/window_util.cc b/ash/wm/window_util.cc index 946477a7d8f2b7..3a763d504218f6 100644 --- a/ash/wm/window_util.cc +++ b/ash/wm/window_util.cc @@ -7,7 +7,7 @@ #include #include -#include "ash/ash_constants.h" +#include "ash/public/cpp/ash_constants.h" #include "ash/public/cpp/config.h" #include "ash/public/cpp/shell_window_ids.h" #include "ash/root_window_controller.h" diff --git a/ash/wm/workspace/multi_window_resize_controller_unittest.cc b/ash/wm/workspace/multi_window_resize_controller_unittest.cc index f94350b2db5595..9ac4839cb90a6a 100644 --- a/ash/wm/workspace/multi_window_resize_controller_unittest.cc +++ b/ash/wm/workspace/multi_window_resize_controller_unittest.cc @@ -4,8 +4,8 @@ #include "ash/wm/workspace/multi_window_resize_controller.h" -#include "ash/ash_constants.h" #include "ash/frame/custom_frame_view_ash.h" +#include "ash/public/cpp/ash_constants.h" #include "ash/shell.h" #include "ash/shell_test_api.h" #include "ash/test/ash_test_base.h" diff --git a/chrome/browser/chromeos/preferences.cc b/chrome/browser/chromeos/preferences.cc index 3f526a1ac92a8d..c849a15b001952 100644 --- a/chrome/browser/chromeos/preferences.cc +++ b/chrome/browser/chromeos/preferences.cc @@ -6,8 +6,7 @@ #include -#include "ash/ash_constants.h" -#include "ash/autoclick/autoclick_controller.h" +#include "ash/public/cpp/ash_constants.h" #include "ash/public/cpp/ash_pref_names.h" #include "ash/shell.h" #include "base/command_line.h" @@ -217,9 +216,7 @@ void Preferences::RegisterProfilePrefs( ash::prefs::kAccessibilityAutoclickEnabled, false, user_prefs::PrefRegistrySyncable::SYNCABLE_PREF | PrefRegistry::PUBLIC); registry->RegisterIntegerPref( - ash::prefs::kAccessibilityAutoclickDelayMs, - static_cast(ash::AutoclickController::GetDefaultAutoclickDelay() - .InMilliseconds()), + ash::prefs::kAccessibilityAutoclickDelayMs, ash::kDefaultAutoclickDelayMs, user_prefs::PrefRegistrySyncable::SYNCABLE_PREF | PrefRegistry::PUBLIC); registry->RegisterBooleanPref( ash::prefs::kAccessibilityVirtualKeyboardEnabled, false, diff --git a/chrome/browser/ui/views/apps/chrome_native_app_window_views_aura_ash.cc b/chrome/browser/ui/views/apps/chrome_native_app_window_views_aura_ash.cc index 051600edd58fa2..c4539e58fe1b76 100644 --- a/chrome/browser/ui/views/apps/chrome_native_app_window_views_aura_ash.cc +++ b/chrome/browser/ui/views/apps/chrome_native_app_window_views_aura_ash.cc @@ -7,9 +7,9 @@ #include #include "apps/ui/views/app_window_frame_view.h" -#include "ash/ash_constants.h" #include "ash/frame/custom_frame_view_ash.h" #include "ash/public/cpp/app_types.h" +#include "ash/public/cpp/ash_constants.h" #include "ash/public/cpp/ash_switches.h" #include "ash/public/cpp/immersive/immersive_fullscreen_controller.h" #include "ash/public/cpp/shell_window_ids.h" diff --git a/chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.cc b/chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.cc index 0d9e6b28acdc51..83cc14095ad767 100644 --- a/chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.cc +++ b/chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.cc @@ -6,7 +6,6 @@ #include -#include "ash/ash_constants.h" #include "ash/ash_layout_constants.h" #include "ash/frame/caption_buttons/frame_back_button.h" #include "ash/frame/caption_buttons/frame_caption_button_container_view.h" @@ -15,6 +14,7 @@ #include "ash/frame/frame_header_origin_text.h" #include "ash/frame/frame_header_util.h" #include "ash/public/cpp/app_types.h" +#include "ash/public/cpp/ash_constants.h" #include "ash/public/cpp/ash_features.h" #include "ash/public/cpp/ash_switches.h" #include "ash/public/cpp/window_properties.h" diff --git a/chrome/browser/ui/views/frame/browser_non_client_frame_view_ash_browsertest.cc b/chrome/browser/ui/views/frame/browser_non_client_frame_view_ash_browsertest.cc index eaa1ed34f9fb6d..4fa8ce4152f386 100644 --- a/chrome/browser/ui/views/frame/browser_non_client_frame_view_ash_browsertest.cc +++ b/chrome/browser/ui/views/frame/browser_non_client_frame_view_ash_browsertest.cc @@ -6,12 +6,12 @@ #include -#include "ash/ash_constants.h" #include "ash/ash_layout_constants.h" #include "ash/frame/caption_buttons/frame_caption_button.h" #include "ash/frame/caption_buttons/frame_caption_button_container_view.h" #include "ash/frame/default_frame_header.h" #include "ash/frame/frame_header.h" +#include "ash/public/cpp/ash_constants.h" #include "ash/public/cpp/ash_switches.h" #include "ash/public/cpp/immersive/immersive_fullscreen_controller_test_api.h" #include "ash/public/cpp/vector_icons/vector_icons.h"