diff options
120 files changed, 200 insertions, 196 deletions
diff --git a/ash/accelerators/nested_dispatcher_controller.h b/ash/accelerators/nested_dispatcher_controller.h index 74dcd902..b3db4e9 100644 --- a/ash/accelerators/nested_dispatcher_controller.h +++ b/ash/accelerators/nested_dispatcher_controller.h @@ -8,7 +8,7 @@ #include "ash/ash_export.h" #include "base/callback.h" #include "base/message_loop/message_loop.h" -#include "ui/aura/client/dispatcher_client.h" +#include "ui/wm/public/dispatcher_client.h" namespace ash { diff --git a/ash/accelerators/nested_dispatcher_controller_unittest.cc b/ash/accelerators/nested_dispatcher_controller_unittest.cc index b40903e..cc0a352 100644 --- a/ash/accelerators/nested_dispatcher_controller_unittest.cc +++ b/ash/accelerators/nested_dispatcher_controller_unittest.cc @@ -10,13 +10,13 @@ #include "base/bind.h" #include "base/event_types.h" #include "base/message_loop/message_loop.h" -#include "ui/aura/client/dispatcher_client.h" #include "ui/aura/test/test_windows.h" #include "ui/aura/window.h" #include "ui/aura/window_event_dispatcher.h" #include "ui/base/accelerators/accelerator.h" #include "ui/events/event_constants.h" #include "ui/events/event_utils.h" +#include "ui/wm/public/dispatcher_client.h" #if defined(USE_X11) #include <X11/Xlib.h> diff --git a/ash/dip_unittest.cc b/ash/dip_unittest.cc index 6c23910..748c78f 100644 --- a/ash/dip_unittest.cc +++ b/ash/dip_unittest.cc @@ -15,7 +15,6 @@ #include "ash/wm/window_util.h" #include "base/command_line.h" #include "base/memory/scoped_ptr.h" -#include "ui/aura/client/activation_client.h" #include "ui/aura/window.h" #include "ui/aura/window_event_dispatcher.h" #include "ui/compositor/layer.h" @@ -26,6 +25,7 @@ #include "ui/wm/core/shadow.h" #include "ui/wm/core/shadow_controller.h" #include "ui/wm/core/shadow_types.h" +#include "ui/wm/public/activation_client.h" namespace ash { diff --git a/ash/display/display_controller.cc b/ash/display/display_controller.cc index 03dda59..b1341c4c 100644 --- a/ash/display/display_controller.cc +++ b/ash/display/display_controller.cc @@ -24,7 +24,6 @@ #include "ash/wm/coordinate_conversion.h" #include "base/command_line.h" #include "base/strings/stringprintf.h" -#include "ui/aura/client/activation_client.h" #include "ui/aura/client/capture_client.h" #include "ui/aura/client/focus_client.h" #include "ui/aura/client/screen_position_client.h" @@ -37,6 +36,7 @@ #include "ui/compositor/compositor_vsync_manager.h" #include "ui/gfx/display.h" #include "ui/gfx/screen.h" +#include "ui/wm/public/activation_client.h" #if defined(OS_CHROMEOS) #include "base/sys_info.h" diff --git a/ash/display/display_controller_unittest.cc b/ash/display/display_controller_unittest.cc index 6a49e2a..8c64560 100644 --- a/ash/display/display_controller_unittest.cc +++ b/ash/display/display_controller_unittest.cc @@ -20,8 +20,6 @@ #include "ash/wm/window_state.h" #include "ash/wm/wm_event.h" #include "base/command_line.h" -#include "ui/aura/client/activation_change_observer.h" -#include "ui/aura/client/activation_client.h" #include "ui/aura/client/focus_change_observer.h" #include "ui/aura/client/focus_client.h" #include "ui/aura/env.h" @@ -32,6 +30,8 @@ #include "ui/gfx/display.h" #include "ui/gfx/screen.h" #include "ui/views/widget/widget.h" +#include "ui/wm/public/activation_change_observer.h" +#include "ui/wm/public/activation_client.h" #if defined(USE_X11) #include <X11/Xlib.h> diff --git a/ash/display/screen_position_controller.cc b/ash/display/screen_position_controller.cc index c0079c8..6572ac1 100644 --- a/ash/display/screen_position_controller.cc +++ b/ash/display/screen_position_controller.cc @@ -12,7 +12,6 @@ #include "ash/wm/system_modal_container_layout_manager.h" #include "ash/wm/window_properties.h" #include "ash/wm/window_state.h" -#include "ui/aura/client/activation_client.h" #include "ui/aura/client/capture_client.h" #include "ui/aura/client/focus_client.h" #include "ui/aura/window_event_dispatcher.h" @@ -21,6 +20,7 @@ #include "ui/gfx/display.h" #include "ui/gfx/screen.h" #include "ui/wm/core/window_util.h" +#include "ui/wm/public/activation_client.h" namespace ash { namespace { diff --git a/ash/drag_drop/drag_drop_controller.cc b/ash/drag_drop/drag_drop_controller.cc index 472172b..4df5f71 100644 --- a/ash/drag_drop/drag_drop_controller.cc +++ b/ash/drag_drop/drag_drop_controller.cc @@ -12,7 +12,6 @@ #include "base/message_loop/message_loop.h" #include "base/run_loop.h" #include "ui/aura/client/capture_client.h" -#include "ui/aura/client/drag_drop_delegate.h" #include "ui/aura/env.h" #include "ui/aura/window.h" #include "ui/aura/window_delegate.h" @@ -29,6 +28,7 @@ #include "ui/gfx/rect_conversions.h" #include "ui/views/views_delegate.h" #include "ui/views/widget/native_widget_aura.h" +#include "ui/wm/public/drag_drop_delegate.h" namespace ash { namespace internal { diff --git a/ash/drag_drop/drag_drop_controller.h b/ash/drag_drop/drag_drop_controller.h index a9220db..5d05ec9 100644 --- a/ash/drag_drop/drag_drop_controller.h +++ b/ash/drag_drop/drag_drop_controller.h @@ -8,13 +8,13 @@ #include "ash/ash_export.h" #include "base/callback.h" #include "base/memory/weak_ptr.h" -#include "ui/aura/client/drag_drop_client.h" #include "ui/aura/window_observer.h" #include "ui/base/dragdrop/os_exchange_data.h" #include "ui/events/event_constants.h" #include "ui/events/event_handler.h" #include "ui/gfx/animation/animation_delegate.h" #include "ui/gfx/rect.h" +#include "ui/wm/public/drag_drop_client.h" namespace gfx { class LinearAnimation; diff --git a/ash/drag_drop/drag_drop_tracker.cc b/ash/drag_drop/drag_drop_tracker.cc index 48badf3..55cb7b9 100644 --- a/ash/drag_drop/drag_drop_tracker.cc +++ b/ash/drag_drop/drag_drop_tracker.cc @@ -7,12 +7,12 @@ #include "ash/shell.h" #include "ash/shell_window_ids.h" #include "ash/wm/coordinate_conversion.h" -#include "ui/aura/client/activation_delegate.h" #include "ui/aura/client/window_tree_client.h" #include "ui/aura/window.h" #include "ui/aura/window_event_dispatcher.h" #include "ui/events/event.h" #include "ui/gfx/screen.h" +#include "ui/wm/public/activation_delegate.h" namespace ash { namespace internal { diff --git a/ash/extended_desktop_unittest.cc b/ash/extended_desktop_unittest.cc index 0554398..0bc1ed4 100644 --- a/ash/extended_desktop_unittest.cc +++ b/ash/extended_desktop_unittest.cc @@ -15,7 +15,6 @@ #include "ash/wm/window_util.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" -#include "ui/aura/client/activation_client.h" #include "ui/aura/client/capture_client.h" #include "ui/aura/client/focus_client.h" #include "ui/aura/test/event_generator.h" @@ -30,6 +29,7 @@ #include "ui/views/controls/textfield/textfield.h" #include "ui/views/widget/widget.h" #include "ui/views/widget/widget_delegate.h" +#include "ui/wm/public/activation_client.h" namespace ash { namespace { diff --git a/ash/focus_cycler.cc b/ash/focus_cycler.cc index efd958c..0fa83aa 100644 --- a/ash/focus_cycler.cc +++ b/ash/focus_cycler.cc @@ -8,11 +8,11 @@ #include "ash/wm/mru_window_tracker.h" #include "ash/wm/window_state.h" #include "ash/wm/window_util.h" -#include "ui/aura/client/activation_client.h" #include "ui/aura/window.h" #include "ui/views/accessible_pane_view.h" #include "ui/views/focus/focus_search.h" #include "ui/views/widget/widget.h" +#include "ui/wm/public/activation_client.h" namespace ash { diff --git a/ash/root_window_controller.cc b/ash/root_window_controller.cc index ba8eb3f..3b1fbce 100644 --- a/ash/root_window_controller.cc +++ b/ash/root_window_controller.cc @@ -48,9 +48,7 @@ #include "base/command_line.h" #include "base/time/time.h" #include "ui/aura/client/aura_constants.h" -#include "ui/aura/client/drag_drop_client.h" #include "ui/aura/client/screen_position_client.h" -#include "ui/aura/client/tooltip_client.h" #include "ui/aura/window.h" #include "ui/aura/window_delegate.h" #include "ui/aura/window_event_dispatcher.h" @@ -69,6 +67,8 @@ #include "ui/wm/core/easy_resize_window_targeter.h" #include "ui/wm/core/visibility_controller.h" #include "ui/wm/core/window_util.h" +#include "ui/wm/public/drag_drop_client.h" +#include "ui/wm/public/tooltip_client.h" #include "ui/wm/public/window_types.h" #if defined(OS_CHROMEOS) diff --git a/ash/shelf/shelf.cc b/ash/shelf/shelf.cc index 4f433ce..c973157 100644 --- a/ash/shelf/shelf.cc +++ b/ash/shelf/shelf.cc @@ -24,7 +24,6 @@ #include "ash/shell_window_ids.h" #include "ash/wm/window_properties.h" #include "grit/ash_resources.h" -#include "ui/aura/client/activation_client.h" #include "ui/aura/window.h" #include "ui/aura/window_event_dispatcher.h" #include "ui/aura/window_observer.h" @@ -37,6 +36,7 @@ #include "ui/views/accessible_pane_view.h" #include "ui/views/widget/widget.h" #include "ui/views/widget/widget_delegate.h" +#include "ui/wm/public/activation_client.h" namespace ash { diff --git a/ash/shelf/shelf_layout_manager.cc b/ash/shelf/shelf_layout_manager.cc index 18c3f25..8db87f4 100644 --- a/ash/shelf/shelf_layout_manager.cc +++ b/ash/shelf/shelf_layout_manager.cc @@ -36,7 +36,6 @@ #include "base/i18n/rtl.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h" -#include "ui/aura/client/activation_client.h" #include "ui/aura/client/cursor_client.h" #include "ui/aura/window_event_dispatcher.h" #include "ui/base/ui_base_switches.h" @@ -48,6 +47,7 @@ #include "ui/events/event_handler.h" #include "ui/gfx/screen.h" #include "ui/views/widget/widget.h" +#include "ui/wm/public/activation_client.h" namespace ash { namespace internal { diff --git a/ash/shelf/shelf_layout_manager.h b/ash/shelf/shelf_layout_manager.h index ef1f465..4e03c7a 100644 --- a/ash/shelf/shelf_layout_manager.h +++ b/ash/shelf/shelf_layout_manager.h @@ -21,12 +21,12 @@ #include "base/logging.h" #include "base/observer_list.h" #include "base/timer/timer.h" -#include "ui/aura/client/activation_change_observer.h" #include "ui/aura/layout_manager.h" #include "ui/gfx/insets.h" #include "ui/gfx/rect.h" #include "ui/keyboard/keyboard_controller.h" #include "ui/keyboard/keyboard_controller_observer.h" +#include "ui/wm/public/activation_change_observer.h" namespace aura { class RootWindow; diff --git a/ash/shelf/shelf_widget.cc b/ash/shelf/shelf_widget.cc index 47c6d07..f3f1f29 100644 --- a/ash/shelf/shelf_widget.cc +++ b/ash/shelf/shelf_widget.cc @@ -22,7 +22,6 @@ #include "ash/wm/window_properties.h" #include "ash/wm/workspace_controller.h" #include "grit/ash_resources.h" -#include "ui/aura/client/activation_client.h" #include "ui/aura/window.h" #include "ui/aura/window_event_dispatcher.h" #include "ui/aura/window_observer.h" @@ -38,6 +37,7 @@ #include "ui/views/widget/widget.h" #include "ui/views/widget/widget_delegate.h" #include "ui/wm/core/easy_resize_window_targeter.h" +#include "ui/wm/public/activation_client.h" namespace { // Size of black border at bottom (or side) of shelf. diff --git a/ash/shelf/shelf_window_watcher.cc b/ash/shelf/shelf_window_watcher.cc index 59cb38b..9488d10 100644 --- a/ash/shelf/shelf_window_watcher.cc +++ b/ash/shelf/shelf_window_watcher.cc @@ -16,11 +16,11 @@ #include "ash/wm/window_state.h" #include "ash/wm/window_util.h" #include "base/memory/scoped_ptr.h" -#include "ui/aura/client/activation_client.h" #include "ui/aura/window.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/image/image_skia.h" #include "ui/gfx/screen.h" +#include "ui/wm/public/activation_client.h" namespace { diff --git a/ash/shelf/shelf_window_watcher.h b/ash/shelf/shelf_window_watcher.h index 57b4ed2..ba42756 100644 --- a/ash/shelf/shelf_window_watcher.h +++ b/ash/shelf/shelf_window_watcher.h @@ -10,9 +10,9 @@ #include "base/compiler_specific.h" #include "base/memory/scoped_ptr.h" #include "base/scoped_observer.h" -#include "ui/aura/client/activation_change_observer.h" #include "ui/aura/window_observer.h" #include "ui/gfx/display_observer.h" +#include "ui/wm/public/activation_change_observer.h" namespace aura { diff --git a/ash/shell.h b/ash/shell.h index ddb59b6..b98378d 100644 --- a/ash/shell.h +++ b/ash/shell.h @@ -19,7 +19,6 @@ #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "base/observer_list.h" -#include "ui/aura/client/activation_change_observer.h" #include "ui/aura/window.h" #include "ui/base/ui_base_types.h" #include "ui/events/event_target.h" @@ -27,6 +26,7 @@ #include "ui/gfx/screen.h" #include "ui/gfx/size.h" #include "ui/wm/core/cursor_manager.h" +#include "ui/wm/public/activation_change_observer.h" namespace app_list { class AppListView; diff --git a/ash/test/test_activation_delegate.h b/ash/test/test_activation_delegate.h index 02aeb45..b60354e 100644 --- a/ash/test/test_activation_delegate.h +++ b/ash/test/test_activation_delegate.h @@ -7,9 +7,9 @@ #include "base/compiler_specific.h" #include "base/logging.h" -#include "ui/aura/client/activation_change_observer.h" -#include "ui/aura/client/activation_delegate.h" #include "ui/events/event_handler.h" +#include "ui/wm/public/activation_change_observer.h" +#include "ui/wm/public/activation_delegate.h" namespace aura { class Window; diff --git a/ash/tooltips/tooltip_controller_unittest.cc b/ash/tooltips/tooltip_controller_unittest.cc index 64e69dd..b41a99c 100644 --- a/ash/tooltips/tooltip_controller_unittest.cc +++ b/ash/tooltips/tooltip_controller_unittest.cc @@ -5,7 +5,6 @@ #include "ash/shell.h" #include "ash/test/ash_test_base.h" #include "base/strings/utf_string_conversions.h" -#include "ui/aura/client/tooltip_client.h" #include "ui/aura/env.h" #include "ui/aura/test/event_generator.h" #include "ui/aura/window.h" @@ -17,6 +16,7 @@ #include "ui/views/corewm/tooltip_controller_test_helper.h" #include "ui/views/view.h" #include "ui/views/widget/widget.h" +#include "ui/wm/public/tooltip_client.h" using views::corewm::TooltipController; using views::corewm::test::TooltipTestView; diff --git a/ash/wm/dock/docked_window_layout_manager.cc b/ash/wm/dock/docked_window_layout_manager.cc index 63ad210..04273e1b 100644 --- a/ash/wm/dock/docked_window_layout_manager.cc +++ b/ash/wm/dock/docked_window_layout_manager.cc @@ -26,7 +26,6 @@ #include "grit/ash_resources.h" #include "third_party/skia/include/core/SkColor.h" #include "third_party/skia/include/core/SkPaint.h" -#include "ui/aura/client/activation_client.h" #include "ui/aura/client/focus_client.h" #include "ui/aura/client/window_tree_client.h" #include "ui/aura/window.h" @@ -39,6 +38,7 @@ #include "ui/gfx/rect.h" #include "ui/views/background.h" #include "ui/wm/core/window_util.h" +#include "ui/wm/public/activation_client.h" namespace ash { namespace internal { diff --git a/ash/wm/dock/docked_window_layout_manager.h b/ash/wm/dock/docked_window_layout_manager.h index 974be11..18569d8 100644 --- a/ash/wm/dock/docked_window_layout_manager.h +++ b/ash/wm/dock/docked_window_layout_manager.h @@ -18,12 +18,12 @@ #include "base/memory/scoped_ptr.h" #include "base/observer_list.h" #include "base/time/time.h" -#include "ui/aura/client/activation_change_observer.h" #include "ui/aura/layout_manager.h" #include "ui/aura/window.h" #include "ui/aura/window_observer.h" #include "ui/gfx/rect.h" #include "ui/keyboard/keyboard_controller_observer.h" +#include "ui/wm/public/activation_change_observer.h" namespace aura { class Window; diff --git a/ash/wm/drag_details.h b/ash/wm/drag_details.h index 2d3bed4..d8f7d6e 100644 --- a/ash/wm/drag_details.h +++ b/ash/wm/drag_details.h @@ -9,8 +9,8 @@ #include "ash/wm/wm_types.h" #include "base/basictypes.h" #include "base/memory/scoped_ptr.h" -#include "ui/aura/client/window_move_client.h" #include "ui/gfx/rect.h" +#include "ui/wm/public/window_move_client.h" namespace aura { class Window; diff --git a/ash/wm/immersive_fullscreen_controller.cc b/ash/wm/immersive_fullscreen_controller.cc index 976eaae..b5df4b1 100644 --- a/ash/wm/immersive_fullscreen_controller.cc +++ b/ash/wm/immersive_fullscreen_controller.cc @@ -11,7 +11,6 @@ #include "ash/wm/resize_handle_window_targeter.h" #include "ash/wm/window_state.h" #include "base/metrics/histogram.h" -#include "ui/aura/client/activation_client.h" #include "ui/aura/client/aura_constants.h" #include "ui/aura/client/capture_client.h" #include "ui/aura/client/cursor_client.h" @@ -29,6 +28,7 @@ #include "ui/views/widget/widget.h" #include "ui/wm/core/transient_window_manager.h" #include "ui/wm/core/window_util.h" +#include "ui/wm/public/activation_client.h" using views::View; diff --git a/ash/wm/mru_window_tracker.cc b/ash/wm/mru_window_tracker.cc index 8e211b3..419fed5 100644 --- a/ash/wm/mru_window_tracker.cc +++ b/ash/wm/mru_window_tracker.cc @@ -13,10 +13,10 @@ #include "ash/wm/window_state.h" #include "ash/wm/window_util.h" #include "ash/wm/workspace_controller.h" -#include "ui/aura/client/activation_client.h" #include "ui/aura/window_event_dispatcher.h" #include "ui/events/event.h" #include "ui/events/event_handler.h" +#include "ui/wm/public/activation_client.h" namespace ash { diff --git a/ash/wm/mru_window_tracker.h b/ash/wm/mru_window_tracker.h index 2c2a5ea..78a42c3 100644 --- a/ash/wm/mru_window_tracker.h +++ b/ash/wm/mru_window_tracker.h @@ -11,8 +11,8 @@ #include "ash/ash_export.h" #include "base/basictypes.h" #include "base/memory/scoped_ptr.h" -#include "ui/aura/client/activation_change_observer.h" #include "ui/aura/window_observer.h" +#include "ui/wm/public/activation_change_observer.h" namespace aura { class RootWindow; diff --git a/ash/wm/overview/window_selector.cc b/ash/wm/overview/window_selector.cc index c36be04..15bdf3f 100644 --- a/ash/wm/overview/window_selector.cc +++ b/ash/wm/overview/window_selector.cc @@ -19,7 +19,6 @@ #include "base/command_line.h" #include "base/metrics/histogram.h" #include "base/strings/string_number_conversions.h" -#include "ui/aura/client/activation_client.h" #include "ui/aura/client/focus_client.h" #include "ui/aura/window.h" #include "ui/aura/window_event_dispatcher.h" @@ -27,6 +26,7 @@ #include "ui/events/event.h" #include "ui/events/event_handler.h" #include "ui/wm/core/window_util.h" +#include "ui/wm/public/activation_client.h" namespace ash { diff --git a/ash/wm/overview/window_selector.h b/ash/wm/overview/window_selector.h index d54e7ee..d34c901 100644 --- a/ash/wm/overview/window_selector.h +++ b/ash/wm/overview/window_selector.h @@ -13,8 +13,8 @@ #include "base/memory/scoped_ptr.h" #include "base/memory/scoped_vector.h" #include "base/time/time.h" -#include "ui/aura/client/activation_change_observer.h" #include "ui/aura/window_observer.h" +#include "ui/wm/public/activation_change_observer.h" namespace aura { class RootWindow; diff --git a/ash/wm/overview/window_selector_unittest.cc b/ash/wm/overview/window_selector_unittest.cc index d3edb7a..f78bcbf 100644 --- a/ash/wm/overview/window_selector_unittest.cc +++ b/ash/wm/overview/window_selector_unittest.cc @@ -24,7 +24,6 @@ #include "base/memory/scoped_vector.h" #include "base/run_loop.h" #include "base/strings/utf_string_conversions.h" -#include "ui/aura/client/activation_delegate.h" #include "ui/aura/client/aura_constants.h" #include "ui/aura/client/cursor_client.h" #include "ui/aura/client/focus_client.h" @@ -37,6 +36,7 @@ #include "ui/gfx/rect_conversions.h" #include "ui/gfx/transform.h" #include "ui/wm/core/window_util.h" +#include "ui/wm/public/activation_delegate.h" namespace ash { namespace internal { diff --git a/ash/wm/panels/panel_layout_manager.cc b/ash/wm/panels/panel_layout_manager.cc index 64b04c0..2592337 100644 --- a/ash/wm/panels/panel_layout_manager.cc +++ b/ash/wm/panels/panel_layout_manager.cc @@ -23,7 +23,6 @@ #include "third_party/skia/include/core/SkColor.h" #include "third_party/skia/include/core/SkPaint.h" #include "third_party/skia/include/core/SkPath.h" -#include "ui/aura/client/activation_client.h" #include "ui/aura/client/focus_client.h" #include "ui/aura/client/window_tree_client.h" #include "ui/aura/window.h" @@ -35,6 +34,7 @@ #include "ui/gfx/vector2d.h" #include "ui/views/background.h" #include "ui/views/widget/widget.h" +#include "ui/wm/public/activation_client.h" namespace ash { namespace internal { diff --git a/ash/wm/panels/panel_layout_manager.h b/ash/wm/panels/panel_layout_manager.h index aff6d58..150dd32 100644 --- a/ash/wm/panels/panel_layout_manager.h +++ b/ash/wm/panels/panel_layout_manager.h @@ -17,11 +17,11 @@ #include "base/compiler_specific.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" -#include "ui/aura/client/activation_change_observer.h" #include "ui/aura/layout_manager.h" #include "ui/aura/window_observer.h" #include "ui/keyboard/keyboard_controller.h" #include "ui/keyboard/keyboard_controller_observer.h" +#include "ui/wm/public/activation_change_observer.h" namespace aura { class Window; diff --git a/ash/wm/toplevel_window_event_handler.h b/ash/wm/toplevel_window_event_handler.h index 4998f4b..5d9caf8 100644 --- a/ash/wm/toplevel_window_event_handler.h +++ b/ash/wm/toplevel_window_event_handler.h @@ -13,10 +13,10 @@ #include "base/callback.h" #include "base/compiler_specific.h" #include "base/memory/scoped_ptr.h" -#include "ui/aura/client/window_move_client.h" #include "ui/events/event_handler.h" #include "ui/gfx/point.h" #include "ui/gfx/rect.h" +#include "ui/wm/public/window_move_client.h" namespace aura { class Window; diff --git a/ash/wm/toplevel_window_event_handler_unittest.cc b/ash/wm/toplevel_window_event_handler_unittest.cc index 437a519..a387067 100644 --- a/ash/wm/toplevel_window_event_handler_unittest.cc +++ b/ash/wm/toplevel_window_event_handler_unittest.cc @@ -18,7 +18,6 @@ #include "base/compiler_specific.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/aura/client/aura_constants.h" -#include "ui/aura/client/window_move_client.h" #include "ui/aura/test/aura_test_base.h" #include "ui/aura/test/event_generator.h" #include "ui/aura/test/test_window_delegate.h" @@ -27,6 +26,7 @@ #include "ui/events/event.h" #include "ui/gfx/screen.h" #include "ui/wm/core/window_util.h" +#include "ui/wm/public/window_move_client.h" #if defined(OS_WIN) // Windows headers define macros for these function names which screw with us. diff --git a/ash/wm/window_manager_unittest.cc b/ash/wm/window_manager_unittest.cc index b940474..92d2fdf 100644 --- a/ash/wm/window_manager_unittest.cc +++ b/ash/wm/window_manager_unittest.cc @@ -8,8 +8,6 @@ #include "ash/test/shell_test_api.h" #include "ash/test/test_activation_delegate.h" #include "ash/wm/window_util.h" -#include "ui/aura/client/activation_client.h" -#include "ui/aura/client/activation_delegate.h" #include "ui/aura/client/cursor_client_observer.h" #include "ui/aura/client/focus_client.h" #include "ui/aura/env.h" @@ -26,6 +24,8 @@ #include "ui/gfx/screen.h" #include "ui/wm/core/compound_event_filter.h" #include "ui/wm/core/input_method_event_filter.h" +#include "ui/wm/public/activation_client.h" +#include "ui/wm/public/activation_delegate.h" namespace { diff --git a/ash/wm/window_resizer.h b/ash/wm/window_resizer.h index 278d199..21cfd52 100644 --- a/ash/wm/window_resizer.h +++ b/ash/wm/window_resizer.h @@ -10,8 +10,8 @@ #include "ash/wm/window_state.h" #include "base/basictypes.h" #include "base/memory/scoped_ptr.h" -#include "ui/aura/client/window_move_client.h" #include "ui/gfx/rect.h" +#include "ui/wm/public/window_move_client.h" namespace aura { class Window; diff --git a/ash/wm/window_util.cc b/ash/wm/window_util.cc index e3263a0..906c885 100644 --- a/ash/wm/window_util.cc +++ b/ash/wm/window_util.cc @@ -12,7 +12,6 @@ #include "ash/wm/window_properties.h" #include "ash/wm/window_state.h" #include "ash/wm/wm_event.h" -#include "ui/aura/client/activation_client.h" #include "ui/aura/client/aura_constants.h" #include "ui/aura/window.h" #include "ui/aura/window_delegate.h" @@ -24,6 +23,7 @@ #include "ui/views/view.h" #include "ui/views/widget/widget.h" #include "ui/wm/core/window_util.h" +#include "ui/wm/public/activation_client.h" namespace ash { namespace wm { diff --git a/ash/wm/workspace/workspace_event_handler_unittest.cc b/ash/wm/workspace/workspace_event_handler_unittest.cc index de17d09..f02830a 100644 --- a/ash/wm/workspace/workspace_event_handler_unittest.cc +++ b/ash/wm/workspace/workspace_event_handler_unittest.cc @@ -13,7 +13,6 @@ #include "ash/wm/workspace_controller.h" #include "ash/wm/workspace_controller_test_helper.h" #include "ui/aura/client/aura_constants.h" -#include "ui/aura/client/window_move_client.h" #include "ui/aura/test/event_generator.h" #include "ui/aura/test/test_window_delegate.h" #include "ui/aura/window.h" @@ -22,6 +21,7 @@ #include "ui/events/event_processor.h" #include "ui/gfx/screen.h" #include "ui/wm/core/window_util.h" +#include "ui/wm/public/window_move_client.h" #if defined(OS_WIN) #include "base/win/windows_version.h" diff --git a/ash/wm/workspace/workspace_layout_manager.cc b/ash/wm/workspace/workspace_layout_manager.cc index d812be6..1b4b4af 100644 --- a/ash/wm/workspace/workspace_layout_manager.cc +++ b/ash/wm/workspace/workspace_layout_manager.cc @@ -18,7 +18,6 @@ #include "ash/wm/window_util.h" #include "ash/wm/wm_event.h" #include "ash/wm/workspace/workspace_layout_manager_delegate.h" -#include "ui/aura/client/activation_client.h" #include "ui/aura/client/aura_constants.h" #include "ui/aura/window.h" #include "ui/aura/window_observer.h" @@ -27,6 +26,7 @@ #include "ui/events/event.h" #include "ui/gfx/screen.h" #include "ui/wm/core/window_util.h" +#include "ui/wm/public/activation_client.h" using aura::Window; diff --git a/ash/wm/workspace/workspace_layout_manager.h b/ash/wm/workspace/workspace_layout_manager.h index ff15728..970f5e4 100644 --- a/ash/wm/workspace/workspace_layout_manager.h +++ b/ash/wm/workspace/workspace_layout_manager.h @@ -14,10 +14,10 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" #include "base/memory/scoped_ptr.h" -#include "ui/aura/client/activation_change_observer.h" #include "ui/aura/layout_manager.h" #include "ui/aura/window_observer.h" #include "ui/gfx/rect.h" +#include "ui/wm/public/activation_change_observer.h" namespace aura { class RootWindow; diff --git a/ash/wm/workspace_controller.cc b/ash/wm/workspace_controller.cc index d7cb7aa..96735be 100644 --- a/ash/wm/workspace_controller.cc +++ b/ash/wm/workspace_controller.cc @@ -14,7 +14,6 @@ #include "ash/wm/workspace/workspace_event_handler.h" #include "ash/wm/workspace/workspace_layout_manager.h" #include "ash/wm/workspace/workspace_layout_manager_delegate.h" -#include "ui/aura/client/activation_client.h" #include "ui/aura/client/aura_constants.h" #include "ui/aura/window.h" #include "ui/aura/window_event_dispatcher.h" @@ -22,6 +21,7 @@ #include "ui/compositor/scoped_layer_animation_settings.h" #include "ui/wm/core/visibility_controller.h" #include "ui/wm/core/window_animations.h" +#include "ui/wm/public/activation_client.h" namespace ash { namespace internal { diff --git a/chrome/browser/download/drag_download_item_views.cc b/chrome/browser/download/drag_download_item_views.cc index d334d40..44944b5 100644 --- a/chrome/browser/download/drag_download_item_views.cc +++ b/chrome/browser/download/drag_download_item_views.cc @@ -20,9 +20,9 @@ #include "url/gurl.h" #if defined(USE_AURA) -#include "ui/aura/client/drag_drop_client.h" #include "ui/aura/window.h" #include "ui/aura/window_event_dispatcher.h" +#include "ui/wm/public/drag_drop_client.h" #endif #if defined(OS_CHROMEOS) diff --git a/chrome/browser/ui/ash/launcher/app_window_launcher_controller.cc b/chrome/browser/ui/ash/launcher/app_window_launcher_controller.cc index e323e45..e12e8bb 100644 --- a/chrome/browser/ui/ash/launcher/app_window_launcher_controller.cc +++ b/chrome/browser/ui/ash/launcher/app_window_launcher_controller.cc @@ -15,8 +15,8 @@ #include "chrome/browser/ui/ash/multi_user/multi_user_window_manager.h" #include "chrome/browser/ui/host_desktop.h" #include "extensions/common/extension.h" -#include "ui/aura/client/activation_client.h" #include "ui/aura/window_event_dispatcher.h" +#include "ui/wm/public/activation_client.h" using apps::AppWindow; diff --git a/chrome/browser/ui/ash/launcher/app_window_launcher_controller.h b/chrome/browser/ui/ash/launcher/app_window_launcher_controller.h index 6b258b1..5f51a62 100644 --- a/chrome/browser/ui/ash/launcher/app_window_launcher_controller.h +++ b/chrome/browser/ui/ash/launcher/app_window_launcher_controller.h @@ -10,8 +10,8 @@ #include <string> #include "apps/app_window_registry.h" -#include "ui/aura/client/activation_change_observer.h" #include "ui/aura/window_observer.h" +#include "ui/wm/public/activation_change_observer.h" namespace apps { class AppWindow; diff --git a/chrome/browser/ui/ash/launcher/browser_status_monitor.cc b/chrome/browser/ui/ash/launcher/browser_status_monitor.cc index ad34095..285d0fc 100644 --- a/chrome/browser/ui/ash/launcher/browser_status_monitor.cc +++ b/chrome/browser/ui/ash/launcher/browser_status_monitor.cc @@ -17,10 +17,10 @@ #include "chrome/browser/ui/tabs/tab_strip_model.h" #include "chrome/browser/web_applications/web_app.h" #include "content/public/browser/web_contents.h" -#include "ui/aura/client/activation_client.h" #include "ui/aura/window.h" #include "ui/aura/window_event_dispatcher.h" #include "ui/gfx/screen.h" +#include "ui/wm/public/activation_client.h" BrowserStatusMonitor::LocalWebContentsObserver::LocalWebContentsObserver( content::WebContents* contents, diff --git a/chrome/browser/ui/ash/launcher/browser_status_monitor.h b/chrome/browser/ui/ash/launcher/browser_status_monitor.h index dd73bc1..6e54ac2 100644 --- a/chrome/browser/ui/ash/launcher/browser_status_monitor.h +++ b/chrome/browser/ui/ash/launcher/browser_status_monitor.h @@ -16,9 +16,9 @@ #include "chrome/browser/ui/browser_list_observer.h" #include "chrome/browser/ui/tabs/tab_strip_model_observer.h" #include "content/public/browser/web_contents_observer.h" -#include "ui/aura/client/activation_change_observer.h" #include "ui/aura/window_observer.h" #include "ui/gfx/display_observer.h" +#include "ui/wm/public/activation_change_observer.h" namespace aura { class Window; diff --git a/chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.cc b/chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.cc index 5a9ea72..d85677d8 100644 --- a/chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.cc +++ b/chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.cc @@ -37,7 +37,6 @@ #include "chrome/browser/ui/browser_window.h" #include "content/public/browser/notification_service.h" #include "google_apis/gaia/gaia_auth_util.h" -#include "ui/aura/client/activation_client.h" #include "ui/aura/client/aura_constants.h" #include "ui/aura/window.h" #include "ui/aura/window_event_dispatcher.h" @@ -47,6 +46,7 @@ #include "ui/wm/core/transient_window_manager.h" #include "ui/wm/core/window_animations.h" #include "ui/wm/core/window_util.h" +#include "ui/wm/public/activation_client.h" namespace { diff --git a/chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos_unittest.cc b/chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos_unittest.cc index e59c2ce..bc8aea5 100644 --- a/chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos_unittest.cc +++ b/chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos_unittest.cc @@ -17,11 +17,11 @@ #include "chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.h" #include "chrome/common/chrome_switches.h" #include "chrome/test/base/testing_profile.h" -#include "ui/aura/client/activation_client.h" #include "ui/aura/client/aura_constants.h" #include "ui/aura/window_event_dispatcher.h" #include "ui/base/ui_base_types.h" #include "ui/wm/core/window_util.h" +#include "ui/wm/public/activation_client.h" namespace ash { namespace test { diff --git a/chrome/browser/ui/views/extensions/extension_popup.cc b/chrome/browser/ui/views/extensions/extension_popup.cc index e8a31ab..dcacc5a 100644 --- a/chrome/browser/ui/views/extensions/extension_popup.cc +++ b/chrome/browser/ui/views/extensions/extension_popup.cc @@ -29,10 +29,10 @@ #include "ui/views/widget/widget.h" #if defined(USE_AURA) -#include "ui/aura/client/activation_client.h" #include "ui/aura/window.h" #include "ui/wm/core/window_animations.h" #include "ui/wm/core/window_util.h" +#include "ui/wm/public/activation_client.h" #endif #if defined(OS_WIN) diff --git a/chrome/browser/ui/views/extensions/extension_popup.h b/chrome/browser/ui/views/extensions/extension_popup.h index aa4be8f..172198c 100644 --- a/chrome/browser/ui/views/extensions/extension_popup.h +++ b/chrome/browser/ui/views/extensions/extension_popup.h @@ -16,7 +16,7 @@ #include "url/gurl.h" #if defined(USE_AURA) -#include "ui/aura/client/activation_change_observer.h" +#include "ui/wm/public/activation_change_observer.h" #endif class Browser; diff --git a/chrome/browser/ui/views/first_run_dialog.cc b/chrome/browser/ui/views/first_run_dialog.cc index 4825735..15a1169 100644 --- a/chrome/browser/ui/views/first_run_dialog.cc +++ b/chrome/browser/ui/views/first_run_dialog.cc @@ -15,7 +15,6 @@ #include "grit/generated_resources.h" #include "grit/locale_settings.h" #include "grit/theme_resources.h" -#include "ui/aura/client/dispatcher_client.h" #include "ui/aura/env.h" #include "ui/aura/window.h" #include "ui/aura/window_event_dispatcher.h" @@ -26,6 +25,7 @@ #include "ui/views/layout/layout_constants.h" #include "ui/views/widget/widget.h" #include "ui/views/window/dialog_delegate.h" +#include "ui/wm/public/dispatcher_client.h" #if defined(GOOGLE_CHROME_BUILD) #include "base/prefs/pref_service.h" diff --git a/chrome/browser/ui/views/simple_message_box_views.cc b/chrome/browser/ui/views/simple_message_box_views.cc index c5f1a93..d4baf17 100644 --- a/chrome/browser/ui/views/simple_message_box_views.cc +++ b/chrome/browser/ui/views/simple_message_box_views.cc @@ -13,7 +13,6 @@ #include "chrome/browser/browser_process.h" #include "chrome/browser/ui/views/constrained_window_views.h" #include "grit/generated_resources.h" -#include "ui/aura/client/dispatcher_client.h" #include "ui/aura/env.h" #include "ui/aura/window.h" #include "ui/aura/window_event_dispatcher.h" @@ -22,6 +21,7 @@ #include "ui/views/controls/message_box_view.h" #include "ui/views/widget/widget.h" #include "ui/views/window/dialog_delegate.h" +#include "ui/wm/public/dispatcher_client.h" #if defined(OS_WIN) #include "ui/base/win/message_box_win.h" diff --git a/chrome/browser/ui/window_sizer/window_sizer_ash_unittest.cc b/chrome/browser/ui/window_sizer/window_sizer_ash_unittest.cc index 8150107..3418e69 100644 --- a/chrome/browser/ui/window_sizer/window_sizer_ash_unittest.cc +++ b/chrome/browser/ui/window_sizer/window_sizer_ash_unittest.cc @@ -18,12 +18,12 @@ #include "chrome/test/base/testing_profile.h" #include "content/public/test/render_view_test.h" #include "testing/gtest/include/gtest/gtest.h" -#include "ui/aura/client/activation_client.h" #include "ui/aura/client/aura_constants.h" #include "ui/aura/env.h" #include "ui/aura/test/test_windows.h" #include "ui/aura/window_event_dispatcher.h" #include "ui/gfx/screen.h" +#include "ui/wm/public/activation_client.h" typedef ash::test::AshTestBase WindowSizerAshTest; diff --git a/content/browser/renderer_host/render_widget_host_view_aura.cc b/content/browser/renderer_host/render_widget_host_view_aura.cc index 0c1b017..f7c06a3 100644 --- a/content/browser/renderer_host/render_widget_host_view_aura.cc +++ b/content/browser/renderer_host/render_widget_host_view_aura.cc @@ -47,15 +47,11 @@ #include "third_party/WebKit/public/platform/WebScreenInfo.h" #include "third_party/WebKit/public/web/WebCompositionUnderline.h" #include "third_party/WebKit/public/web/WebInputEvent.h" -#include "ui/aura/client/activation_client.h" #include "ui/aura/client/aura_constants.h" #include "ui/aura/client/cursor_client.h" #include "ui/aura/client/cursor_client_observer.h" #include "ui/aura/client/focus_client.h" -#include "ui/aura/client/scoped_tooltip_disabler.h" #include "ui/aura/client/screen_position_client.h" -#include "ui/aura/client/tooltip_client.h" -#include "ui/aura/client/transient_window_client.h" #include "ui/aura/client/window_tree_client.h" #include "ui/aura/env.h" #include "ui/aura/window.h" @@ -78,6 +74,10 @@ #include "ui/gfx/screen.h" #include "ui/gfx/size_conversions.h" #include "ui/gfx/skia_util.h" +#include "ui/wm/public/activation_client.h" +#include "ui/wm/public/scoped_tooltip_disabler.h" +#include "ui/wm/public/tooltip_client.h" +#include "ui/wm/public/transient_window_client.h" #include "ui/wm/public/window_types.h" #if defined(OS_WIN) diff --git a/content/browser/renderer_host/render_widget_host_view_aura.h b/content/browser/renderer_host/render_widget_host_view_aura.h index fb57907..bc2ad37 100644 --- a/content/browser/renderer_host/render_widget_host_view_aura.h +++ b/content/browser/renderer_host/render_widget_host_view_aura.h @@ -29,8 +29,6 @@ #include "content/common/cursors/webcursor.h" #include "content/common/gpu/client/gl_helper.h" #include "third_party/skia/include/core/SkRegion.h" -#include "ui/aura/client/activation_change_observer.h" -#include "ui/aura/client/activation_delegate.h" #include "ui/aura/client/cursor_client_observer.h" #include "ui/aura/client/focus_change_observer.h" #include "ui/aura/window_delegate.h" @@ -41,6 +39,8 @@ #include "ui/compositor/compositor_vsync_manager.h" #include "ui/gfx/display_observer.h" #include "ui/gfx/rect.h" +#include "ui/wm/public/activation_change_observer.h" +#include "ui/wm/public/activation_delegate.h" namespace aura { class WindowTracker; diff --git a/content/browser/web_contents/touch_editable_impl_aura.cc b/content/browser/web_contents/touch_editable_impl_aura.cc index df07a00..4da536d 100644 --- a/content/browser/web_contents/touch_editable_impl_aura.cc +++ b/content/browser/web_contents/touch_editable_impl_aura.cc @@ -12,13 +12,13 @@ #include "content/public/browser/render_widget_host.h" #include "content/public/browser/web_contents.h" #include "grit/ui_strings.h" -#include "ui/aura/client/activation_client.h" #include "ui/aura/client/screen_position_client.h" #include "ui/aura/window.h" #include "ui/aura/window_tree_host.h" #include "ui/base/clipboard/clipboard.h" #include "ui/base/ui_base_switches_util.h" #include "ui/gfx/range/range.h" +#include "ui/wm/public/activation_client.h" namespace content { diff --git a/content/browser/web_contents/web_contents_view_aura.cc b/content/browser/web_contents/web_contents_view_aura.cc index 361f43c..7f7272d 100644 --- a/content/browser/web_contents/web_contents_view_aura.cc +++ b/content/browser/web_contents/web_contents_view_aura.cc @@ -44,8 +44,6 @@ #include "net/base/net_util.h" #include "third_party/WebKit/public/web/WebInputEvent.h" #include "ui/aura/client/aura_constants.h" -#include "ui/aura/client/drag_drop_client.h" -#include "ui/aura/client/drag_drop_delegate.h" #include "ui/aura/client/window_tree_client.h" #include "ui/aura/env.h" #include "ui/aura/window.h" @@ -68,6 +66,8 @@ #include "ui/gfx/image/image_png_rep.h" #include "ui/gfx/image/image_skia.h" #include "ui/gfx/screen.h" +#include "ui/wm/public/drag_drop_client.h" +#include "ui/wm/public/drag_drop_delegate.h" namespace content { WebContentsViewPort* CreateWebContentsView( diff --git a/content/browser/web_contents/web_contents_view_aura.h b/content/browser/web_contents/web_contents_view_aura.h index bef8648..95b2424 100644 --- a/content/browser/web_contents/web_contents_view_aura.h +++ b/content/browser/web_contents/web_contents_view_aura.h @@ -13,9 +13,9 @@ #include "content/common/content_export.h" #include "content/port/browser/render_view_host_delegate_view.h" #include "content/port/browser/web_contents_view_port.h" -#include "ui/aura/client/drag_drop_delegate.h" #include "ui/aura/window_delegate.h" #include "ui/compositor/layer_animation_observer.h" +#include "ui/wm/public/drag_drop_delegate.h" namespace aura { class Window; diff --git a/ui/aura/aura.gyp b/ui/aura/aura.gyp index cc94586..6bf7b2e 100644 --- a/ui/aura/aura.gyp +++ b/ui/aura/aura.gyp @@ -27,14 +27,6 @@ 'AURA_IMPLEMENTATION', ], 'sources': [ - 'client/activation_change_observer.h', - 'client/activation_change_observer.cc', - 'client/activation_client.cc', - 'client/activation_client.h', - 'client/activation_delegate.cc', - 'client/activation_delegate.h', - 'client/animation_host.cc', - 'client/animation_host.h', 'client/aura_constants.cc', 'client/aura_constants.h', 'client/capture_client.cc', @@ -48,30 +40,16 @@ 'client/default_activation_client.h', 'client/default_capture_client.cc', 'client/default_capture_client.h', - 'client/dispatcher_client.cc', - 'client/dispatcher_client.h', - 'client/drag_drop_client.cc', - 'client/drag_drop_client.h', - 'client/drag_drop_delegate.cc', - 'client/drag_drop_delegate.h', 'client/event_client.cc', 'client/event_client.h', 'client/focus_change_observer.cc', 'client/focus_change_observer.h', 'client/focus_client.cc', 'client/focus_client.h', - 'client/scoped_tooltip_disabler.cc', - 'client/scoped_tooltip_disabler.h', 'client/screen_position_client.cc', 'client/screen_position_client.h', - 'client/tooltip_client.cc', - 'client/tooltip_client.h', - 'client/transient_window_client.cc', - 'client/transient_window_client.h', 'client/visibility_client.cc', 'client/visibility_client.h', - 'client/window_move_client.cc', - 'client/window_move_client.h', 'client/window_stacking_client.cc', 'client/window_stacking_client.h', 'client/window_tree_client.cc', @@ -114,6 +92,28 @@ 'window_tree_host_win.h', 'window_tree_host_x11.cc', 'window_tree_host_x11.h', + '../wm/public/activation_change_observer.h', + '../wm/public/activation_change_observer.cc', + '../wm/public/activation_client.cc', + '../wm/public/activation_client.h', + '../wm/public/activation_delegate.cc', + '../wm/public/activation_delegate.h', + '../wm/public/animation_host.cc', + '../wm/public/animation_host.h', + '../wm/public/dispatcher_client.cc', + '../wm/public/dispatcher_client.h', + '../wm/public/drag_drop_client.cc', + '../wm/public/drag_drop_client.h', + '../wm/public/drag_drop_delegate.cc', + '../wm/public/drag_drop_delegate.h', + '../wm/public/scoped_tooltip_disabler.cc', + '../wm/public/scoped_tooltip_disabler.h', + '../wm/public/tooltip_client.cc', + '../wm/public/tooltip_client.h', + '../wm/public/transient_window_client.cc', + '../wm/public/transient_window_client.h', + '../wm/public/window_move_client.cc', + '../wm/public/window_move_client.h', ], 'conditions': [ ['use_x11==1', { diff --git a/ui/aura/client/default_activation_client.cc b/ui/aura/client/default_activation_client.cc index ccb660b..b11d7bf 100644 --- a/ui/aura/client/default_activation_client.cc +++ b/ui/aura/client/default_activation_client.cc @@ -4,9 +4,9 @@ #include "ui/aura/client/default_activation_client.h" -#include "ui/aura/client/activation_change_observer.h" -#include "ui/aura/client/activation_delegate.h" #include "ui/aura/window.h" +#include "ui/wm/public/activation_change_observer.h" +#include "ui/wm/public/activation_delegate.h" namespace aura { namespace client { diff --git a/ui/aura/client/default_activation_client.h b/ui/aura/client/default_activation_client.h index 842ee90..47e19dbc 100644 --- a/ui/aura/client/default_activation_client.h +++ b/ui/aura/client/default_activation_client.h @@ -11,8 +11,8 @@ #include "base/logging.h" #include "base/observer_list.h" #include "ui/aura/aura_export.h" -#include "ui/aura/client/activation_client.h" #include "ui/aura/window_observer.h" +#include "ui/wm/public/activation_client.h" namespace aura { namespace client { diff --git a/ui/views/controls/menu/menu_controller.cc b/ui/views/controls/menu/menu_controller.cc index 16f2ad3..5d58c69 100644 --- a/ui/views/controls/menu/menu_controller.cc +++ b/ui/views/controls/menu/menu_controller.cc @@ -13,7 +13,6 @@ #include "base/run_loop.h" #include "base/strings/utf_string_conversions.h" #include "base/time/time.h" -#include "ui/aura/client/dispatcher_client.h" #include "ui/aura/env.h" #include "ui/aura/window.h" #include "ui/aura/window_event_dispatcher.h" @@ -44,6 +43,7 @@ #include "ui/views/widget/root_view.h" #include "ui/views/widget/tooltip_manager.h" #include "ui/views/widget/widget.h" +#include "ui/wm/public/dispatcher_client.h" #if defined(OS_WIN) #include "ui/base/win/internal_constants.h" diff --git a/ui/views/controls/menu/menu_controller_aura.cc b/ui/views/controls/menu/menu_controller_aura.cc index 726b8c4..ec402c7 100644 --- a/ui/views/controls/menu/menu_controller_aura.cc +++ b/ui/views/controls/menu/menu_controller_aura.cc @@ -5,14 +5,14 @@ #include "ui/views/controls/menu/menu_controller.h" #include "base/run_loop.h" -#include "ui/aura/client/activation_change_observer.h" -#include "ui/aura/client/activation_client.h" -#include "ui/aura/client/dispatcher_client.h" -#include "ui/aura/client/drag_drop_client.h" #include "ui/aura/window.h" #include "ui/aura/window_observer.h" #include "ui/gfx/screen.h" #include "ui/views/widget/widget.h" +#include "ui/wm/public/activation_change_observer.h" +#include "ui/wm/public/activation_client.h" +#include "ui/wm/public/dispatcher_client.h" +#include "ui/wm/public/drag_drop_client.h" namespace views { diff --git a/ui/views/corewm/tooltip_controller.cc b/ui/views/corewm/tooltip_controller.cc index c5e621b..500466f 100644 --- a/ui/views/corewm/tooltip_controller.cc +++ b/ui/views/corewm/tooltip_controller.cc @@ -10,7 +10,6 @@ #include "base/time/time.h" #include "ui/aura/client/capture_client.h" #include "ui/aura/client/cursor_client.h" -#include "ui/aura/client/drag_drop_client.h" #include "ui/aura/client/screen_position_client.h" #include "ui/aura/env.h" #include "ui/aura/window.h" @@ -20,6 +19,7 @@ #include "ui/gfx/screen.h" #include "ui/views/corewm/tooltip.h" #include "ui/views/widget/tooltip_manager.h" +#include "ui/wm/public/drag_drop_client.h" namespace views { namespace corewm { diff --git a/ui/views/corewm/tooltip_controller.h b/ui/views/corewm/tooltip_controller.h index e75a1e6..9815df1 100644 --- a/ui/views/corewm/tooltip_controller.h +++ b/ui/views/corewm/tooltip_controller.h @@ -10,11 +10,11 @@ #include "base/memory/scoped_ptr.h" #include "base/strings/string16.h" #include "base/timer/timer.h" -#include "ui/aura/client/tooltip_client.h" #include "ui/aura/window_observer.h" #include "ui/events/event_handler.h" #include "ui/gfx/point.h" #include "ui/views/views_export.h" +#include "ui/wm/public/tooltip_client.h" namespace aura { class Window; diff --git a/ui/views/corewm/tooltip_controller_unittest.cc b/ui/views/corewm/tooltip_controller_unittest.cc index 39cab8e..152a5a2 100644 --- a/ui/views/corewm/tooltip_controller_unittest.cc +++ b/ui/views/corewm/tooltip_controller_unittest.cc @@ -7,7 +7,6 @@ #include "base/strings/utf_string_conversions.h" #include "ui/aura/client/cursor_client.h" #include "ui/aura/client/screen_position_client.h" -#include "ui/aura/client/tooltip_client.h" #include "ui/aura/env.h" #include "ui/aura/test/aura_test_base.h" #include "ui/aura/test/event_generator.h" @@ -27,6 +26,7 @@ #include "ui/views/widget/tooltip_manager.h" #include "ui/views/widget/widget.h" #include "ui/wm/core/wm_state.h" +#include "ui/wm/public/tooltip_client.h" #include "ui/wm/public/window_types.h" #if defined(OS_WIN) diff --git a/ui/views/drag_utils.cc b/ui/views/drag_utils.cc index 27f6d58..840d75f 100644 --- a/ui/views/drag_utils.cc +++ b/ui/views/drag_utils.cc @@ -4,7 +4,6 @@ #include "ui/views/drag_utils.h" -#include "ui/aura/client/drag_drop_client.h" #include "ui/aura/window.h" #include "ui/aura/window_event_dispatcher.h" #include "ui/gfx/canvas.h" @@ -12,6 +11,7 @@ #include "ui/gfx/screen.h" #include "ui/gfx/size.h" #include "ui/views/widget/widget.h" +#include "ui/wm/public/drag_drop_client.h" float GetDeviceScaleForNativeView(views::Widget* widget) { float device_scale = 1.0f; diff --git a/ui/views/widget/desktop_aura/desktop_dispatcher_client.h b/ui/views/widget/desktop_aura/desktop_dispatcher_client.h index 0d01df2..5351d8a 100644 --- a/ui/views/widget/desktop_aura/desktop_dispatcher_client.h +++ b/ui/views/widget/desktop_aura/desktop_dispatcher_client.h @@ -8,8 +8,8 @@ #include "base/basictypes.h" #include "base/callback.h" #include "base/memory/weak_ptr.h" -#include "ui/aura/client/dispatcher_client.h" #include "ui/views/views_export.h" +#include "ui/wm/public/dispatcher_client.h" namespace views { diff --git a/ui/views/widget/desktop_aura/desktop_drag_drop_client_aurax11.cc b/ui/views/widget/desktop_aura/desktop_drag_drop_client_aurax11.cc index 0fcebdc..109c052 100644 --- a/ui/views/widget/desktop_aura/desktop_drag_drop_client_aurax11.cc +++ b/ui/views/widget/desktop_aura/desktop_drag_drop_client_aurax11.cc @@ -10,8 +10,6 @@ #include "base/lazy_instance.h" #include "base/message_loop/message_loop.h" #include "base/message_loop/message_pump_dispatcher.h" -#include "ui/aura/client/drag_drop_client.h" -#include "ui/aura/client/drag_drop_delegate.h" #include "ui/aura/window.h" #include "ui/aura/window_tree_host.h" #include "ui/base/dragdrop/drag_drop_types.h" @@ -22,6 +20,8 @@ #include "ui/base/x/x11_util.h" #include "ui/events/event.h" #include "ui/views/widget/desktop_aura/desktop_native_cursor_manager.h" +#include "ui/wm/public/drag_drop_client.h" +#include "ui/wm/public/drag_drop_delegate.h" using aura::client::DragDropDelegate; using ui::OSExchangeData; diff --git a/ui/views/widget/desktop_aura/desktop_drag_drop_client_aurax11.h b/ui/views/widget/desktop_aura/desktop_drag_drop_client_aurax11.h index f77e60fe..4f492e4 100644 --- a/ui/views/widget/desktop_aura/desktop_drag_drop_client_aurax11.h +++ b/ui/views/widget/desktop_aura/desktop_drag_drop_client_aurax11.h @@ -11,7 +11,6 @@ #include "base/compiler_specific.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" -#include "ui/aura/client/drag_drop_client.h" #include "ui/aura/window_observer.h" #include "ui/base/cursor/cursor.h" #include "ui/gfx/point.h" @@ -19,6 +18,7 @@ #include "ui/views/views_export.h" #include "ui/views/widget/desktop_aura/x11_whole_screen_move_loop.h" #include "ui/views/widget/desktop_aura/x11_whole_screen_move_loop_delegate.h" +#include "ui/wm/public/drag_drop_client.h" namespace aura { namespace client { diff --git a/ui/views/widget/desktop_aura/desktop_drag_drop_client_win.h b/ui/views/widget/desktop_aura/desktop_drag_drop_client_win.h index eda12e0..a8051ca 100644 --- a/ui/views/widget/desktop_aura/desktop_drag_drop_client_win.h +++ b/ui/views/widget/desktop_aura/desktop_drag_drop_client_win.h @@ -7,8 +7,8 @@ #include "base/compiler_specific.h" #include "base/memory/ref_counted.h" -#include "ui/aura/client/drag_drop_client.h" #include "ui/views/views_export.h" +#include "ui/wm/public/drag_drop_client.h" namespace ui { class DragSourceWin; diff --git a/ui/views/widget/desktop_aura/desktop_drop_target_win.cc b/ui/views/widget/desktop_aura/desktop_drop_target_win.cc index f1409f8..1369b62 100644 --- a/ui/views/widget/desktop_aura/desktop_drop_target_win.cc +++ b/ui/views/widget/desktop_aura/desktop_drop_target_win.cc @@ -5,14 +5,14 @@ #include "ui/views/widget/desktop_aura/desktop_drop_target_win.h" #include "base/win/win_util.h" -#include "ui/aura/client/drag_drop_client.h" -#include "ui/aura/client/drag_drop_delegate.h" #include "ui/aura/window.h" #include "ui/aura/window_tree_host.h" #include "ui/base/dragdrop/drag_drop_types.h" #include "ui/base/dragdrop/drop_target_event.h" #include "ui/base/dragdrop/os_exchange_data_provider_win.h" #include "ui/events/event_constants.h" +#include "ui/wm/public/drag_drop_client.h" +#include "ui/wm/public/drag_drop_delegate.h" using aura::client::DragDropDelegate; using ui::OSExchangeData; diff --git a/ui/views/widget/desktop_aura/desktop_native_widget_aura.cc b/ui/views/widget/desktop_aura/desktop_native_widget_aura.cc index 0caeab2..c14d1ce 100644 --- a/ui/views/widget/desktop_aura/desktop_native_widget_aura.cc +++ b/ui/views/widget/desktop_aura/desktop_native_widget_aura.cc @@ -6,10 +6,8 @@ #include "base/bind.h" #include "base/debug/trace_event.h" -#include "ui/aura/client/activation_client.h" #include "ui/aura/client/aura_constants.h" #include "ui/aura/client/cursor_client.h" -#include "ui/aura/client/drag_drop_client.h" #include "ui/aura/client/focus_client.h" #include "ui/aura/client/window_tree_client.h" #include "ui/aura/window.h" @@ -55,6 +53,8 @@ #include "ui/wm/core/shadow_types.h" #include "ui/wm/core/visibility_controller.h" #include "ui/wm/core/window_modality_controller.h" +#include "ui/wm/public/activation_client.h" +#include "ui/wm/public/drag_drop_client.h" #if defined(OS_WIN) #include "ui/base/win/shell.h" diff --git a/ui/views/widget/desktop_aura/desktop_native_widget_aura.h b/ui/views/widget/desktop_aura/desktop_native_widget_aura.h index 05573b9..3f8b0a9 100644 --- a/ui/views/widget/desktop_aura/desktop_native_widget_aura.h +++ b/ui/views/widget/desktop_aura/desktop_native_widget_aura.h @@ -6,9 +6,6 @@ #define UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_NATIVE_WIDGET_AURA_H_ #include "base/memory/weak_ptr.h" -#include "ui/aura/client/activation_change_observer.h" -#include "ui/aura/client/activation_delegate.h" -#include "ui/aura/client/drag_drop_delegate.h" #include "ui/aura/client/focus_change_observer.h" #include "ui/aura/window_delegate.h" #include "ui/aura/window_tree_host_observer.h" @@ -16,6 +13,9 @@ #include "ui/views/ime/input_method_delegate.h" #include "ui/views/widget/native_widget_private.h" #include "ui/wm/core/compound_event_filter.h" +#include "ui/wm/public/activation_change_observer.h" +#include "ui/wm/public/activation_delegate.h" +#include "ui/wm/public/drag_drop_delegate.h" namespace aura { class WindowEventDispatcher; diff --git a/ui/views/widget/desktop_aura/desktop_native_widget_aura_unittest.cc b/ui/views/widget/desktop_aura/desktop_native_widget_aura_unittest.cc index 6752cfb..30dc551 100644 --- a/ui/views/widget/desktop_aura/desktop_native_widget_aura_unittest.cc +++ b/ui/views/widget/desktop_aura/desktop_native_widget_aura_unittest.cc @@ -6,12 +6,12 @@ #include "base/bind.h" #include "ui/aura/client/cursor_client.h" -#include "ui/aura/client/dispatcher_client.h" #include "ui/aura/test/test_window_delegate.h" #include "ui/aura/window.h" #include "ui/aura/window_tree_host.h" #include "ui/views/test/views_test_base.h" #include "ui/views/widget/widget.h" +#include "ui/wm/public/dispatcher_client.h" namespace views { diff --git a/ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc b/ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc index 47bd630..2fc499b 100644 --- a/ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc +++ b/ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc @@ -10,7 +10,6 @@ #include "ui/aura/client/aura_constants.h" #include "ui/aura/client/cursor_client.h" #include "ui/aura/client/focus_client.h" -#include "ui/aura/client/scoped_tooltip_disabler.h" #include "ui/aura/window_event_dispatcher.h" #include "ui/aura/window_property.h" #include "ui/base/cursor/cursor_loader_win.h" @@ -40,6 +39,7 @@ #include "ui/wm/core/compound_event_filter.h" #include "ui/wm/core/input_method_event_filter.h" #include "ui/wm/core/window_animations.h" +#include "ui/wm/public/scoped_tooltip_disabler.h" namespace views { diff --git a/ui/views/widget/desktop_aura/desktop_window_tree_host_win.h b/ui/views/widget/desktop_aura/desktop_window_tree_host_win.h index a510ed3..dc8a218 100644 --- a/ui/views/widget/desktop_aura/desktop_window_tree_host_win.h +++ b/ui/views/widget/desktop_aura/desktop_window_tree_host_win.h @@ -5,11 +5,11 @@ #ifndef UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_WINDOW_TREE_HOST_WIN_H_ #define UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_WINDOW_TREE_HOST_WIN_H_ -#include "ui/aura/client/animation_host.h" #include "ui/aura/window_tree_host.h" #include "ui/views/views_export.h" #include "ui/views/widget/desktop_aura/desktop_window_tree_host.h" #include "ui/views/win/hwnd_message_handler_delegate.h" +#include "ui/wm/public/animation_host.h" namespace aura { namespace client { diff --git a/ui/views/widget/desktop_aura/x11_desktop_window_move_client.h b/ui/views/widget/desktop_aura/x11_desktop_window_move_client.h index 12e5928..42b7d02 100644 --- a/ui/views/widget/desktop_aura/x11_desktop_window_move_client.h +++ b/ui/views/widget/desktop_aura/x11_desktop_window_move_client.h @@ -11,11 +11,11 @@ #include "base/compiler_specific.h" #include "base/message_loop/message_loop.h" #include "base/timer/timer.h" -#include "ui/aura/client/window_move_client.h" #include "ui/gfx/point.h" #include "ui/views/views_export.h" #include "ui/views/widget/desktop_aura/x11_whole_screen_move_loop.h" #include "ui/views/widget/desktop_aura/x11_whole_screen_move_loop_delegate.h" +#include "ui/wm/public/window_move_client.h" namespace aura { class WindowTreeHost; diff --git a/ui/views/widget/native_widget_aura.cc b/ui/views/widget/native_widget_aura.cc index 30f2aea..4463e6a 100644 --- a/ui/views/widget/native_widget_aura.cc +++ b/ui/views/widget/native_widget_aura.cc @@ -7,13 +7,10 @@ #include "base/bind.h" #include "base/strings/string_util.h" #include "third_party/skia/include/core/SkRegion.h" -#include "ui/aura/client/activation_client.h" #include "ui/aura/client/aura_constants.h" #include "ui/aura/client/cursor_client.h" -#include "ui/aura/client/drag_drop_client.h" #include "ui/aura/client/focus_client.h" #include "ui/aura/client/screen_position_client.h" -#include "ui/aura/client/window_move_client.h" #include "ui/aura/client/window_tree_client.h" #include "ui/aura/env.h" #include "ui/aura/window.h" @@ -39,6 +36,9 @@ #include "ui/views/widget/widget_delegate.h" #include "ui/views/widget/window_reorderer.h" #include "ui/wm/core/window_util.h" +#include "ui/wm/public/activation_client.h" +#include "ui/wm/public/drag_drop_client.h" +#include "ui/wm/public/window_move_client.h" #include "ui/wm/public/window_types.h" #if defined(OS_WIN) diff --git a/ui/views/widget/native_widget_aura.h b/ui/views/widget/native_widget_aura.h index f5082f0..ea85012 100644 --- a/ui/views/widget/native_widget_aura.h +++ b/ui/views/widget/native_widget_aura.h @@ -7,9 +7,6 @@ #include "base/memory/scoped_vector.h" #include "base/memory/weak_ptr.h" -#include "ui/aura/client/activation_change_observer.h" -#include "ui/aura/client/activation_delegate.h" -#include "ui/aura/client/drag_drop_delegate.h" #include "ui/aura/client/focus_change_observer.h" #include "ui/aura/window_delegate.h" #include "ui/base/cursor/cursor.h" @@ -17,6 +14,9 @@ #include "ui/views/ime/input_method_delegate.h" #include "ui/views/views_export.h" #include "ui/views/widget/native_widget_private.h" +#include "ui/wm/public/activation_change_observer.h" +#include "ui/wm/public/activation_delegate.h" +#include "ui/wm/public/drag_drop_delegate.h" namespace aura { class Window; diff --git a/ui/views/widget/tooltip_manager_aura.cc b/ui/views/widget/tooltip_manager_aura.cc index fa04cb0..986ea5d 100644 --- a/ui/views/widget/tooltip_manager_aura.cc +++ b/ui/views/widget/tooltip_manager_aura.cc @@ -6,13 +6,13 @@ #include "base/logging.h" #include "ui/aura/client/screen_position_client.h" -#include "ui/aura/client/tooltip_client.h" #include "ui/aura/window_event_dispatcher.h" #include "ui/aura/window_tree_host.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/rect.h" #include "ui/gfx/screen.h" #include "ui/views/widget/widget.h" +#include "ui/wm/public/tooltip_client.h" namespace views { diff --git a/ui/views/widget/widget_interactive_uitest.cc b/ui/views/widget/widget_interactive_uitest.cc index 232e88a..6aa255f 100644 --- a/ui/views/widget/widget_interactive_uitest.cc +++ b/ui/views/widget/widget_interactive_uitest.cc @@ -6,7 +6,6 @@ #include "base/bind.h" #include "base/path_service.h" #include "base/run_loop.h" -#include "ui/aura/client/activation_client.h" #include "ui/aura/client/focus_client.h" #include "ui/aura/env.h" #include "ui/aura/window.h" @@ -19,6 +18,7 @@ #include "ui/views/test/widget_test.h" #include "ui/views/widget/widget.h" #include "ui/views/window/dialog_delegate.h" +#include "ui/wm/public/activation_client.h" #if !defined(OS_CHROMEOS) #include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h" diff --git a/ui/wm/core/base_focus_rules.cc b/ui/wm/core/base_focus_rules.cc index bb90941..e7160b7 100644 --- a/ui/wm/core/base_focus_rules.cc +++ b/ui/wm/core/base_focus_rules.cc @@ -4,12 +4,12 @@ #include "ui/wm/core/base_focus_rules.h" -#include "ui/aura/client/activation_delegate.h" #include "ui/aura/client/focus_client.h" #include "ui/aura/window.h" #include "ui/aura/window_event_dispatcher.h" #include "ui/wm/core/window_modality_controller.h" #include "ui/wm/core/window_util.h" +#include "ui/wm/public/activation_delegate.h" namespace wm { namespace { diff --git a/ui/wm/core/compound_event_filter.cc b/ui/wm/core/compound_event_filter.cc index 620babd..711d7e4 100644 --- a/ui/wm/core/compound_event_filter.cc +++ b/ui/wm/core/compound_event_filter.cc @@ -6,9 +6,7 @@ #include "base/containers/hash_tables.h" #include "base/logging.h" -#include "ui/aura/client/activation_client.h" #include "ui/aura/client/cursor_client.h" -#include "ui/aura/client/drag_drop_client.h" #include "ui/aura/env.h" #include "ui/aura/window.h" #include "ui/aura/window_delegate.h" @@ -16,6 +14,8 @@ #include "ui/aura/window_tracker.h" #include "ui/base/hit_test.h" #include "ui/events/event.h" +#include "ui/wm/public/activation_client.h" +#include "ui/wm/public/drag_drop_client.h" #if defined(OS_CHROMEOS) && defined(USE_X11) #include "ui/events/x/touch_factory_x11.h" diff --git a/ui/wm/core/compound_event_filter_unittest.cc b/ui/wm/core/compound_event_filter_unittest.cc index a0d193e..9cc9b60 100644 --- a/ui/wm/core/compound_event_filter_unittest.cc +++ b/ui/wm/core/compound_event_filter_unittest.cc @@ -4,7 +4,6 @@ #include "ui/wm/core/compound_event_filter.h" -#include "ui/aura/client/activation_client.h" #include "ui/aura/client/cursor_client.h" #include "ui/aura/env.h" #include "ui/aura/test/aura_test_base.h" @@ -15,6 +14,7 @@ #include "ui/aura/window_event_dispatcher.h" #include "ui/events/event.h" #include "ui/events/event_utils.h" +#include "ui/wm/public/activation_client.h" namespace { diff --git a/ui/wm/core/easy_resize_window_targeter.cc b/ui/wm/core/easy_resize_window_targeter.cc index 24d5760..d352e52 100644 --- a/ui/wm/core/easy_resize_window_targeter.cc +++ b/ui/wm/core/easy_resize_window_targeter.cc @@ -4,10 +4,10 @@ #include "ui/wm/core/easy_resize_window_targeter.h" -#include "ui/aura/client/transient_window_client.h" #include "ui/aura/window.h" #include "ui/gfx/geometry/insets_f.h" #include "ui/gfx/geometry/rect.h" +#include "ui/wm/public/transient_window_client.h" namespace wm { diff --git a/ui/wm/core/focus_controller.cc b/ui/wm/core/focus_controller.cc index 38e8920..f4d3f3f 100644 --- a/ui/wm/core/focus_controller.cc +++ b/ui/wm/core/focus_controller.cc @@ -5,7 +5,6 @@ #include "ui/wm/core/focus_controller.h" #include "base/auto_reset.h" -#include "ui/aura/client/activation_change_observer.h" #include "ui/aura/client/aura_constants.h" #include "ui/aura/client/capture_client.h" #include "ui/aura/client/focus_change_observer.h" @@ -14,6 +13,7 @@ #include "ui/events/event.h" #include "ui/wm/core/focus_rules.h" #include "ui/wm/core/window_util.h" +#include "ui/wm/public/activation_change_observer.h" namespace wm { namespace { diff --git a/ui/wm/core/focus_controller.h b/ui/wm/core/focus_controller.h index aa97d4d..fecdd2e 100644 --- a/ui/wm/core/focus_controller.h +++ b/ui/wm/core/focus_controller.h @@ -9,11 +9,11 @@ #include "base/memory/scoped_ptr.h" #include "base/observer_list.h" #include "base/scoped_observer.h" -#include "ui/aura/client/activation_client.h" #include "ui/aura/client/focus_client.h" #include "ui/aura/window_observer.h" #include "ui/events/event_handler.h" #include "ui/wm/core/wm_core_export.h" +#include "ui/wm/public/activation_client.h" namespace wm { diff --git a/ui/wm/core/focus_controller_unittest.cc b/ui/wm/core/focus_controller_unittest.cc index 8a0ba29..d460100 100644 --- a/ui/wm/core/focus_controller_unittest.cc +++ b/ui/wm/core/focus_controller_unittest.cc @@ -6,8 +6,6 @@ #include <map> -#include "ui/aura/client/activation_change_observer.h" -#include "ui/aura/client/activation_client.h" #include "ui/aura/client/aura_constants.h" #include "ui/aura/client/default_capture_client.h" #include "ui/aura/client/focus_change_observer.h" @@ -21,6 +19,8 @@ #include "ui/events/event_handler.h" #include "ui/wm/core/base_focus_rules.h" #include "ui/wm/core/wm_state.h" +#include "ui/wm/public/activation_change_observer.h" +#include "ui/wm/public/activation_client.h" namespace wm { diff --git a/ui/wm/core/input_method_event_filter_unittest.cc b/ui/wm/core/input_method_event_filter_unittest.cc index 71dbcce..038ec00 100644 --- a/ui/wm/core/input_method_event_filter_unittest.cc +++ b/ui/wm/core/input_method_event_filter_unittest.cc @@ -5,7 +5,6 @@ #include "ui/wm/core/input_method_event_filter.h" #include "testing/gtest/include/gtest/gtest.h" -#include "ui/aura/client/activation_client.h" #include "ui/aura/client/aura_constants.h" #include "ui/aura/test/aura_test_base.h" #include "ui/aura/test/event_generator.h" @@ -13,6 +12,7 @@ #include "ui/aura/window_event_dispatcher.h" #include "ui/events/test/test_event_handler.h" #include "ui/wm/core/compound_event_filter.h" +#include "ui/wm/public/activation_client.h" #if !defined(OS_WIN) && !defined(USE_X11) // On platforms except Windows and X11, aura::test::EventGenerator::PressKey diff --git a/ui/wm/core/shadow_controller.cc b/ui/wm/core/shadow_controller.cc index 31fb140..c809389 100644 --- a/ui/wm/core/shadow_controller.cc +++ b/ui/wm/core/shadow_controller.cc @@ -10,7 +10,6 @@ #include "base/logging.h" #include "base/memory/linked_ptr.h" #include "base/scoped_observer.h" -#include "ui/aura/client/activation_client.h" #include "ui/aura/env.h" #include "ui/aura/env_observer.h" #include "ui/aura/window.h" @@ -20,6 +19,7 @@ #include "ui/wm/core/shadow.h" #include "ui/wm/core/shadow_types.h" #include "ui/wm/core/window_util.h" +#include "ui/wm/public/activation_client.h" using std::make_pair; diff --git a/ui/wm/core/shadow_controller.h b/ui/wm/core/shadow_controller.h index d9451e7..47aa743 100644 --- a/ui/wm/core/shadow_controller.h +++ b/ui/wm/core/shadow_controller.h @@ -10,8 +10,8 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" #include "base/memory/ref_counted.h" -#include "ui/aura/client/activation_change_observer.h" #include "ui/wm/core/wm_core_export.h" +#include "ui/wm/public/activation_change_observer.h" namespace aura { class Window; diff --git a/ui/wm/core/shadow_controller_unittest.cc b/ui/wm/core/shadow_controller_unittest.cc index 3f31b2f..60d571e 100644 --- a/ui/wm/core/shadow_controller_unittest.cc +++ b/ui/wm/core/shadow_controller_unittest.cc @@ -8,7 +8,6 @@ #include <vector> #include "base/memory/scoped_ptr.h" -#include "ui/aura/client/activation_client.h" #include "ui/aura/client/window_tree_client.h" #include "ui/aura/test/aura_test_base.h" #include "ui/aura/window.h" @@ -18,6 +17,7 @@ #include "ui/wm/core/shadow_types.h" #include "ui/wm/core/window_util.h" #include "ui/wm/core/wm_state.h" +#include "ui/wm/public/activation_client.h" namespace wm { diff --git a/ui/wm/core/transient_window_controller.h b/ui/wm/core/transient_window_controller.h index 598904e..125cd28 100644 --- a/ui/wm/core/transient_window_controller.h +++ b/ui/wm/core/transient_window_controller.h @@ -5,8 +5,8 @@ #ifndef UI_WM_CORE_TRANSIENT_WINDOW_CONTROLLER_H_ #define UI_WM_CORE_TRANSIENT_WINDOW_CONTROLLER_H_ -#include "ui/aura/client/transient_window_client.h" #include "ui/wm/core/wm_core_export.h" +#include "ui/wm/public/transient_window_client.h" namespace wm { diff --git a/ui/wm/core/window_animations.cc b/ui/wm/core/window_animations.cc index e072867..c7b9c63 100644 --- a/ui/wm/core/window_animations.cc +++ b/ui/wm/core/window_animations.cc @@ -15,7 +15,6 @@ #include "base/message_loop/message_loop.h" #include "base/stl_util.h" #include "base/time/time.h" -#include "ui/aura/client/animation_host.h" #include "ui/aura/client/aura_constants.h" #include "ui/aura/window.h" #include "ui/aura/window_delegate.h" @@ -36,6 +35,7 @@ #include "ui/gfx/vector3d_f.h" #include "ui/wm/core/window_util.h" #include "ui/wm/core/wm_core_switches.h" +#include "ui/wm/public/animation_host.h" DECLARE_WINDOW_PROPERTY_TYPE(int) DECLARE_WINDOW_PROPERTY_TYPE(wm::WindowVisibilityAnimationType) diff --git a/ui/wm/core/window_animations_unittest.cc b/ui/wm/core/window_animations_unittest.cc index 5ca3e42..5968bf3 100644 --- a/ui/wm/core/window_animations_unittest.cc +++ b/ui/wm/core/window_animations_unittest.cc @@ -5,7 +5,6 @@ #include "ui/wm/core/window_animations.h" #include "base/time/time.h" -#include "ui/aura/client/animation_host.h" #include "ui/aura/test/aura_test_base.h" #include "ui/aura/test/test_windows.h" #include "ui/aura/window.h" @@ -17,6 +16,7 @@ #include "ui/wm/core/transient_window_manager.h" #include "ui/wm/core/transient_window_stacking_client.h" #include "ui/wm/core/window_util.h" +#include "ui/wm/public/animation_host.h" using aura::Window; using ui::Layer; diff --git a/ui/wm/core/window_util.cc b/ui/wm/core/window_util.cc index dff8339..598d7bf 100644 --- a/ui/wm/core/window_util.cc +++ b/ui/wm/core/window_util.cc @@ -4,12 +4,12 @@ #include "ui/wm/core/window_util.h" -#include "ui/aura/client/activation_client.h" #include "ui/aura/window.h" #include "ui/aura/window_event_dispatcher.h" #include "ui/compositor/layer.h" #include "ui/compositor/layer_tree_owner.h" #include "ui/wm/core/transient_window_manager.h" +#include "ui/wm/public/activation_client.h" namespace { diff --git a/ui/wm/public/DEPS b/ui/wm/public/DEPS new file mode 100644 index 0000000..1e9f248 --- /dev/null +++ b/ui/wm/public/DEPS @@ -0,0 +1,9 @@ +include_rules = [ + "+ui/base/dragdrop/drag_drop_types.h", +] + +specific_include_rules = { + "drag_drop_client.h": [ + "+ui/base/dragdrop/drag_drop_types.h", + ], +} diff --git a/ui/aura/client/activation_change_observer.cc b/ui/wm/public/activation_change_observer.cc index db9f332..7fcbb7a 100644 --- a/ui/aura/client/activation_change_observer.cc +++ b/ui/wm/public/activation_change_observer.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ui/aura/client/activation_change_observer.h" +#include "ui/wm/public/activation_change_observer.h" #include "ui/aura/window.h" #include "ui/aura/window_property.h" diff --git a/ui/aura/client/activation_change_observer.h b/ui/wm/public/activation_change_observer.h index 2f247db..68d5b8a 100644 --- a/ui/aura/client/activation_change_observer.h +++ b/ui/wm/public/activation_change_observer.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 UI_AURA_CLIENT_ACTIVATION_CHANGE_OBSERVER_H_ -#define UI_AURA_CLIENT_ACTIVATION_CHANGE_OBSERVER_H_ +#ifndef UI_WM_PUBLIC_ACTIVATION_CHANGE_OBSERVER_H_ +#define UI_WM_PUBLIC_ACTIVATION_CHANGE_OBSERVER_H_ #include "ui/aura/aura_export.h" @@ -42,4 +42,4 @@ AURA_EXPORT ActivationChangeObserver* GetActivationChangeObserver( } // namespace client } // namespace aura -#endif // UI_AURA_CLIENT_ACTIVATION_CHANGE_OBSERVER_H_ +#endif // UI_WM_PUBLIC_ACTIVATION_CHANGE_OBSERVER_H_ diff --git a/ui/aura/client/activation_client.cc b/ui/wm/public/activation_client.cc index 71d079b..6a47554 100644 --- a/ui/aura/client/activation_client.cc +++ b/ui/wm/public/activation_client.cc @@ -2,9 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ui/aura/client/activation_client.h" +#include "ui/wm/public/activation_client.h" -#include "ui/aura/window_event_dispatcher.h" +#include "ui/aura/window.h" #include "ui/aura/window_property.h" DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(AURA_EXPORT, aura::Window*) diff --git a/ui/aura/client/activation_client.h b/ui/wm/public/activation_client.h index 054829e..fc35131 100644 --- a/ui/aura/client/activation_client.h +++ b/ui/wm/public/activation_client.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 UI_AURA_CLIENT_ACTIVATION_CLIENT_H_ -#define UI_AURA_CLIENT_ACTIVATION_CLIENT_H_ +#ifndef UI_WM_PUBLIC_ACTIVATION_CLIENT_H_ +#define UI_WM_PUBLIC_ACTIVATION_CLIENT_H_ #include "ui/aura/aura_export.h" @@ -74,4 +74,4 @@ AURA_EXPORT bool GetHideOnDeactivate(Window* window); } // namespace clients } // namespace aura -#endif // UI_AURA_CLIENT_ACTIVATION_CLIENT_H_ +#endif // UI_WM_PUBLIC_ACTIVATION_CLIENT_H_ diff --git a/ui/aura/client/activation_delegate.cc b/ui/wm/public/activation_delegate.cc index 51b22b0..2a9bbc9 100644 --- a/ui/aura/client/activation_delegate.cc +++ b/ui/wm/public/activation_delegate.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ui/aura/client/activation_delegate.h" +#include "ui/wm/public/activation_delegate.h" #include "ui/aura/window.h" #include "ui/aura/window_property.h" diff --git a/ui/aura/client/activation_delegate.h b/ui/wm/public/activation_delegate.h index 0ce8638..3c5b3ae 100644 --- a/ui/aura/client/activation_delegate.h +++ b/ui/wm/public/activation_delegate.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 UI_AURA_CLIENT_ACTIVATION_DELEGATE_H_ -#define UI_AURA_CLIENT_ACTIVATION_DELEGATE_H_ +#ifndef UI_WM_PUBLIC_ACTIVATION_DELEGATE_H_ +#define UI_WM_PUBLIC_ACTIVATION_DELEGATE_H_ #include "ui/aura/aura_export.h" @@ -34,4 +34,4 @@ AURA_EXPORT ActivationDelegate* GetActivationDelegate(Window* window); } // namespace client } // namespace aura -#endif // UI_AURA_CLIENT_ACTIVATION_DELEGATE_H_ +#endif // UI_WM_PUBLIC_ACTIVATION_DELEGATE_H_ diff --git a/ui/aura/client/animation_host.cc b/ui/wm/public/animation_host.cc index 0afe583..0d90f9c 100644 --- a/ui/aura/client/animation_host.cc +++ b/ui/wm/public/animation_host.cc @@ -2,13 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ui/aura/client/animation_host.h" +#include "ui/wm/public/animation_host.h" -#include "base/compiler_specific.h" -#include "ui/aura/aura_export.h" - -#include "ui/aura/env.h" -#include "ui/aura/window_event_dispatcher.h" +#include "ui/aura/window.h" #include "ui/aura/window_property.h" DECLARE_WINDOW_PROPERTY_TYPE(aura::client::AnimationHost*) diff --git a/ui/aura/client/animation_host.h b/ui/wm/public/animation_host.h index c433b6d..71f9f4d 100644 --- a/ui/aura/client/animation_host.h +++ b/ui/wm/public/animation_host.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 UI_AURA_CLIENT_ANIMATION_HOST_H_ -#define UI_AURA_CLIENT_ANIMATION_HOST_H_ +#ifndef UI_WM_PUBLIC_ANIMATION_HOST_H_ +#define UI_WM_PUBLIC_ANIMATION_HOST_H_ #include "base/compiler_specific.h" #include "ui/aura/aura_export.h" @@ -45,4 +45,4 @@ AURA_EXPORT AnimationHost* GetAnimationHost(Window* window); } // namespace client } // namespace aura -#endif // UI_AURA_CLIENT_ANIMATION_HOST_H_ +#endif // UI_WM_PUBLIC_ANIMATION_HOST_H_ diff --git a/ui/aura/client/dispatcher_client.cc b/ui/wm/public/dispatcher_client.cc index 55eda0e..cec4a8a 100644 --- a/ui/aura/client/dispatcher_client.cc +++ b/ui/wm/public/dispatcher_client.cc @@ -2,10 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ui/aura/client/dispatcher_client.h" +#include "ui/wm/public/dispatcher_client.h" #include "ui/aura/window.h" -#include "ui/aura/window_event_dispatcher.h" #include "ui/aura/window_property.h" DECLARE_WINDOW_PROPERTY_TYPE(aura::client::DispatcherClient*); diff --git a/ui/aura/client/dispatcher_client.h b/ui/wm/public/dispatcher_client.h index 42cb25e..9fd9c94 100644 --- a/ui/aura/client/dispatcher_client.h +++ b/ui/wm/public/dispatcher_client.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 UI_AURA_CLIENT_DISPATCHER_CLIENT_H_ -#define UI_AURA_CLIENT_DISPATCHER_CLIENT_H_ +#ifndef UI_WM_PUBLIC_DISPATCHER_CLIENT_H_ +#define UI_WM_PUBLIC_DISPATCHER_CLIENT_H_ #include "base/message_loop/message_pump_dispatcher.h" #include "ui/aura/aura_export.h" @@ -27,4 +27,4 @@ AURA_EXPORT DispatcherClient* GetDispatcherClient(Window* root_window); } // namespace client } // namespace aura -#endif // UI_AURA_CLIENT_DISPATCHER_CLIENT_H_ +#endif // UI_WM_PUBLIC_DISPATCHER_CLIENT_H_ diff --git a/ui/aura/client/drag_drop_client.cc b/ui/wm/public/drag_drop_client.cc index 56050e8..c452f9e 100644 --- a/ui/aura/client/drag_drop_client.cc +++ b/ui/wm/public/drag_drop_client.cc @@ -2,9 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ui/aura/client/drag_drop_client.h" +#include "ui/wm/public/drag_drop_client.h" -#include "ui/aura/window_event_dispatcher.h" +#include "ui/aura/window.h" #include "ui/aura/window_property.h" DECLARE_WINDOW_PROPERTY_TYPE(aura::client::DragDropClient*) diff --git a/ui/aura/client/drag_drop_client.h b/ui/wm/public/drag_drop_client.h index 7277d6b..62a2355 100644 --- a/ui/aura/client/drag_drop_client.h +++ b/ui/wm/public/drag_drop_client.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 UI_AURA_CLIENT_DRAG_DROP_CLIENT_H_ -#define UI_AURA_CLIENT_DRAG_DROP_CLIENT_H_ +#ifndef UI_WM_PUBLIC_DRAG_DROP_CLIENT_H_ +#define UI_WM_PUBLIC_DRAG_DROP_CLIENT_H_ #include "ui/aura/aura_export.h" #include "ui/base/dragdrop/drag_drop_types.h" @@ -59,4 +59,4 @@ AURA_EXPORT DragDropClient* GetDragDropClient(Window* root_window); } // namespace client } // namespace aura -#endif // UI_AURA_CLIENT_DRAG_DROP_CLIENT_H_ +#endif // UI_WM_PUBLIC_DRAG_DROP_CLIENT_H_ diff --git a/ui/aura/client/drag_drop_delegate.cc b/ui/wm/public/drag_drop_delegate.cc index 92d986b..6380f96 100644 --- a/ui/aura/client/drag_drop_delegate.cc +++ b/ui/wm/public/drag_drop_delegate.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ui/aura/client/drag_drop_delegate.h" +#include "ui/wm/public/drag_drop_delegate.h" #include "ui/aura/window.h" #include "ui/aura/window_property.h" diff --git a/ui/aura/client/drag_drop_delegate.h b/ui/wm/public/drag_drop_delegate.h index dde7f32..50f6c26 100644 --- a/ui/aura/client/drag_drop_delegate.h +++ b/ui/wm/public/drag_drop_delegate.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 UI_AURA_CLIENT_DRAG_DROP_DELEGATE_H_ -#define UI_AURA_CLIENT_DRAG_DROP_DELEGATE_H_ +#ifndef UI_WM_PUBLIC_DRAG_DROP_DELEGATE_H_ +#define UI_WM_PUBLIC_DRAG_DROP_DELEGATE_H_ #include "ui/aura/aura_export.h" @@ -48,4 +48,4 @@ AURA_EXPORT DragDropDelegate* GetDragDropDelegate(Window* window); } // namespace client } // namespace aura -#endif // UI_AURA_CLIENT_DRAG_DROP_DELEGATE_H_ +#endif // UI_WM_PUBLIC_DRAG_DROP_DELEGATE_H_ diff --git a/ui/aura/client/scoped_tooltip_disabler.cc b/ui/wm/public/scoped_tooltip_disabler.cc index d3c1033..45a39ca 100644 --- a/ui/aura/client/scoped_tooltip_disabler.cc +++ b/ui/wm/public/scoped_tooltip_disabler.cc @@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ui/aura/client/scoped_tooltip_disabler.h" +#include "ui/wm/public/scoped_tooltip_disabler.h" -#include "ui/aura/client/tooltip_client.h" #include "ui/aura/window.h" +#include "ui/wm/public/tooltip_client.h" namespace aura { namespace client { diff --git a/ui/aura/client/scoped_tooltip_disabler.h b/ui/wm/public/scoped_tooltip_disabler.h index 5d1b2ea..0fd3e11 100644 --- a/ui/aura/client/scoped_tooltip_disabler.h +++ b/ui/wm/public/scoped_tooltip_disabler.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 UI_AURA_CLIENT_SCOPED_TOOLTIP_DISABLER_H_ -#define UI_AURA_CLIENT_SCOPED_TOOLTIP_DISABLER_H_ +#ifndef UI_WM_PUBLIC_SCOPED_TOOLTIP_DISABLER_H_ +#define UI_WM_PUBLIC_SCOPED_TOOLTIP_DISABLER_H_ #include "ui/aura/window_observer.h" @@ -36,4 +36,4 @@ class AURA_EXPORT ScopedTooltipDisabler : aura::WindowObserver { } // namespace client } // namespace aura -#endif // UI_AURA_CLIENT_SCOPED_TOOLTIP_DISABLER_H_ +#endif // UI_WM_PUBLIC_SCOPED_TOOLTIP_DISABLER_H_ diff --git a/ui/aura/client/tooltip_client.cc b/ui/wm/public/tooltip_client.cc index 770be41..b473238 100644 --- a/ui/aura/client/tooltip_client.cc +++ b/ui/wm/public/tooltip_client.cc @@ -2,9 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ui/aura/client/tooltip_client.h" +#include "ui/wm/public/tooltip_client.h" -#include "ui/aura/window_event_dispatcher.h" +#include "ui/aura/window.h" #include "ui/aura/window_property.h" DECLARE_WINDOW_PROPERTY_TYPE(aura::client::TooltipClient*) diff --git a/ui/aura/client/tooltip_client.h b/ui/wm/public/tooltip_client.h index 875e0e2..f592b21 100644 --- a/ui/aura/client/tooltip_client.h +++ b/ui/wm/public/tooltip_client.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 UI_AURA_CLIENT_TOOLTIP_CLIENT_H_ -#define UI_AURA_CLIENT_TOOLTIP_CLIENT_H_ +#ifndef UI_WM_PUBLIC_TOOLTIP_CLIENT_H_ +#define UI_WM_PUBLIC_TOOLTIP_CLIENT_H_ #include "ui/aura/aura_export.h" #include "ui/gfx/font.h" @@ -42,4 +42,4 @@ AURA_EXPORT const base::string16 GetTooltipText(Window* window); } // namespace client } // namespace aura -#endif // UI_AURA_CLIENT_TOOLTIP_CLIENT_H_ +#endif // UI_WM_PUBLIC_TOOLTIP_CLIENT_H_ diff --git a/ui/aura/client/transient_window_client.cc b/ui/wm/public/transient_window_client.cc index 47b50b9..aab8e51 100644 --- a/ui/aura/client/transient_window_client.cc +++ b/ui/wm/public/transient_window_client.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ui/aura/client/transient_window_client.h" +#include "ui/wm/public/transient_window_client.h" namespace aura { namespace client { diff --git a/ui/aura/client/transient_window_client.h b/ui/wm/public/transient_window_client.h index 96434d7..2086100 100644 --- a/ui/aura/client/transient_window_client.h +++ b/ui/wm/public/transient_window_client.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 UI_AURA_CLIENT_TRANSIENT_WINDOW_CLIENT_H_ -#define UI_AURA_CLIENT_TRANSIENT_WINDOW_CLIENT_H_ +#ifndef UI_WM_PUBLIC_TRANSIENT_WINDOW_CLIENT_H_ +#define UI_WM_PUBLIC_TRANSIENT_WINDOW_CLIENT_H_ #include "base/basictypes.h" #include "ui/aura/aura_export.h" @@ -44,4 +44,4 @@ AURA_EXPORT TransientWindowClient* GetTransientWindowClient(); } // namespace client } // namespace aura -#endif // UI_AURA_CLIENT_TRANSIENT_WINDOW_CLIENT_H_ +#endif // UI_WM_PUBLIC_TRANSIENT_WINDOW_CLIENT_H_ diff --git a/ui/aura/client/window_move_client.cc b/ui/wm/public/window_move_client.cc index c65452d..44ccca9 100644 --- a/ui/aura/client/window_move_client.cc +++ b/ui/wm/public/window_move_client.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ui/aura/client/window_move_client.h" +#include "ui/wm/public/window_move_client.h" #include "ui/aura/window.h" #include "ui/aura/window_property.h" diff --git a/ui/aura/client/window_move_client.h b/ui/wm/public/window_move_client.h index 15e4245..b8943d3 100644 --- a/ui/aura/client/window_move_client.h +++ b/ui/wm/public/window_move_client.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 UI_AURA_CLIENT_WINDOW_MOVE_CLIENT_H_ -#define UI_AURA_CLIENT_WINDOW_MOVE_CLIENT_H_ +#ifndef UI_WM_PUBLIC_WINDOW_MOVE_CLIENT_H_ +#define UI_WM_PUBLIC_WINDOW_MOVE_CLIENT_H_ #include "ui/aura/aura_export.h" #include "ui/gfx/vector2d.h" @@ -53,4 +53,4 @@ AURA_EXPORT WindowMoveClient* GetWindowMoveClient(Window* window); } // namespace client } // namespace aura -#endif // UI_AURA_CLIENT_WINDOW_MOVE_CLIENT_H_ +#endif // UI_WM_PUBLIC_WINDOW_MOVE_CLIENT_H_ |