From d4649fa5f41c85707a7c1641e940d7a83549d454 Mon Sep 17 00:00:00 2001 From: jamescook Date: Fri, 30 Sep 2016 10:50:09 -0700 Subject: [PATCH] mustash: Break dependency of //ash/public/interfaces on //ash In a future CL I need to use ash's mojom interfaces within ash. Trying to do that now creates a dependency cycle due to typemaps. * Create //ash/public/cpp and move shelf_types.h there, since it is a public header used outside of ash * Make //ash/public/interfaces typemaps depend on //ash/public/cpp instead of //ash The file move was mechanical: tools/git/move_source_file.py ash/common/shelf/shelf_types.h \ ash/public/cpp BUG=none TEST=compiles, checkdeps, gn check Review-Url: https://codereview.chromium.org/2376103005 Cr-Commit-Position: refs/heads/master@{#422149} --- ash/BUILD.gn | 5 ++++- ash/app_list/app_list_presenter_delegate.cc | 2 +- ash/common/DEPS | 1 + ash/common/shelf/app_list_button.cc | 2 +- ash/common/shelf/shelf_alignment_menu.cc | 2 +- ash/common/shelf/shelf_background_animator.h | 2 +- ash/common/shelf/shelf_layout_manager.h | 2 +- ash/common/shelf/shelf_layout_manager_observer.h | 2 +- ash/common/shelf/shelf_locking_manager.h | 2 +- ash/common/shelf/shelf_widget.h | 2 +- ash/common/shelf/wm_shelf.h | 2 +- ash/common/shelf/wm_shelf_observer.h | 2 +- ash/common/shelf/wm_shelf_util.h | 2 +- ash/common/system/cast/tray_cast.cc | 2 +- .../system/chromeos/session/logout_button_tray.cc | 2 +- ash/common/system/overview/overview_button_tray.cc | 2 +- ash/common/system/status_area_widget.h | 2 +- ash/common/system/status_area_widget_delegate.h | 2 +- ash/common/system/tray/system_tray_item.h | 2 +- ash/common/system/tray/tray_background_view.h | 2 +- ash/common/system/tray/tray_item_view.cc | 2 +- ash/common/system/tray/tray_utils.h | 2 +- .../web_notification/ash_popup_alignment_delegate.cc | 2 +- .../web_notification/ash_popup_alignment_delegate.h | 2 +- ash/common/wm/overview/window_grid.cc | 2 +- .../keyboard_overlay_delegate_unittest.cc | 2 +- ash/mus/context_menu_mus.cc | 2 +- ash/mus/shelf_delegate_mus.h | 2 +- ash/public/cpp/BUILD.gn | 10 ++++++++++ ash/{common/shelf => public/cpp}/shelf_types.h | 6 +++--- ash/public/interfaces/shelf.typemap | 4 ++-- ash/public/interfaces/shelf_enum_traits.h | 2 +- ash/root_window_controller.cc | 2 +- ash/root_window_controller.h | 2 +- ash/shelf/shelf_window_targeter.cc | 2 +- ash/shell.h | 2 +- ash/shell/context_menu.cc | 2 +- ash/system/overview/overview_button_tray_unittest.cc | 2 +- .../ash_popup_alignment_delegate_unittest.cc | 2 +- ash/wm/dock/docked_window_resizer_unittest.cc | 2 +- ash/wm/immersive_fullscreen_controller_unittest.cc | 2 +- ash/wm/panels/panel_layout_manager_unittest.cc | 2 +- ash/wm/panels/panel_window_resizer_unittest.cc | 2 +- chrome/browser/ui/BUILD.gn | 1 + chrome/browser/ui/ash/chrome_launcher_prefs.h | 2 +- .../ui/ash/launcher/chrome_launcher_controller_impl.h | 2 +- .../frame/immersive_mode_controller_ash_unittest.cc | 2 +- 47 files changed, 62 insertions(+), 47 deletions(-) create mode 100644 ash/public/cpp/BUILD.gn rename ash/{common/shelf => public/cpp}/shelf_types.h (90%) diff --git a/ash/BUILD.gn b/ash/BUILD.gn index 4b2bef37ba70fb..3a4dfc877b4b76 100644 --- a/ash/BUILD.gn +++ b/ash/BUILD.gn @@ -163,7 +163,6 @@ component("ash") { "common/shelf/shelf_model_observer.h", "common/shelf/shelf_tooltip_manager.cc", "common/shelf/shelf_tooltip_manager.h", - "common/shelf/shelf_types.h", "common/shelf/shelf_view.cc", "common/shelf/shelf_view.h", "common/shelf/shelf_widget.cc", @@ -823,6 +822,7 @@ component("ash") { ] deps = [ "//ash/autoclick/common:autoclick", + "//ash/public/cpp", "//ash/touch_hud", "//base", "//base:i18n", @@ -1254,6 +1254,7 @@ static_library("ash_shell_lib") { ":ash_with_content", ":test_support_without_content", "//ash/common/strings", + "//ash/public/cpp", "//ash/resources", "//base", "//base:i18n", @@ -1339,6 +1340,7 @@ test("ash_content_unittests") { ":ash_with_aura_test_support", ":ash_with_content", ":test_support_with_content", + "//ash/public/cpp", "//base", "//base/test:test_support", "//components/signin/core/account_id", @@ -1542,6 +1544,7 @@ test("ash_unittests") { ":test_support_without_content", "//ash/autoclick/common:autoclick", "//ash/common/strings", + "//ash/public/cpp", "//ash/resources", "//ash/touch_hud", "//base", diff --git a/ash/app_list/app_list_presenter_delegate.cc b/ash/app_list/app_list_presenter_delegate.cc index 99ea6ca2bf1a6f..af5fac4c60da3b 100644 --- a/ash/app_list/app_list_presenter_delegate.cc +++ b/ash/app_list/app_list_presenter_delegate.cc @@ -8,7 +8,6 @@ #include "ash/common/ash_switches.h" #include "ash/common/shelf/app_list_button.h" #include "ash/common/shelf/shelf_layout_manager.h" -#include "ash/common/shelf/shelf_types.h" #include "ash/common/shelf/wm_shelf.h" #include "ash/common/shell_window_ids.h" #include "ash/common/wm/maximize_mode/maximize_mode_controller.h" @@ -18,6 +17,7 @@ #include "ash/common/wm_shell.h" #include "ash/common/wm_window.h" #include "ash/display/window_tree_host_manager.h" +#include "ash/public/cpp/shelf_types.h" #include "ash/root_window_controller.h" #include "ash/screen_util.h" #include "ash/shell.h" diff --git a/ash/common/DEPS b/ash/common/DEPS index 586757eb0d430f..31af8a176d7526 100644 --- a/ash/common/DEPS +++ b/ash/common/DEPS @@ -2,6 +2,7 @@ include_rules = [ "-ash", "+ash/ash_export.h", "+ash/common", + "+ash/public", "+ash/resources", "+ash/shared", "+ui", diff --git a/ash/common/shelf/app_list_button.cc b/ash/common/shelf/app_list_button.cc index 95ee33a01fad9d..323691fc672b9f 100644 --- a/ash/common/shelf/app_list_button.cc +++ b/ash/common/shelf/app_list_button.cc @@ -9,11 +9,11 @@ #include "ash/common/shelf/ink_drop_button_listener.h" #include "ash/common/shelf/shelf_constants.h" #include "ash/common/shelf/shelf_item_types.h" -#include "ash/common/shelf/shelf_types.h" #include "ash/common/shelf/shelf_view.h" #include "ash/common/shelf/wm_shelf.h" #include "ash/common/shelf/wm_shelf_util.h" #include "ash/common/wm_shell.h" +#include "ash/public/cpp/shelf_types.h" #include "ash/resources/vector_icons/vector_icons.h" #include "base/command_line.h" #include "grit/ash_resources.h" diff --git a/ash/common/shelf/shelf_alignment_menu.cc b/ash/common/shelf/shelf_alignment_menu.cc index 43ee70d8695875..93e6bb36ec619c 100644 --- a/ash/common/shelf/shelf_alignment_menu.cc +++ b/ash/common/shelf/shelf_alignment_menu.cc @@ -5,9 +5,9 @@ #include "ash/common/shelf/shelf_alignment_menu.h" #include "ash/common/metrics/user_metrics_action.h" -#include "ash/common/shelf/shelf_types.h" #include "ash/common/shelf/wm_shelf.h" #include "ash/common/wm_shell.h" +#include "ash/public/cpp/shelf_types.h" #include "grit/ash_strings.h" namespace ash { diff --git a/ash/common/shelf/shelf_background_animator.h b/ash/common/shelf/shelf_background_animator.h index 31ad4e1566e083..5b2068f5cf28bc 100644 --- a/ash/common/shelf/shelf_background_animator.h +++ b/ash/common/shelf/shelf_background_animator.h @@ -8,9 +8,9 @@ #include #include "ash/ash_export.h" -#include "ash/common/shelf/shelf_types.h" #include "ash/common/shelf/wm_shelf_observer.h" #include "ash/common/wm/background_animator.h" +#include "ash/public/cpp/shelf_types.h" #include "base/macros.h" #include "base/observer_list.h" diff --git a/ash/common/shelf/shelf_layout_manager.h b/ash/common/shelf/shelf_layout_manager.h index f3ab6fbeafa72c..6666a8d3e9d05f 100644 --- a/ash/common/shelf/shelf_layout_manager.h +++ b/ash/common/shelf/shelf_layout_manager.h @@ -9,7 +9,6 @@ #include "ash/ash_export.h" #include "ash/common/session/session_state_observer.h" -#include "ash/common/shelf/shelf_types.h" #include "ash/common/shelf/shelf_widget.h" #include "ash/common/shell_observer.h" #include "ash/common/wm/background_animator.h" @@ -18,6 +17,7 @@ #include "ash/common/wm/wm_snap_to_pixel_layout_manager.h" #include "ash/common/wm/workspace/workspace_types.h" #include "ash/common/wm_activation_observer.h" +#include "ash/public/cpp/shelf_types.h" #include "base/macros.h" #include "base/observer_list.h" #include "base/timer/timer.h" diff --git a/ash/common/shelf/shelf_layout_manager_observer.h b/ash/common/shelf/shelf_layout_manager_observer.h index 28787de0e154c9..1a374e184b15f7 100644 --- a/ash/common/shelf/shelf_layout_manager_observer.h +++ b/ash/common/shelf/shelf_layout_manager_observer.h @@ -6,8 +6,8 @@ #define ASH_COMMON_SHELF_SHELF_LAYOUT_MANAGER_OBSERVER_H_ #include "ash/ash_export.h" -#include "ash/common/shelf/shelf_types.h" #include "ash/common/wm/background_animator.h" +#include "ash/public/cpp/shelf_types.h" namespace aura { class Window; diff --git a/ash/common/shelf/shelf_locking_manager.h b/ash/common/shelf/shelf_locking_manager.h index c4d1f10a93d465..bd1ea77c49760d 100644 --- a/ash/common/shelf/shelf_locking_manager.h +++ b/ash/common/shelf/shelf_locking_manager.h @@ -7,9 +7,9 @@ #include "ash/ash_export.h" #include "ash/common/session/session_state_observer.h" -#include "ash/common/shelf/shelf_types.h" #include "ash/common/shell_observer.h" #include "ash/common/wm/lock_state_observer.h" +#include "ash/public/cpp/shelf_types.h" namespace ash { diff --git a/ash/common/shelf/shelf_widget.h b/ash/common/shelf/shelf_widget.h index b02a3c351e656c..11c02b8793d8d3 100644 --- a/ash/common/shelf/shelf_widget.h +++ b/ash/common/shelf/shelf_widget.h @@ -11,7 +11,7 @@ #include "ash/common/shelf/shelf_background_animator.h" #include "ash/common/shelf/shelf_background_animator_observer.h" #include "ash/common/shelf/shelf_layout_manager_observer.h" -#include "ash/common/shelf/shelf_types.h" +#include "ash/public/cpp/shelf_types.h" #include "base/macros.h" #include "ui/views/widget/widget.h" #include "ui/views/widget/widget_observer.h" diff --git a/ash/common/shelf/wm_shelf.h b/ash/common/shelf/wm_shelf.h index 514c1487982b03..e273c033959dc3 100644 --- a/ash/common/shelf/wm_shelf.h +++ b/ash/common/shelf/wm_shelf.h @@ -9,7 +9,7 @@ #include "ash/ash_export.h" #include "ash/common/shelf/shelf_layout_manager_observer.h" -#include "ash/common/shelf/shelf_types.h" +#include "ash/public/cpp/shelf_types.h" #include "base/observer_list.h" namespace gfx { diff --git a/ash/common/shelf/wm_shelf_observer.h b/ash/common/shelf/wm_shelf_observer.h index 2fd43598530fa6..808b9952b69804 100644 --- a/ash/common/shelf/wm_shelf_observer.h +++ b/ash/common/shelf/wm_shelf_observer.h @@ -6,8 +6,8 @@ #define ASH_COMMON_SHELF_WM_SHELF_OBSERVER_H_ #include "ash/ash_export.h" -#include "ash/common/shelf/shelf_types.h" #include "ash/common/wm/background_animator.h" +#include "ash/public/cpp/shelf_types.h" namespace ash { diff --git a/ash/common/shelf/wm_shelf_util.h b/ash/common/shelf/wm_shelf_util.h index 2fab27f082b308..98bb1adef55716 100644 --- a/ash/common/shelf/wm_shelf_util.h +++ b/ash/common/shelf/wm_shelf_util.h @@ -6,7 +6,7 @@ #define ASH_COMMON_SHELF_WM_SHELF_UTIL_H_ #include "ash/ash_export.h" -#include "ash/common/shelf/shelf_types.h" +#include "ash/public/cpp/shelf_types.h" namespace ash { diff --git a/ash/common/system/cast/tray_cast.cc b/ash/common/system/cast/tray_cast.cc index 4e0f42572c933c..c130e35db96d6f 100644 --- a/ash/common/system/cast/tray_cast.cc +++ b/ash/common/system/cast/tray_cast.cc @@ -6,7 +6,6 @@ #include "ash/common/material_design/material_design_controller.h" #include "ash/common/session/session_state_delegate.h" -#include "ash/common/shelf/shelf_types.h" #include "ash/common/shelf/wm_shelf_util.h" #include "ash/common/system/chromeos/screen_security/screen_tray_item.h" #include "ash/common/system/tray/fixed_sized_image_view.h" @@ -21,6 +20,7 @@ #include "ash/common/system/tray/tray_item_view.h" #include "ash/common/system/tray/tray_popup_label_button.h" #include "ash/common/wm_shell.h" +#include "ash/public/cpp/shelf_types.h" #include "ash/resources/vector_icons/vector_icons.h" #include "base/bind.h" #include "grit/ash_resources.h" diff --git a/ash/common/system/chromeos/session/logout_button_tray.cc b/ash/common/system/chromeos/session/logout_button_tray.cc index f24c367331a18b..4e66f31c386f66 100644 --- a/ash/common/system/chromeos/session/logout_button_tray.cc +++ b/ash/common/system/chromeos/session/logout_button_tray.cc @@ -8,7 +8,6 @@ #include #include "ash/common/material_design/material_design_controller.h" -#include "ash/common/shelf/shelf_types.h" #include "ash/common/system/chromeos/session/logout_confirmation_controller.h" #include "ash/common/system/tray/system_tray_delegate.h" #include "ash/common/system/tray/system_tray_notifier.h" @@ -16,6 +15,7 @@ #include "ash/common/system/tray/tray_utils.h" #include "ash/common/system/user/login_status.h" #include "ash/common/wm_shell.h" +#include "ash/public/cpp/shelf_types.h" #include "base/logging.h" #include "grit/ash_resources.h" #include "third_party/skia/include/core/SkColor.h" diff --git a/ash/common/system/overview/overview_button_tray.cc b/ash/common/system/overview/overview_button_tray.cc index d47d578004a774..672798967666d5 100644 --- a/ash/common/system/overview/overview_button_tray.cc +++ b/ash/common/system/overview/overview_button_tray.cc @@ -7,7 +7,6 @@ #include "ash/common/material_design/material_design_controller.h" #include "ash/common/session/session_state_delegate.h" #include "ash/common/shelf/shelf_constants.h" -#include "ash/common/shelf/shelf_types.h" #include "ash/common/shelf/wm_shelf_util.h" #include "ash/common/system/tray/system_tray_delegate.h" #include "ash/common/system/tray/tray_constants.h" @@ -15,6 +14,7 @@ #include "ash/common/wm/maximize_mode/maximize_mode_controller.h" #include "ash/common/wm/overview/window_selector_controller.h" #include "ash/common/wm_shell.h" +#include "ash/public/cpp/shelf_types.h" #include "grit/ash_resources.h" #include "grit/ash_strings.h" #include "ui/base/l10n/l10n_util.h" diff --git a/ash/common/system/status_area_widget.h b/ash/common/system/status_area_widget.h index c432ebeb673894..35d9d2c35f825e 100644 --- a/ash/common/system/status_area_widget.h +++ b/ash/common/system/status_area_widget.h @@ -8,7 +8,7 @@ #include "ash/ash_export.h" #include "ash/common/login_status.h" #include "ash/common/shelf/shelf_background_animator_observer.h" -#include "ash/common/shelf/shelf_types.h" +#include "ash/public/cpp/shelf_types.h" #include "base/macros.h" #include "ui/views/widget/widget.h" diff --git a/ash/common/system/status_area_widget_delegate.h b/ash/common/system/status_area_widget_delegate.h index d7b7fe86b4b4d0..70a2f57d957e9a 100644 --- a/ash/common/system/status_area_widget_delegate.h +++ b/ash/common/system/status_area_widget_delegate.h @@ -6,7 +6,7 @@ #define ASH_COMMON_SYSTEM_STATUS_AREA_WIDGET_DELEGATE_H_ #include "ash/ash_export.h" -#include "ash/common/shelf/shelf_types.h" +#include "ash/public/cpp/shelf_types.h" #include "base/macros.h" #include "ui/gfx/image/image_skia.h" #include "ui/views/accessible_pane_view.h" diff --git a/ash/common/system/tray/system_tray_item.h b/ash/common/system/tray/system_tray_item.h index b83c2dff45b942..65ca6e39e2953e 100644 --- a/ash/common/system/tray/system_tray_item.h +++ b/ash/common/system/tray/system_tray_item.h @@ -7,7 +7,7 @@ #include "ash/ash_export.h" #include "ash/common/login_status.h" -#include "ash/common/shelf/shelf_types.h" +#include "ash/public/cpp/shelf_types.h" #include "base/macros.h" namespace views { diff --git a/ash/common/system/tray/tray_background_view.h b/ash/common/system/tray/tray_background_view.h index 41d5dbbedaa502..4932427c45d3dc 100644 --- a/ash/common/system/tray/tray_background_view.h +++ b/ash/common/system/tray/tray_background_view.h @@ -9,8 +9,8 @@ #include "ash/ash_export.h" #include "ash/common/shelf/shelf_background_animator_observer.h" -#include "ash/common/shelf/shelf_types.h" #include "ash/common/system/tray/actionable_view.h" +#include "ash/public/cpp/shelf_types.h" #include "base/macros.h" #include "ui/compositor/layer_animation_observer.h" #include "ui/views/bubble/tray_bubble_view.h" diff --git a/ash/common/system/tray/tray_item_view.cc b/ash/common/system/tray/tray_item_view.cc index 53d5d270441104..679189390acf8e 100644 --- a/ash/common/system/tray/tray_item_view.cc +++ b/ash/common/system/tray/tray_item_view.cc @@ -4,10 +4,10 @@ #include "ash/common/system/tray/tray_item_view.h" -#include "ash/common/shelf/shelf_types.h" #include "ash/common/shelf/wm_shelf_util.h" #include "ash/common/system/tray/system_tray.h" #include "ash/common/system/tray/system_tray_item.h" +#include "ash/public/cpp/shelf_types.h" #include "ui/compositor/layer.h" #include "ui/gfx/animation/slide_animation.h" #include "ui/views/controls/image_view.h" diff --git a/ash/common/system/tray/tray_utils.h b/ash/common/system/tray/tray_utils.h index 593e67754667ef..5d51783217443c 100644 --- a/ash/common/system/tray/tray_utils.h +++ b/ash/common/system/tray/tray_utils.h @@ -7,7 +7,7 @@ #include -#include "ash/common/shelf/shelf_types.h" +#include "ash/public/cpp/shelf_types.h" #include "base/strings/string16.h" namespace views { diff --git a/ash/common/system/web_notification/ash_popup_alignment_delegate.cc b/ash/common/system/web_notification/ash_popup_alignment_delegate.cc index 33497d55be22f4..d66f9f87f76c7b 100644 --- a/ash/common/system/web_notification/ash_popup_alignment_delegate.cc +++ b/ash/common/system/web_notification/ash_popup_alignment_delegate.cc @@ -5,12 +5,12 @@ #include "ash/common/system/web_notification/ash_popup_alignment_delegate.h" #include "ash/common/shelf/shelf_constants.h" -#include "ash/common/shelf/shelf_types.h" #include "ash/common/shelf/wm_shelf.h" #include "ash/common/shell_window_ids.h" #include "ash/common/wm_root_window_controller.h" #include "ash/common/wm_shell.h" #include "ash/common/wm_window.h" +#include "ash/public/cpp/shelf_types.h" #include "base/i18n/rtl.h" #include "ui/display/display.h" #include "ui/display/screen.h" diff --git a/ash/common/system/web_notification/ash_popup_alignment_delegate.h b/ash/common/system/web_notification/ash_popup_alignment_delegate.h index a9c898b06a4d54..0f2fd31d7f7bde 100644 --- a/ash/common/system/web_notification/ash_popup_alignment_delegate.h +++ b/ash/common/system/web_notification/ash_popup_alignment_delegate.h @@ -8,9 +8,9 @@ #include #include "ash/ash_export.h" -#include "ash/common/shelf/shelf_types.h" #include "ash/common/shelf/wm_shelf_observer.h" #include "ash/common/shell_observer.h" +#include "ash/public/cpp/shelf_types.h" #include "base/macros.h" #include "ui/display/display_observer.h" #include "ui/gfx/geometry/rect.h" diff --git a/ash/common/wm/overview/window_grid.cc b/ash/common/wm/overview/window_grid.cc index d9b8c9f439cdf7..35d4ce4a013c19 100644 --- a/ash/common/wm/overview/window_grid.cc +++ b/ash/common/wm/overview/window_grid.cc @@ -12,7 +12,6 @@ #include "ash/common/ash_switches.h" #include "ash/common/material_design/material_design_controller.h" -#include "ash/common/shelf/shelf_types.h" #include "ash/common/shelf/wm_shelf.h" #include "ash/common/shell_window_ids.h" #include "ash/common/wm/overview/cleanup_animation_observer.h" @@ -26,6 +25,7 @@ #include "ash/common/wm_lookup.h" #include "ash/common/wm_root_window_controller.h" #include "ash/common/wm_window.h" +#include "ash/public/cpp/shelf_types.h" #include "base/command_line.h" #include "base/i18n/string_search.h" #include "base/memory/scoped_vector.h" diff --git a/ash/content/keyboard_overlay/keyboard_overlay_delegate_unittest.cc b/ash/content/keyboard_overlay/keyboard_overlay_delegate_unittest.cc index ae88878edabe12..28b23d5f98ed35 100644 --- a/ash/content/keyboard_overlay/keyboard_overlay_delegate_unittest.cc +++ b/ash/content/keyboard_overlay/keyboard_overlay_delegate_unittest.cc @@ -4,8 +4,8 @@ #include "ash/content/keyboard_overlay/keyboard_overlay_delegate.h" -#include "ash/common/shelf/shelf_types.h" #include "ash/common/shelf/wm_shelf.h" +#include "ash/public/cpp/shelf_types.h" #include "ash/shell.h" #include "ash/test/ash_test_base.h" #include "base/strings/utf_string_conversions.h" diff --git a/ash/mus/context_menu_mus.cc b/ash/mus/context_menu_mus.cc index de071b6b942d02..b3284194dbbc59 100644 --- a/ash/mus/context_menu_mus.cc +++ b/ash/mus/context_menu_mus.cc @@ -4,10 +4,10 @@ #include "ash/mus/context_menu_mus.h" -#include "ash/common/shelf/shelf_types.h" #include "ash/common/shelf/wm_shelf.h" #include "ash/common/wallpaper/wallpaper_delegate.h" #include "ash/common/wm_shell.h" +#include "ash/public/cpp/shelf_types.h" #include "grit/ash_strings.h" namespace ash { diff --git a/ash/mus/shelf_delegate_mus.h b/ash/mus/shelf_delegate_mus.h index 60427cd7bb7921..cd59b908eb42b5 100644 --- a/ash/mus/shelf_delegate_mus.h +++ b/ash/mus/shelf_delegate_mus.h @@ -9,7 +9,7 @@ #include #include "ash/common/shelf/shelf_delegate.h" -#include "ash/common/shelf/shelf_types.h" +#include "ash/public/cpp/shelf_types.h" #include "ash/public/interfaces/shelf.mojom.h" #include "mojo/public/cpp/bindings/binding.h" #include "mojo/public/cpp/bindings/interface_ptr_set.h" diff --git a/ash/public/cpp/BUILD.gn b/ash/public/cpp/BUILD.gn new file mode 100644 index 00000000000000..ea64e0fbe9c48e --- /dev/null +++ b/ash/public/cpp/BUILD.gn @@ -0,0 +1,10 @@ +# Copyright 2016 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. + +# C++ headers and sources that can be used outside ash. +source_set("cpp") { + sources = [ + "shelf_types.h", + ] +} diff --git a/ash/common/shelf/shelf_types.h b/ash/public/cpp/shelf_types.h similarity index 90% rename from ash/common/shelf/shelf_types.h rename to ash/public/cpp/shelf_types.h index 9b0ac9e3214eb7..5044211095f25c 100644 --- a/ash/common/shelf/shelf_types.h +++ b/ash/public/cpp/shelf_types.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef ASH_COMMON_SHELF_SHELF_TYPES_H_ -#define ASH_COMMON_SHELF_SHELF_TYPES_H_ +#ifndef ASH_PUBLIC_CPP_SHELF_TYPES_H_ +#define ASH_PUBLIC_CPP_SHELF_TYPES_H_ namespace ash { @@ -57,4 +57,4 @@ enum ShelfBackgroundType { } // namespace ash -#endif // ASH_COMMON_SHELF_SHELF_TYPES_H_ +#endif // ASH_PUBLIC_CPP_SHELF_TYPES_H_ diff --git a/ash/public/interfaces/shelf.typemap b/ash/public/interfaces/shelf.typemap index 8d1d5943c1538e..5fd20642dc7f87 100644 --- a/ash/public/interfaces/shelf.typemap +++ b/ash/public/interfaces/shelf.typemap @@ -3,10 +3,10 @@ # found in the LICENSE file. mojom = "//ash/public/interfaces/shelf.mojom" -public_headers = [ "//ash/common/shelf/shelf_types.h" ] +public_headers = [ "//ash/public/cpp/shelf_types.h" ] traits_headers = [ "//ash/public/interfaces/shelf_enum_traits.h" ] public_deps = [ - "//ash", + "//ash/public/cpp", ] type_mappings = [ "ash.mojom.ShelfAlignment=ash::ShelfAlignment", diff --git a/ash/public/interfaces/shelf_enum_traits.h b/ash/public/interfaces/shelf_enum_traits.h index 4d5d1cd9b475f7..4765ab423b39d0 100644 --- a/ash/public/interfaces/shelf_enum_traits.h +++ b/ash/public/interfaces/shelf_enum_traits.h @@ -5,7 +5,7 @@ #ifndef ASH_PUBLIC_INTERFACES_SHELF_ENUM_TRAITS_H_ #define ASH_PUBLIC_INTERFACES_SHELF_ENUM_TRAITS_H_ -#include "ash/common/shelf/shelf_types.h" +#include "ash/public/cpp/shelf_types.h" #include "ash/public/interfaces/shelf.mojom.h" namespace mojo { diff --git a/ash/root_window_controller.cc b/ash/root_window_controller.cc index b6d1dd26499bd7..54b3887ae5f771 100644 --- a/ash/root_window_controller.cc +++ b/ash/root_window_controller.cc @@ -18,7 +18,6 @@ #include "ash/common/session/session_state_delegate.h" #include "ash/common/shelf/shelf_delegate.h" #include "ash/common/shelf/shelf_layout_manager.h" -#include "ash/common/shelf/shelf_types.h" #include "ash/common/shelf/shelf_widget.h" #include "ash/common/shell_delegate.h" #include "ash/common/shell_window_ids.h" @@ -43,6 +42,7 @@ #include "ash/display/display_manager.h" #include "ash/high_contrast/high_contrast_controller.h" #include "ash/host/ash_window_tree_host.h" +#include "ash/public/cpp/shelf_types.h" #include "ash/root_window_settings.h" #include "ash/shelf/shelf_window_targeter.h" #include "ash/shell.h" diff --git a/ash/root_window_controller.h b/ash/root_window_controller.h index bc9fd3f2db0b62..52c246a3a81e8c 100644 --- a/ash/root_window_controller.h +++ b/ash/root_window_controller.h @@ -9,8 +9,8 @@ #include #include "ash/ash_export.h" -#include "ash/common/shelf/shelf_types.h" #include "ash/common/shell_observer.h" +#include "ash/public/cpp/shelf_types.h" #include "base/macros.h" #include "ui/aura/window.h" #include "ui/aura/window_tree_host.h" diff --git a/ash/shelf/shelf_window_targeter.cc b/ash/shelf/shelf_window_targeter.cc index b368f4ad181aac..142d877264fe17 100644 --- a/ash/shelf/shelf_window_targeter.cc +++ b/ash/shelf/shelf_window_targeter.cc @@ -6,9 +6,9 @@ #include "ash/aura/wm_window_aura.h" #include "ash/common/shelf/shelf_constants.h" -#include "ash/common/shelf/shelf_types.h" #include "ash/common/shelf/wm_shelf.h" #include "ash/common/wm_window.h" +#include "ash/public/cpp/shelf_types.h" namespace ash { diff --git a/ash/shell.h b/ash/shell.h index 8c5905d892253e..ab9cca257319ad 100644 --- a/ash/shell.h +++ b/ash/shell.h @@ -10,8 +10,8 @@ #include #include "ash/ash_export.h" -#include "ash/common/shelf/shelf_types.h" #include "ash/metrics/user_metrics_recorder.h" +#include "ash/public/cpp/shelf_types.h" #include "ash/wm/cursor_manager_chromeos.h" #include "ash/wm/system_modal_container_event_filter_delegate.h" #include "base/gtest_prod_util.h" diff --git a/ash/shell/context_menu.cc b/ash/shell/context_menu.cc index 5c8ae851ac3228..921c27b34d79e8 100644 --- a/ash/shell/context_menu.cc +++ b/ash/shell/context_menu.cc @@ -4,8 +4,8 @@ #include "ash/shell/context_menu.h" -#include "ash/common/shelf/shelf_types.h" #include "ash/common/shelf/wm_shelf.h" +#include "ash/public/cpp/shelf_types.h" #include "grit/ash_strings.h" namespace ash { diff --git a/ash/system/overview/overview_button_tray_unittest.cc b/ash/system/overview/overview_button_tray_unittest.cc index 7cd0b1138f6fab..edbc3d22964ae7 100644 --- a/ash/system/overview/overview_button_tray_unittest.cc +++ b/ash/system/overview/overview_button_tray_unittest.cc @@ -5,12 +5,12 @@ #include "ash/common/system/overview/overview_button_tray.h" #include "ash/common/login_status.h" -#include "ash/common/shelf/shelf_types.h" #include "ash/common/system/status_area_widget.h" #include "ash/common/wm/maximize_mode/maximize_mode_controller.h" #include "ash/common/wm/overview/window_selector_controller.h" #include "ash/common/wm_shell.h" #include "ash/display/display_manager.h" +#include "ash/public/cpp/shelf_types.h" #include "ash/root_window_controller.h" #include "ash/rotator/screen_rotation_animator.h" #include "ash/shell.h" diff --git a/ash/system/web_notification/ash_popup_alignment_delegate_unittest.cc b/ash/system/web_notification/ash_popup_alignment_delegate_unittest.cc index 94ef47950b09b4..1bfe3188c3cd47 100644 --- a/ash/system/web_notification/ash_popup_alignment_delegate_unittest.cc +++ b/ash/system/web_notification/ash_popup_alignment_delegate_unittest.cc @@ -7,13 +7,13 @@ #include #include -#include "ash/common/shelf/shelf_types.h" #include "ash/common/shelf/wm_shelf.h" #include "ash/common/shell_window_ids.h" #include "ash/common/wm_lookup.h" #include "ash/common/wm_root_window_controller.h" #include "ash/common/wm_window.h" #include "ash/display/display_manager.h" +#include "ash/public/cpp/shelf_types.h" #include "ash/shell.h" #include "ash/test/ash_test_base.h" #include "base/command_line.h" diff --git a/ash/wm/dock/docked_window_resizer_unittest.cc b/ash/wm/dock/docked_window_resizer_unittest.cc index 946fc7bb45d687..078f49ca915f49 100644 --- a/ash/wm/dock/docked_window_resizer_unittest.cc +++ b/ash/wm/dock/docked_window_resizer_unittest.cc @@ -5,7 +5,6 @@ #include "ash/common/wm/dock/docked_window_resizer.h" #include "ash/aura/wm_window_aura.h" -#include "ash/common/shelf/shelf_types.h" #include "ash/common/shelf/shelf_widget.h" #include "ash/common/shelf/wm_shelf.h" #include "ash/common/shell_window_ids.h" @@ -15,6 +14,7 @@ #include "ash/common/wm/wm_event.h" #include "ash/common/wm_shell.h" #include "ash/display/window_tree_host_manager.h" +#include "ash/public/cpp/shelf_types.h" #include "ash/root_window_controller.h" #include "ash/screen_util.h" #include "ash/shell.h" diff --git a/ash/wm/immersive_fullscreen_controller_unittest.cc b/ash/wm/immersive_fullscreen_controller_unittest.cc index ec148e80894893..e3a487678c1f23 100644 --- a/ash/wm/immersive_fullscreen_controller_unittest.cc +++ b/ash/wm/immersive_fullscreen_controller_unittest.cc @@ -4,11 +4,11 @@ #include "ash/shared/immersive_fullscreen_controller.h" -#include "ash/common/shelf/shelf_types.h" #include "ash/common/shelf/wm_shelf.h" #include "ash/common/wm/window_state.h" #include "ash/display/display_manager.h" #include "ash/display/mouse_cursor_event_filter.h" +#include "ash/public/cpp/shelf_types.h" #include "ash/root_window_controller.h" #include "ash/shared/immersive_fullscreen_controller_delegate.h" #include "ash/shell.h" diff --git a/ash/wm/panels/panel_layout_manager_unittest.cc b/ash/wm/panels/panel_layout_manager_unittest.cc index 076d055fc60b28..8bd84d0936a30a 100644 --- a/ash/wm/panels/panel_layout_manager_unittest.cc +++ b/ash/wm/panels/panel_layout_manager_unittest.cc @@ -8,7 +8,6 @@ #include "ash/common/shelf/shelf_button.h" #include "ash/common/shelf/shelf_layout_manager.h" #include "ash/common/shelf/shelf_model.h" -#include "ash/common/shelf/shelf_types.h" #include "ash/common/shelf/shelf_view.h" #include "ash/common/shelf/shelf_widget.h" #include "ash/common/shelf/wm_shelf.h" @@ -20,6 +19,7 @@ #include "ash/common/wm_shell.h" #include "ash/common/wm_window_property.h" #include "ash/display/display_manager.h" +#include "ash/public/cpp/shelf_types.h" #include "ash/screen_util.h" #include "ash/shell.h" #include "ash/test/ash_test_base.h" diff --git a/ash/wm/panels/panel_window_resizer_unittest.cc b/ash/wm/panels/panel_window_resizer_unittest.cc index a3a96c6df90842..84cf1cdd1da5d5 100644 --- a/ash/wm/panels/panel_window_resizer_unittest.cc +++ b/ash/wm/panels/panel_window_resizer_unittest.cc @@ -7,7 +7,6 @@ #include "ash/aura/wm_window_aura.h" #include "ash/common/shelf/shelf_layout_manager.h" #include "ash/common/shelf/shelf_model.h" -#include "ash/common/shelf/shelf_types.h" #include "ash/common/shelf/shelf_widget.h" #include "ash/common/shelf/wm_shelf.h" #include "ash/common/shell_window_ids.h" @@ -15,6 +14,7 @@ #include "ash/common/wm/wm_event.h" #include "ash/common/wm_shell.h" #include "ash/common/wm_window_property.h" +#include "ash/public/cpp/shelf_types.h" #include "ash/root_window_controller.h" #include "ash/shell.h" #include "ash/test/ash_test_base.h" diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn index 3622b521403ba6..e2261b0f3af631 100644 --- a/chrome/browser/ui/BUILD.gn +++ b/chrome/browser/ui/BUILD.gn @@ -1391,6 +1391,7 @@ split_static_library("ui") { "//ash", "//ash:ash_with_content", "//ash/common/strings", + "//ash/public/cpp", "//ash/public/interfaces", "//components/user_manager", "//ui/app_list/presenter", diff --git a/chrome/browser/ui/ash/chrome_launcher_prefs.h b/chrome/browser/ui/ash/chrome_launcher_prefs.h index 9f1f5e18cf9633..a8607d893a4dc9 100644 --- a/chrome/browser/ui/ash/chrome_launcher_prefs.h +++ b/chrome/browser/ui/ash/chrome_launcher_prefs.h @@ -9,7 +9,7 @@ #include #include -#include "ash/common/shelf/shelf_types.h" +#include "ash/public/cpp/shelf_types.h" #include "base/macros.h" #include "components/syncable_prefs/pref_service_syncable_observer.h" diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.h b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.h index 8504e645771071..84999fa41cc25e 100644 --- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.h +++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.h @@ -10,8 +10,8 @@ #include "ash/common/shelf/shelf_delegate.h" #include "ash/common/shelf/shelf_model_observer.h" -#include "ash/common/shelf/shelf_types.h" #include "ash/display/window_tree_host_manager.h" +#include "ash/public/cpp/shelf_types.h" #include "base/compiler_specific.h" #include "base/macros.h" #include "base/memory/weak_ptr.h" diff --git a/chrome/browser/ui/views/frame/immersive_mode_controller_ash_unittest.cc b/chrome/browser/ui/views/frame/immersive_mode_controller_ash_unittest.cc index 1ba3d0b7a4c7e7..5e986a69d0423d 100644 --- a/chrome/browser/ui/views/frame/immersive_mode_controller_ash_unittest.cc +++ b/chrome/browser/ui/views/frame/immersive_mode_controller_ash_unittest.cc @@ -6,7 +6,7 @@ #include "ash/common/material_design/material_design_controller.h" #include "ash/common/shelf/shelf_layout_manager.h" -#include "ash/common/shelf/shelf_types.h" +#include "ash/public/cpp/shelf_types.h" #include "ash/root_window_controller.h" #include "ash/shell.h" #include "ash/test/ash_test_base.h"