diff options
161 files changed, 484 insertions, 431 deletions
diff --git a/ash/accelerators/accelerator_filter.cc b/ash/accelerators/accelerator_filter.cc index 7e04310..64fe9a6 100644 --- a/ash/accelerators/accelerator_filter.cc +++ b/ash/accelerators/accelerator_filter.cc @@ -11,7 +11,7 @@ #include "ui/base/accelerators/accelerator.h" #include "ui/base/accelerators/accelerator_manager.h" #include "ui/events/event.h" -#include "ui/views/corewm/window_util.h" +#include "ui/wm/core/window_util.h" namespace ash { namespace { diff --git a/ash/desktop_background/user_wallpaper_delegate.h b/ash/desktop_background/user_wallpaper_delegate.h index e1e7f70..c363a97 100644 --- a/ash/desktop_background/user_wallpaper_delegate.h +++ b/ash/desktop_background/user_wallpaper_delegate.h @@ -6,7 +6,7 @@ #define ASH_DESKTOP_BACKGROUND_USER_WALLPAPER_DELEGATE_H_ #include "ash/ash_export.h" -#include "ui/views/corewm/window_animations.h" +#include "ui/wm/core/window_animations.h" namespace ash { diff --git a/ash/dip_unittest.cc b/ash/dip_unittest.cc index 2c15765..41fc06e6 100644 --- a/ash/dip_unittest.cc +++ b/ash/dip_unittest.cc @@ -22,10 +22,10 @@ #include "ui/gfx/display.h" #include "ui/gfx/insets.h" #include "ui/gfx/screen.h" -#include "ui/views/corewm/shadow.h" -#include "ui/views/corewm/shadow_controller.h" -#include "ui/views/corewm/shadow_types.h" #include "ui/views/widget/widget.h" +#include "ui/wm/core/shadow.h" +#include "ui/wm/core/shadow_controller.h" +#include "ui/wm/core/shadow_types.h" namespace ash { diff --git a/ash/display/screen_position_controller.cc b/ash/display/screen_position_controller.cc index 54f106c..e76fdc4 100644 --- a/ash/display/screen_position_controller.cc +++ b/ash/display/screen_position_controller.cc @@ -20,7 +20,7 @@ #include "ui/compositor/dip_util.h" #include "ui/gfx/display.h" #include "ui/gfx/screen.h" -#include "ui/views/corewm/window_util.h" +#include "ui/wm/core/window_util.h" namespace ash { namespace { diff --git a/ash/drag_drop/drag_image_view.cc b/ash/drag_drop/drag_image_view.cc index d9a9e88..c03b581 100644 --- a/ash/drag_drop/drag_image_view.cc +++ b/ash/drag_drop/drag_image_view.cc @@ -11,8 +11,8 @@ #include "ui/compositor/dip_util.h" #include "ui/gfx/canvas.h" #include "ui/gfx/size_conversions.h" -#include "ui/views/corewm/shadow_types.h" #include "ui/views/widget/widget.h" +#include "ui/wm/core/shadow_types.h" namespace ash { namespace internal { diff --git a/ash/ime/candidate_window_view.cc b/ash/ime/candidate_window_view.cc index ec158ac..ac520f9 100644 --- a/ash/ime/candidate_window_view.cc +++ b/ash/ime/candidate_window_view.cc @@ -16,9 +16,9 @@ #include "ui/views/border.h" #include "ui/views/bubble/bubble_frame_view.h" #include "ui/views/controls/label.h" -#include "ui/views/corewm/window_animations.h" #include "ui/views/layout/box_layout.h" #include "ui/views/layout/fill_layout.h" +#include "ui/wm/core/window_animations.h" namespace ash { namespace ime { diff --git a/ash/ime/infolist_window.cc b/ash/ime/infolist_window.cc index 87eb20d..b268ee7 100644 --- a/ash/ime/infolist_window.cc +++ b/ash/ime/infolist_window.cc @@ -18,9 +18,9 @@ #include "ui/views/bubble/bubble_border.h" #include "ui/views/bubble/bubble_frame_view.h" #include "ui/views/controls/label.h" -#include "ui/views/corewm/window_animations.h" #include "ui/views/layout/box_layout.h" #include "ui/views/widget/widget.h" +#include "ui/wm/core/window_animations.h" namespace ash { namespace ime { diff --git a/ash/ime/mode_indicator_view.cc b/ash/ime/mode_indicator_view.cc index 0be5c15..a237145 100644 --- a/ash/ime/mode_indicator_view.cc +++ b/ash/ime/mode_indicator_view.cc @@ -10,8 +10,8 @@ #include "ui/views/bubble/bubble_delegate.h" #include "ui/views/bubble/bubble_frame_view.h" #include "ui/views/controls/label.h" -#include "ui/views/corewm/window_animations.h" #include "ui/views/layout/fill_layout.h" +#include "ui/wm/core/window_animations.h" namespace ash { namespace ime { diff --git a/ash/magnifier/magnification_controller.cc b/ash/magnifier/magnification_controller.cc index 36fb741..300e390 100644 --- a/ash/magnifier/magnification_controller.cc +++ b/ash/magnifier/magnification_controller.cc @@ -28,7 +28,7 @@ #include "ui/gfx/point_f.h" #include "ui/gfx/rect_conversions.h" #include "ui/gfx/screen.h" -#include "ui/views/corewm/compound_event_filter.h" +#include "ui/wm/core/compound_event_filter.h" namespace { diff --git a/ash/magnifier/partial_magnification_controller.cc b/ash/magnifier/partial_magnification_controller.cc index 4bc16b0..4ff4845 100644 --- a/ash/magnifier/partial_magnification_controller.cc +++ b/ash/magnifier/partial_magnification_controller.cc @@ -7,7 +7,6 @@ #include "ash/shell.h" #include "ash/shell_window_ids.h" #include "ui/aura/window_event_dispatcher.h" -#include "ui/views/corewm/compound_event_filter.h" #include "ui/aura/window.h" #include "ui/aura/window_property.h" #include "ui/gfx/screen.h" @@ -15,6 +14,7 @@ #include "ui/views/layout/fill_layout.h" #include "ui/views/widget/widget.h" #include "ui/views/widget/widget_delegate.h" +#include "ui/wm/core/compound_event_filter.h" namespace { diff --git a/ash/root_window_controller.cc b/ash/root_window_controller.cc index 92fe388..0ba6a20 100644 --- a/ash/root_window_controller.cc +++ b/ash/root_window_controller.cc @@ -63,11 +63,11 @@ #include "ui/keyboard/keyboard_controller.h" #include "ui/keyboard/keyboard_util.h" #include "ui/views/controls/menu/menu_runner.h" -#include "ui/views/corewm/capture_controller.h" -#include "ui/views/corewm/visibility_controller.h" -#include "ui/views/corewm/window_util.h" #include "ui/views/view_model.h" #include "ui/views/view_model_utils.h" +#include "ui/wm/core/capture_controller.h" +#include "ui/wm/core/visibility_controller.h" +#include "ui/wm/core/window_util.h" #include "ui/wm/public/easy_resize_window_targeter.h" #include "ui/wm/public/window_types.h" diff --git a/ash/shelf/shelf_unittest.cc b/ash/shelf/shelf_unittest.cc index 14b1b95..0df9a48 100644 --- a/ash/shelf/shelf_unittest.cc +++ b/ash/shelf/shelf_unittest.cc @@ -17,7 +17,6 @@ #include "ui/aura/window_event_dispatcher.h" #include "ui/gfx/display.h" #include "ui/gfx/screen.h" -#include "ui/views/corewm/corewm_switches.h" #include "ui/views/view.h" #include "ui/views/widget/widget.h" diff --git a/ash/shelf/shelf_widget_unittest.cc b/ash/shelf/shelf_widget_unittest.cc index 042fa3a..873cb35 100644 --- a/ash/shelf/shelf_widget_unittest.cc +++ b/ash/shelf/shelf_widget_unittest.cc @@ -19,7 +19,6 @@ #include "ui/events/event_utils.h" #include "ui/gfx/display.h" #include "ui/gfx/screen.h" -#include "ui/views/corewm/corewm_switches.h" #include "ui/views/view.h" #include "ui/views/widget/widget.h" diff --git a/ash/shelf/shelf_window_watcher_item_delegate.cc b/ash/shelf/shelf_window_watcher_item_delegate.cc index fcae1af..0ba8f20 100644 --- a/ash/shelf/shelf_window_watcher_item_delegate.cc +++ b/ash/shelf/shelf_window_watcher_item_delegate.cc @@ -10,8 +10,8 @@ #include "ash/shell_delegate.h" #include "ash/wm/window_state.h" #include "ui/aura/window.h" -#include "ui/views/corewm/window_animations.h" #include "ui/views/widget/widget.h" +#include "ui/wm/core/window_animations.h" namespace ash { namespace internal { diff --git a/ash/shell.cc b/ash/shell.cc index f0f59bd..0b50d65 100644 --- a/ash/shell.cc +++ b/ash/shell.cc @@ -101,18 +101,17 @@ #include "ui/keyboard/keyboard_switches.h" #include "ui/keyboard/keyboard_util.h" #include "ui/message_center/message_center.h" -#include "ui/views/corewm/compound_event_filter.h" -#include "ui/views/corewm/corewm_switches.h" -#include "ui/views/corewm/focus_controller.h" -#include "ui/views/corewm/input_method_event_filter.h" -#include "ui/views/corewm/shadow_controller.h" #include "ui/views/corewm/tooltip_aura.h" #include "ui/views/corewm/tooltip_controller.h" -#include "ui/views/corewm/visibility_controller.h" -#include "ui/views/corewm/window_modality_controller.h" #include "ui/views/focus/focus_manager_factory.h" #include "ui/views/widget/native_widget_aura.h" #include "ui/views/widget/widget.h" +#include "ui/wm/core/compound_event_filter.h" +#include "ui/wm/core/focus_controller.h" +#include "ui/wm/core/input_method_event_filter.h" +#include "ui/wm/core/shadow_controller.h" +#include "ui/wm/core/visibility_controller.h" +#include "ui/wm/core/window_modality_controller.h" #if defined(OS_CHROMEOS) #if defined(USE_X11) diff --git a/ash/shell.h b/ash/shell.h index 6bb3be0..56d7332 100644 --- a/ash/shell.h +++ b/ash/shell.h @@ -26,7 +26,7 @@ #include "ui/gfx/insets.h" #include "ui/gfx/screen.h" #include "ui/gfx/size.h" -#include "ui/views/corewm/cursor_manager.h" +#include "ui/wm/core/cursor_manager.h" class CommandLine; diff --git a/ash/shell/content_client/shell_browser_main_parts.cc b/ash/shell/content_client/shell_browser_main_parts.cc index 42eee00..edb6e1a 100644 --- a/ash/shell/content_client/shell_browser_main_parts.cc +++ b/ash/shell/content_client/shell_browser_main_parts.cc @@ -29,8 +29,8 @@ #include "ui/compositor/compositor.h" #include "ui/gfx/screen.h" #include "ui/message_center/message_center.h" -#include "ui/views/corewm/wm_state.h" #include "ui/views/test/test_views_delegate.h" +#include "ui/wm/core/wm_state.h" #if defined(USE_X11) #include "ui/events/x/touch_factory_x11.h" diff --git a/ash/shell/keyboard_controller_proxy_stub.cc b/ash/shell/keyboard_controller_proxy_stub.cc index 4a82ff1..d73ebb3 100644 --- a/ash/shell/keyboard_controller_proxy_stub.cc +++ b/ash/shell/keyboard_controller_proxy_stub.cc @@ -7,7 +7,7 @@ #include "ash/shell.h" #include "ash/shell_delegate.h" #include "ui/aura/window.h" -#include "ui/views/corewm/input_method_event_filter.h" +#include "ui/wm/core/input_method_event_filter.h" using namespace content; diff --git a/ash/shell/shell_delegate_impl.cc b/ash/shell/shell_delegate_impl.cc index a715efa..557df157 100644 --- a/ash/shell/shell_delegate_impl.cc +++ b/ash/shell/shell_delegate_impl.cc @@ -24,7 +24,7 @@ #include "ash/wm/window_state.h" #include "base/message_loop/message_loop.h" #include "ui/aura/window.h" -#include "ui/views/corewm/input_method_event_filter.h" +#include "ui/wm/core/input_method_event_filter.h" namespace ash { namespace shell { diff --git a/ash/shell/window_type_launcher.cc b/ash/shell/window_type_launcher.cc index fad37b9..5d1b314 100644 --- a/ash/shell/window_type_launcher.cc +++ b/ash/shell/window_type_launcher.cc @@ -29,11 +29,11 @@ #include "ui/views/controls/button/label_button.h" #include "ui/views/controls/menu/menu_item_view.h" #include "ui/views/controls/menu/menu_runner.h" -#include "ui/views/corewm/shadow_types.h" #include "ui/views/examples/examples_window_with_content.h" #include "ui/views/layout/grid_layout.h" #include "ui/views/test/child_modal_window.h" #include "ui/views/widget/widget.h" +#include "ui/wm/core/shadow_types.h" using views::MenuItemView; using views::MenuRunner; diff --git a/ash/system/user/tray_user.cc b/ash/system/user/tray_user.cc index 2616f13..9911926 100644 --- a/ash/system/user/tray_user.cc +++ b/ash/system/user/tray_user.cc @@ -60,13 +60,13 @@ #include "ui/views/controls/label.h" #include "ui/views/controls/link.h" #include "ui/views/controls/link_listener.h" -#include "ui/views/corewm/shadow_types.h" #include "ui/views/layout/box_layout.h" #include "ui/views/layout/fill_layout.h" #include "ui/views/mouse_watcher.h" #include "ui/views/painter.h" #include "ui/views/view.h" #include "ui/views/widget/widget.h" +#include "ui/wm/core/shadow_types.h" namespace { diff --git a/ash/test/ash_test_helper.cc b/ash/test/ash_test_helper.cc index bd74db7a..50e9841 100644 --- a/ash/test/ash_test_helper.cc +++ b/ash/test/ash_test_helper.cc @@ -21,8 +21,8 @@ #include "ui/compositor/scoped_animation_duration_scale_mode.h" #include "ui/compositor/test/context_factories_for_test.h" #include "ui/message_center/message_center.h" -#include "ui/views/corewm/capture_controller.h" -#include "ui/views/corewm/wm_state.h" +#include "ui/wm/core/capture_controller.h" +#include "ui/wm/core/wm_state.h" #if defined(OS_CHROMEOS) #include "chromeos/audio/cras_audio_handler.h" diff --git a/ash/test/cursor_manager_test_api.cc b/ash/test/cursor_manager_test_api.cc index 3ed0226..b4c289a 100644 --- a/ash/test/cursor_manager_test_api.cc +++ b/ash/test/cursor_manager_test_api.cc @@ -9,7 +9,7 @@ #include "ash/wm/ash_native_cursor_manager.h" #include "ash/wm/image_cursors.h" #include "ui/gfx/display.h" -#include "ui/views/corewm/cursor_manager.h" +#include "ui/wm/core/cursor_manager.h" namespace ash { namespace test { diff --git a/ash/wm/ash_focus_rules.h b/ash/wm/ash_focus_rules.h index f53a70b..5780573 100644 --- a/ash/wm/ash_focus_rules.h +++ b/ash/wm/ash_focus_rules.h @@ -8,7 +8,7 @@ #include "ash/ash_export.h" #include "base/basictypes.h" #include "base/compiler_specific.h" -#include "ui/views/corewm/base_focus_rules.h" +#include "ui/wm/core/base_focus_rules.h" namespace ash { namespace wm { diff --git a/ash/wm/ash_native_cursor_manager.h b/ash/wm/ash_native_cursor_manager.h index 6a1e450..b9a36ffb 100644 --- a/ash/wm/ash_native_cursor_manager.h +++ b/ash/wm/ash_native_cursor_manager.h @@ -12,8 +12,8 @@ #include "base/strings/string16.h" #include "ui/gfx/native_widget_types.h" #include "ui/gfx/point.h" -#include "ui/views/corewm/native_cursor_manager.h" -#include "ui/views/corewm/native_cursor_manager_delegate.h" +#include "ui/wm/core/native_cursor_manager.h" +#include "ui/wm/core/native_cursor_manager_delegate.h" namespace ash { diff --git a/ash/wm/dock/docked_window_layout_manager.cc b/ash/wm/dock/docked_window_layout_manager.cc index cb51014..d81c34a 100644 --- a/ash/wm/dock/docked_window_layout_manager.cc +++ b/ash/wm/dock/docked_window_layout_manager.cc @@ -38,7 +38,7 @@ #include "ui/gfx/image/image_skia_operations.h" #include "ui/gfx/rect.h" #include "ui/views/background.h" -#include "ui/views/corewm/window_util.h" +#include "ui/wm/core/window_util.h" namespace ash { namespace internal { diff --git a/ash/wm/dock/docked_window_resizer_unittest.cc b/ash/wm/dock/docked_window_resizer_unittest.cc index 9014c11..82b87ef 100644 --- a/ash/wm/dock/docked_window_resizer_unittest.cc +++ b/ash/wm/dock/docked_window_resizer_unittest.cc @@ -33,8 +33,8 @@ #include "ui/aura/window_event_dispatcher.h" #include "ui/base/hit_test.h" #include "ui/base/ui_base_types.h" -#include "ui/views/corewm/window_util.h" #include "ui/views/widget/widget.h" +#include "ui/wm/core/window_util.h" namespace ash { namespace internal { diff --git a/ash/wm/drag_window_controller.cc b/ash/wm/drag_window_controller.cc index 5007f92..25d0e04 100644 --- a/ash/wm/drag_window_controller.cc +++ b/ash/wm/drag_window_controller.cc @@ -12,10 +12,10 @@ #include "ui/compositor/layer.h" #include "ui/compositor/layer_tree_owner.h" #include "ui/compositor/scoped_layer_animation_settings.h" -#include "ui/views/corewm/shadow_types.h" -#include "ui/views/corewm/window_util.h" #include "ui/views/view.h" #include "ui/views/widget/widget.h" +#include "ui/wm/core/shadow_types.h" +#include "ui/wm/core/window_util.h" namespace ash { namespace internal { diff --git a/ash/wm/drag_window_resizer.cc b/ash/wm/drag_window_resizer.cc index 3e72e4a..1824e2b 100644 --- a/ash/wm/drag_window_resizer.cc +++ b/ash/wm/drag_window_resizer.cc @@ -20,7 +20,7 @@ #include "ui/base/hit_test.h" #include "ui/base/ui_base_types.h" #include "ui/gfx/screen.h" -#include "ui/views/corewm/window_util.h" +#include "ui/wm/core/window_util.h" namespace ash { namespace internal { diff --git a/ash/wm/drag_window_resizer_unittest.cc b/ash/wm/drag_window_resizer_unittest.cc index d180a56..bbd3279 100644 --- a/ash/wm/drag_window_resizer_unittest.cc +++ b/ash/wm/drag_window_resizer_unittest.cc @@ -23,8 +23,8 @@ #include "ui/compositor/layer_tree_owner.h" #include "ui/gfx/insets.h" #include "ui/gfx/screen.h" -#include "ui/views/corewm/window_util.h" #include "ui/views/widget/widget.h" +#include "ui/wm/core/window_util.h" namespace ash { namespace internal { diff --git a/ash/wm/immersive_fullscreen_controller.cc b/ash/wm/immersive_fullscreen_controller.cc index e674c03..9b21269 100644 --- a/ash/wm/immersive_fullscreen_controller.cc +++ b/ash/wm/immersive_fullscreen_controller.cc @@ -25,10 +25,10 @@ #include "ui/gfx/rect.h" #include "ui/gfx/screen.h" #include "ui/views/bubble/bubble_delegate.h" -#include "ui/views/corewm/transient_window_manager.h" -#include "ui/views/corewm/window_util.h" #include "ui/views/view.h" #include "ui/views/widget/widget.h" +#include "ui/wm/core/transient_window_manager.h" +#include "ui/wm/core/window_util.h" using views::View; diff --git a/ash/wm/immersive_fullscreen_controller.h b/ash/wm/immersive_fullscreen_controller.h index bee6642..9bbc71e 100644 --- a/ash/wm/immersive_fullscreen_controller.h +++ b/ash/wm/immersive_fullscreen_controller.h @@ -13,9 +13,9 @@ #include "ui/aura/window_observer.h" #include "ui/events/event_handler.h" #include "ui/gfx/animation/animation_delegate.h" -#include "ui/views/corewm/transient_window_observer.h" #include "ui/views/focus/focus_manager.h" #include "ui/views/widget/widget_observer.h" +#include "ui/wm/core/transient_window_observer.h" namespace aura { class Window; diff --git a/ash/wm/lock_state_controller.cc b/ash/wm/lock_state_controller.cc index b8e9657..304a444 100644 --- a/ash/wm/lock_state_controller.cc +++ b/ash/wm/lock_state_controller.cc @@ -20,7 +20,7 @@ #include "ui/aura/window_event_dispatcher.h" #include "ui/compositor/layer_animation_sequence.h" #include "ui/compositor/scoped_layer_animation_settings.h" -#include "ui/views/corewm/compound_event_filter.h" +#include "ui/wm/core/compound_event_filter.h" #if defined(OS_CHROMEOS) #include "base/sys_info.h" diff --git a/ash/wm/maximize_mode/workspace_backdrop_delegate.cc b/ash/wm/maximize_mode/workspace_backdrop_delegate.cc index e996fca..093e403 100644 --- a/ash/wm/maximize_mode/workspace_backdrop_delegate.cc +++ b/ash/wm/maximize_mode/workspace_backdrop_delegate.cc @@ -11,8 +11,8 @@ #include "ui/compositor/layer.h" #include "ui/compositor/scoped_layer_animation_settings.h" #include "ui/views/background.h" -#include "ui/views/corewm/window_util.h" #include "ui/views/widget/widget.h" +#include "ui/wm/core/window_util.h" namespace ash { diff --git a/ash/wm/overview/scoped_transform_overview_window.cc b/ash/wm/overview/scoped_transform_overview_window.cc index ac5223b..9bf12f0 100644 --- a/ash/wm/overview/scoped_transform_overview_window.cc +++ b/ash/wm/overview/scoped_transform_overview_window.cc @@ -13,9 +13,9 @@ #include "ui/aura/window.h" #include "ui/compositor/scoped_layer_animation_settings.h" #include "ui/gfx/animation/tween.h" -#include "ui/views/corewm/window_animations.h" -#include "ui/views/corewm/window_util.h" #include "ui/views/widget/widget.h" +#include "ui/wm/core/window_animations.h" +#include "ui/wm/core/window_util.h" namespace ash { diff --git a/ash/wm/overview/scoped_window_copy.cc b/ash/wm/overview/scoped_window_copy.cc index 378f6b9..7368b45 100644 --- a/ash/wm/overview/scoped_window_copy.cc +++ b/ash/wm/overview/scoped_window_copy.cc @@ -13,9 +13,9 @@ #include "ui/compositor/layer_animation_observer.h" #include "ui/compositor/layer_tree_owner.h" #include "ui/gfx/display.h" -#include "ui/views/corewm/shadow_types.h" -#include "ui/views/corewm/window_util.h" #include "ui/views/widget/widget.h" +#include "ui/wm/core/shadow_types.h" +#include "ui/wm/core/window_util.h" namespace ash { diff --git a/ash/wm/overview/window_selector.cc b/ash/wm/overview/window_selector.cc index 0f6f3af..18f04b3 100644 --- a/ash/wm/overview/window_selector.cc +++ b/ash/wm/overview/window_selector.cc @@ -26,7 +26,7 @@ #include "ui/aura/window_observer.h" #include "ui/events/event.h" #include "ui/events/event_handler.h" -#include "ui/views/corewm/window_util.h" +#include "ui/wm/core/window_util.h" namespace ash { diff --git a/ash/wm/overview/window_selector_unittest.cc b/ash/wm/overview/window_selector_unittest.cc index 1480edb..e88e25a 100644 --- a/ash/wm/overview/window_selector_unittest.cc +++ b/ash/wm/overview/window_selector_unittest.cc @@ -36,7 +36,7 @@ #include "ui/compositor/scoped_animation_duration_scale_mode.h" #include "ui/gfx/rect_conversions.h" #include "ui/gfx/transform.h" -#include "ui/views/corewm/window_util.h" +#include "ui/wm/core/window_util.h" namespace ash { namespace internal { diff --git a/ash/wm/panels/panel_layout_manager_unittest.cc b/ash/wm/panels/panel_layout_manager_unittest.cc index aabec58..faba4f7 100644 --- a/ash/wm/panels/panel_layout_manager_unittest.cc +++ b/ash/wm/panels/panel_layout_manager_unittest.cc @@ -35,7 +35,6 @@ #include "ui/aura/window.h" #include "ui/aura/window_event_dispatcher.h" #include "ui/base/l10n/l10n_util.h" -#include "ui/views/corewm/corewm_switches.h" #include "ui/views/widget/widget.h" namespace ash { diff --git a/ash/wm/panels/panel_window_resizer_unittest.cc b/ash/wm/panels/panel_window_resizer_unittest.cc index 01d04b0..74329f0 100644 --- a/ash/wm/panels/panel_window_resizer_unittest.cc +++ b/ash/wm/panels/panel_window_resizer_unittest.cc @@ -27,8 +27,8 @@ #include "ui/base/hit_test.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/ui_base_types.h" -#include "ui/views/corewm/window_util.h" #include "ui/views/widget/widget.h" +#include "ui/wm/core/window_util.h" namespace ash { namespace internal { diff --git a/ash/wm/power_button_controller.cc b/ash/wm/power_button_controller.cc index c7eeefa..899c141 100644 --- a/ash/wm/power_button_controller.cc +++ b/ash/wm/power_button_controller.cc @@ -12,7 +12,7 @@ #include "ash/wm/session_state_animator.h" #include "base/command_line.h" #include "ui/aura/window_event_dispatcher.h" -#include "ui/views/corewm/compound_event_filter.h" +#include "ui/wm/core/compound_event_filter.h" namespace ash { diff --git a/ash/wm/resize_shadow.cc b/ash/wm/resize_shadow.cc index cdf573d..7d4a61c 100644 --- a/ash/wm/resize_shadow.cc +++ b/ash/wm/resize_shadow.cc @@ -11,7 +11,7 @@ #include "ui/base/resource/resource_bundle.h" #include "ui/compositor/layer.h" #include "ui/compositor/scoped_layer_animation_settings.h" -#include "ui/views/corewm/image_grid.h" +#include "ui/wm/core/image_grid.h" namespace { diff --git a/ash/wm/stacking_controller.cc b/ash/wm/stacking_controller.cc index 3a79c88..b99f832 100644 --- a/ash/wm/stacking_controller.cc +++ b/ash/wm/stacking_controller.cc @@ -15,7 +15,7 @@ #include "ui/aura/window.h" #include "ui/aura/window_event_dispatcher.h" #include "ui/base/ui_base_types.h" -#include "ui/views/corewm/window_util.h" +#include "ui/wm/core/window_util.h" namespace ash { namespace { diff --git a/ash/wm/stacking_controller_unittest.cc b/ash/wm/stacking_controller_unittest.cc index 469922f..4b9edc2 100644 --- a/ash/wm/stacking_controller_unittest.cc +++ b/ash/wm/stacking_controller_unittest.cc @@ -10,7 +10,7 @@ #include "ui/aura/client/aura_constants.h" #include "ui/aura/window.h" #include "ui/aura/window_event_dispatcher.h" -#include "ui/views/corewm/window_util.h" +#include "ui/wm/core/window_util.h" using aura::Window; diff --git a/ash/wm/system_modal_container_layout_manager.cc b/ash/wm/system_modal_container_layout_manager.cc index 3e0960d..42cbb05 100644 --- a/ash/wm/system_modal_container_layout_manager.cc +++ b/ash/wm/system_modal_container_layout_manager.cc @@ -22,9 +22,9 @@ #include "ui/events/event.h" #include "ui/gfx/screen.h" #include "ui/views/background.h" -#include "ui/views/corewm/compound_event_filter.h" #include "ui/views/view.h" #include "ui/views/widget/widget.h" +#include "ui/wm/core/compound_event_filter.h" namespace ash { namespace internal { diff --git a/ash/wm/system_modal_container_layout_manager_unittest.cc b/ash/wm/system_modal_container_layout_manager_unittest.cc index 2d228df..530e447 100644 --- a/ash/wm/system_modal_container_layout_manager_unittest.cc +++ b/ash/wm/system_modal_container_layout_manager_unittest.cc @@ -17,10 +17,10 @@ #include "ui/aura/window_event_dispatcher.h" #include "ui/compositor/layer.h" #include "ui/gfx/screen.h" -#include "ui/views/corewm/window_util.h" #include "ui/views/test/capture_tracking_view.h" #include "ui/views/widget/widget.h" #include "ui/views/widget/widget_delegate.h" +#include "ui/wm/core/window_util.h" namespace ash { namespace test { diff --git a/ash/wm/toplevel_window_event_handler_unittest.cc b/ash/wm/toplevel_window_event_handler_unittest.cc index 1e214b4..1d24cc6 100644 --- a/ash/wm/toplevel_window_event_handler_unittest.cc +++ b/ash/wm/toplevel_window_event_handler_unittest.cc @@ -26,7 +26,7 @@ #include "ui/base/hit_test.h" #include "ui/events/event.h" #include "ui/gfx/screen.h" -#include "ui/views/corewm/window_util.h" +#include "ui/wm/core/window_util.h" #if defined(OS_WIN) // Windows headers define macros for these function names which screw with us. diff --git a/ash/wm/video_detector.cc b/ash/wm/video_detector.cc index d0be623b..38aef18 100644 --- a/ash/wm/video_detector.cc +++ b/ash/wm/video_detector.cc @@ -11,7 +11,7 @@ #include "ui/aura/window.h" #include "ui/aura/window_event_dispatcher.h" #include "ui/gfx/rect.h" -#include "ui/views/corewm/window_util.h" +#include "ui/wm/core/window_util.h" namespace ash { diff --git a/ash/wm/window_animations.cc b/ash/wm/window_animations.cc index 4dce847..a5b3653 100644 --- a/ash/wm/window_animations.cc +++ b/ash/wm/window_animations.cc @@ -36,9 +36,9 @@ #include "ui/gfx/interpolated_transform.h" #include "ui/gfx/screen.h" #include "ui/gfx/vector3d_f.h" -#include "ui/views/corewm/window_util.h" #include "ui/views/view.h" #include "ui/views/widget/widget.h" +#include "ui/wm/core/window_util.h" namespace ash { namespace { diff --git a/ash/wm/window_animations.h b/ash/wm/window_animations.h index c0762e2..fe76767 100644 --- a/ash/wm/window_animations.h +++ b/ash/wm/window_animations.h @@ -9,7 +9,7 @@ #include "base/memory/scoped_ptr.h" #include "ui/gfx/animation/tween.h" #include "ui/gfx/transform.h" -#include "ui/views/corewm/window_animations.h" +#include "ui/wm/core/window_animations.h" namespace aura { class Window; diff --git a/ash/wm/window_cycle_list.cc b/ash/wm/window_cycle_list.cc index d6bf24a..58f1313 100644 --- a/ash/wm/window_cycle_list.cc +++ b/ash/wm/window_cycle_list.cc @@ -8,7 +8,7 @@ #include "ash/wm/mru_window_tracker.h" #include "ash/wm/window_util.h" #include "ui/aura/window.h" -#include "ui/views/corewm/window_animations.h" +#include "ui/wm/core/window_animations.h" namespace ash { diff --git a/ash/wm/window_manager_unittest.cc b/ash/wm/window_manager_unittest.cc index bccd62a..ac72def 100644 --- a/ash/wm/window_manager_unittest.cc +++ b/ash/wm/window_manager_unittest.cc @@ -24,9 +24,8 @@ #include "ui/events/event_processor.h" #include "ui/events/event_utils.h" #include "ui/gfx/screen.h" -#include "ui/views/corewm/compound_event_filter.h" -#include "ui/views/corewm/corewm_switches.h" -#include "ui/views/corewm/input_method_event_filter.h" +#include "ui/wm/core/compound_event_filter.h" +#include "ui/wm/core/input_method_event_filter.h" namespace { diff --git a/ash/wm/window_modality_controller_unittest.cc b/ash/wm/window_modality_controller_unittest.cc index 1e267bc..d87326b 100644 --- a/ash/wm/window_modality_controller_unittest.cc +++ b/ash/wm/window_modality_controller_unittest.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/views/corewm/window_modality_controller.h" +#include "ui/wm/core/window_modality_controller.h" #include "ash/shell.h" #include "ash/test/ash_test_base.h" @@ -14,10 +14,10 @@ #include "ui/aura/window.h" #include "ui/aura/window_event_dispatcher.h" #include "ui/base/ui_base_types.h" -#include "ui/views/corewm/window_util.h" #include "ui/views/test/capture_tracking_view.h" #include "ui/views/test/child_modal_window.h" #include "ui/views/widget/widget.h" +#include "ui/wm/core/window_util.h" namespace ash { namespace internal { diff --git a/ash/wm/window_positioner.cc b/ash/wm/window_positioner.cc index 8aaabc7..a06ea47 100644 --- a/ash/wm/window_positioner.cc +++ b/ash/wm/window_positioner.cc @@ -19,7 +19,7 @@ #include "ui/compositor/layer.h" #include "ui/compositor/scoped_layer_animation_settings.h" #include "ui/gfx/screen.h" -#include "ui/views/corewm/window_animations.h" +#include "ui/wm/core/window_animations.h" namespace ash { diff --git a/ash/wm/window_state.cc b/ash/wm/window_state.cc index d5d0a7e..8f69a36 100644 --- a/ash/wm/window_state.cc +++ b/ash/wm/window_state.cc @@ -24,7 +24,7 @@ #include "ui/compositor/layer_tree_owner.h" #include "ui/compositor/scoped_layer_animation_settings.h" #include "ui/gfx/display.h" -#include "ui/views/corewm/window_util.h" +#include "ui/wm/core/window_util.h" namespace ash { namespace wm { diff --git a/ash/wm/window_util.cc b/ash/wm/window_util.cc index 9ac7cc7..d37825e 100644 --- a/ash/wm/window_util.cc +++ b/ash/wm/window_util.cc @@ -20,9 +20,9 @@ #include "ui/gfx/rect.h" #include "ui/gfx/screen.h" #include "ui/gfx/size.h" -#include "ui/views/corewm/window_util.h" #include "ui/views/view.h" #include "ui/views/widget/widget.h" +#include "ui/wm/core/window_util.h" namespace ash { namespace wm { diff --git a/ash/wm/workspace/multi_window_resize_controller.cc b/ash/wm/workspace/multi_window_resize_controller.cc index a23ed48a..36cebc21 100644 --- a/ash/wm/workspace/multi_window_resize_controller.cc +++ b/ash/wm/workspace/multi_window_resize_controller.cc @@ -21,10 +21,10 @@ #include "ui/gfx/canvas.h" #include "ui/gfx/image/image.h" #include "ui/gfx/screen.h" -#include "ui/views/corewm/compound_event_filter.h" #include "ui/views/view.h" #include "ui/views/widget/widget.h" #include "ui/views/widget/widget_delegate.h" +#include "ui/wm/core/compound_event_filter.h" using aura::Window; diff --git a/ash/wm/workspace/workspace_event_handler_unittest.cc b/ash/wm/workspace/workspace_event_handler_unittest.cc index 17f2789..62a48c9 100644 --- a/ash/wm/workspace/workspace_event_handler_unittest.cc +++ b/ash/wm/workspace/workspace_event_handler_unittest.cc @@ -21,7 +21,7 @@ #include "ui/base/hit_test.h" #include "ui/events/event_processor.h" #include "ui/gfx/screen.h" -#include "ui/views/corewm/window_util.h" +#include "ui/wm/core/window_util.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 687324c..d812be6 100644 --- a/ash/wm/workspace/workspace_layout_manager.cc +++ b/ash/wm/workspace/workspace_layout_manager.cc @@ -26,7 +26,7 @@ #include "ui/compositor/layer.h" #include "ui/events/event.h" #include "ui/gfx/screen.h" -#include "ui/views/corewm/window_util.h" +#include "ui/wm/core/window_util.h" using aura::Window; diff --git a/ash/wm/workspace/workspace_layout_manager_unittest.cc b/ash/wm/workspace/workspace_layout_manager_unittest.cc index a27b484..3ff0411 100644 --- a/ash/wm/workspace/workspace_layout_manager_unittest.cc +++ b/ash/wm/workspace/workspace_layout_manager_unittest.cc @@ -28,9 +28,9 @@ #include "ui/base/ui_base_types.h" #include "ui/gfx/insets.h" #include "ui/gfx/screen.h" -#include "ui/views/corewm/window_util.h" #include "ui/views/widget/widget.h" #include "ui/views/widget/widget_delegate.h" +#include "ui/wm/core/window_util.h" namespace ash { namespace { diff --git a/ash/wm/workspace/workspace_window_resizer.cc b/ash/wm/workspace/workspace_window_resizer.cc index ae2346d..1b481a5 100644 --- a/ash/wm/workspace/workspace_window_resizer.cc +++ b/ash/wm/workspace/workspace_window_resizer.cc @@ -38,7 +38,7 @@ #include "ui/compositor/layer.h" #include "ui/gfx/screen.h" #include "ui/gfx/transform.h" -#include "ui/views/corewm/window_util.h" +#include "ui/wm/core/window_util.h" #include "ui/wm/public/window_types.h" namespace ash { diff --git a/ash/wm/workspace_controller.cc b/ash/wm/workspace_controller.cc index 9b9f35e..6dedf17 100644 --- a/ash/wm/workspace_controller.cc +++ b/ash/wm/workspace_controller.cc @@ -20,8 +20,8 @@ #include "ui/aura/window_event_dispatcher.h" #include "ui/compositor/layer.h" #include "ui/compositor/scoped_layer_animation_settings.h" -#include "ui/views/corewm/visibility_controller.h" -#include "ui/views/corewm/window_animations.h" +#include "ui/wm/core/visibility_controller.h" +#include "ui/wm/core/window_animations.h" namespace ash { namespace internal { diff --git a/ash/wm/workspace_controller_unittest.cc b/ash/wm/workspace_controller_unittest.cc index 86ee6be..df05ed6 100644 --- a/ash/wm/workspace_controller_unittest.cc +++ b/ash/wm/workspace_controller_unittest.cc @@ -34,9 +34,9 @@ #include "ui/compositor/scoped_animation_duration_scale_mode.h" #include "ui/events/event_utils.h" #include "ui/gfx/screen.h" -#include "ui/views/corewm/window_animations.h" -#include "ui/views/corewm/window_util.h" #include "ui/views/widget/widget.h" +#include "ui/wm/core/window_animations.h" +#include "ui/wm/core/window_util.h" using aura::Window; diff --git a/chrome/browser/chromeos/events/event_rewriter.cc b/chrome/browser/chromeos/events/event_rewriter.cc index 3c0548a..7981aaf 100644 --- a/chrome/browser/chromeos/events/event_rewriter.cc +++ b/chrome/browser/chromeos/events/event_rewriter.cc @@ -34,7 +34,7 @@ #include "ui/events/event.h" #include "ui/events/event_utils.h" #include "ui/events/keycodes/keyboard_code_conversion_x.h" -#include "ui/views/corewm/window_util.h" +#include "ui/wm/core/window_util.h" namespace { diff --git a/chrome/browser/chromeos/login/chrome_restart_request.cc b/chrome/browser/chromeos/login/chrome_restart_request.cc index 64cb32e..3e75e25 100644 --- a/chrome/browser/chromeos/login/chrome_restart_request.cc +++ b/chrome/browser/chromeos/login/chrome_restart_request.cc @@ -40,7 +40,7 @@ #include "ui/events/event_switches.h" #include "ui/gfx/switches.h" #include "ui/gl/gl_switches.h" -#include "ui/views/corewm/corewm_switches.h" +#include "ui/wm/core/wm_core_switches.h" #include "url/gurl.h" using content::BrowserThread; diff --git a/chrome/browser/chromeos/login/user_manager_impl.cc b/chrome/browser/chromeos/login/user_manager_impl.cc index 6026c12..1e0c61a 100644 --- a/chrome/browser/chromeos/login/user_manager_impl.cc +++ b/chrome/browser/chromeos/login/user_manager_impl.cc @@ -69,7 +69,7 @@ #include "google_apis/gaia/google_service_auth_error.h" #include "policy/policy_constants.h" #include "ui/base/l10n/l10n_util.h" -#include "ui/views/corewm/corewm_switches.h" +#include "ui/wm/core/wm_core_switches.h" using content::BrowserThread; diff --git a/chrome/browser/notifications/desktop_notifications_unittest.cc b/chrome/browser/notifications/desktop_notifications_unittest.cc index 742cdcc..bc8c568 100644 --- a/chrome/browser/notifications/desktop_notifications_unittest.cc +++ b/chrome/browser/notifications/desktop_notifications_unittest.cc @@ -28,7 +28,7 @@ #endif #if defined(USE_AURA) -#include "ui/views/corewm/wm_state.h" +#include "ui/wm/core/wm_state.h" #endif diff --git a/chrome/browser/ui/ash/launcher/app_shortcut_launcher_item_controller.cc b/chrome/browser/ui/ash/launcher/app_shortcut_launcher_item_controller.cc index e4d3a4e..7faf301 100644 --- a/chrome/browser/ui/ash/launcher/app_shortcut_launcher_item_controller.cc +++ b/chrome/browser/ui/ash/launcher/app_shortcut_launcher_item_controller.cc @@ -31,7 +31,7 @@ #include "extensions/browser/process_manager.h" #include "ui/aura/window.h" #include "ui/events/event.h" -#include "ui/views/corewm/window_animations.h" +#include "ui/wm/core/window_animations.h" using extensions::Extension; diff --git a/chrome/browser/ui/ash/launcher/app_window_launcher_item_controller.cc b/chrome/browser/ui/ash/launcher/app_window_launcher_item_controller.cc index 7d0e120..46931ec 100644 --- a/chrome/browser/ui/ash/launcher/app_window_launcher_item_controller.cc +++ b/chrome/browser/ui/ash/launcher/app_window_launcher_item_controller.cc @@ -21,7 +21,7 @@ #include "ui/aura/window.h" #include "ui/events/event.h" #include "ui/gfx/image/image_skia.h" -#include "ui/views/corewm/window_animations.h" +#include "ui/wm/core/window_animations.h" using apps::AppWindow; diff --git a/chrome/browser/ui/ash/launcher/browser_shortcut_launcher_item_controller.cc b/chrome/browser/ui/ash/launcher/browser_shortcut_launcher_item_controller.cc index 17a3cea..4e79e42 100644 --- a/chrome/browser/ui/ash/launcher/browser_shortcut_launcher_item_controller.cc +++ b/chrome/browser/ui/ash/launcher/browser_shortcut_launcher_item_controller.cc @@ -34,7 +34,7 @@ #include "ui/base/resource/resource_bundle.h" #include "ui/events/event.h" #include "ui/gfx/image/image.h" -#include "ui/views/corewm/window_animations.h" +#include "ui/wm/core/window_animations.h" BrowserShortcutLauncherItemController::BrowserShortcutLauncherItemController( ChromeLauncherController* launcher_controller) diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc b/chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc index ed1936d..eceec7d 100644 --- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc +++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc @@ -84,7 +84,7 @@ #include "ui/aura/window.h" #include "ui/aura/window_event_dispatcher.h" #include "ui/base/l10n/l10n_util.h" -#include "ui/views/corewm/window_animations.h" +#include "ui/wm/core/window_animations.h" #if defined(OS_CHROMEOS) #include "chrome/browser/browser_process.h" 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 0356dc2..a77631a 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 @@ -44,9 +44,9 @@ #include "ui/base/ui_base_types.h" #include "ui/events/event.h" #include "ui/message_center/message_center.h" -#include "ui/views/corewm/transient_window_manager.h" -#include "ui/views/corewm/window_animations.h" -#include "ui/views/corewm/window_util.h" +#include "ui/wm/core/transient_window_manager.h" +#include "ui/wm/core/window_animations.h" +#include "ui/wm/core/window_util.h" namespace { diff --git a/chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.h b/chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.h index 3711139..e334283 100644 --- a/chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.h +++ b/chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.h @@ -17,7 +17,7 @@ #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" #include "ui/aura/window_observer.h" -#include "ui/views/corewm/transient_window_observer.h" +#include "ui/wm/core/transient_window_observer.h" class Browser; class MultiUserNotificationBlockerChromeOS; 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 11574ad..7f55945 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 @@ -21,7 +21,7 @@ #include "ui/aura/client/aura_constants.h" #include "ui/aura/window_event_dispatcher.h" #include "ui/base/ui_base_types.h" -#include "ui/views/corewm/window_util.h" +#include "ui/wm/core/window_util.h" namespace ash { namespace test { diff --git a/chrome/browser/ui/startup/startup_browser_creator.cc b/chrome/browser/ui/startup/startup_browser_creator.cc index b9400c2..acfcfb3 100644 --- a/chrome/browser/ui/startup/startup_browser_creator.cc +++ b/chrome/browser/ui/startup/startup_browser_creator.cc @@ -9,7 +9,6 @@ #include "apps/app_load_service.h" #include "apps/switches.h" -#include "ash/shell.h" #include "base/bind.h" #include "base/bind_helpers.h" #include "base/command_line.h" @@ -71,6 +70,10 @@ #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" +#if defined(USE_ASH) +#include "ash/shell.h" +#endif + #if defined(OS_CHROMEOS) #include "chrome/browser/chromeos/app_mode/app_launch_utils.h" #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings.h" diff --git a/chrome/browser/ui/views/autofill/autofill_popup_base_view.cc b/chrome/browser/ui/views/autofill/autofill_popup_base_view.cc index 7fe84bf..c608701 100644 --- a/chrome/browser/ui/views/autofill/autofill_popup_base_view.cc +++ b/chrome/browser/ui/views/autofill/autofill_popup_base_view.cc @@ -12,7 +12,7 @@ #include "ui/views/widget/widget.h" #if defined(USE_AURA) -#include "ui/views/corewm/window_animations.h" +#include "ui/wm/core/window_animations.h" #endif namespace autofill { diff --git a/chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc b/chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc index 922a728..3a48cf4 100644 --- a/chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc +++ b/chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc @@ -10,7 +10,7 @@ #include "ui/base/ui_base_switches.h" #if defined(USE_AURA) -#include "ui/views/corewm/wm_state.h" +#include "ui/wm/core/wm_state.h" #endif ChromeBrowserMainExtraPartsViews::ChromeBrowserMainExtraPartsViews() { diff --git a/chrome/browser/ui/views/desktop_media_picker_views.cc b/chrome/browser/ui/views/desktop_media_picker_views.cc index 87c06de..8e6d36f 100644 --- a/chrome/browser/ui/views/desktop_media_picker_views.cc +++ b/chrome/browser/ui/views/desktop_media_picker_views.cc @@ -10,6 +10,7 @@ #include "chrome/browser/ui/ash/ash_util.h" #include "content/public/browser/browser_thread.h" #include "grit/generated_resources.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/base/l10n/l10n_util.h" #include "ui/events/keycodes/keyboard_codes.h" #include "ui/gfx/canvas.h" @@ -18,16 +19,12 @@ #include "ui/views/controls/image_view.h" #include "ui/views/controls/label.h" #include "ui/views/controls/scroll_view.h" -#include "ui/views/corewm/shadow_types.h" #include "ui/views/layout/box_layout.h" #include "ui/views/layout/layout_constants.h" #include "ui/views/widget/widget.h" #include "ui/views/window/dialog_client_view.h" #include "ui/views/window/dialog_delegate.h" - -#if defined(USE_AURA) -#include "ui/aura/window_event_dispatcher.h" -#endif +#include "ui/wm/core/shadow_types.h" using content::DesktopMediaID; diff --git a/chrome/browser/ui/views/extensions/extension_popup.cc b/chrome/browser/ui/views/extensions/extension_popup.cc index 184f82a..939b2cc 100644 --- a/chrome/browser/ui/views/extensions/extension_popup.cc +++ b/chrome/browser/ui/views/extensions/extension_popup.cc @@ -31,8 +31,8 @@ #if defined(USE_AURA) #include "ui/aura/client/activation_client.h" #include "ui/aura/window.h" -#include "ui/views/corewm/window_animations.h" -#include "ui/views/corewm/window_util.h" +#include "ui/wm/core/window_animations.h" +#include "ui/wm/core/window_util.h" #endif #if defined(OS_WIN) diff --git a/chrome/browser/ui/views/frame/desktop_browser_frame_aura.cc b/chrome/browser/ui/views/frame/desktop_browser_frame_aura.cc index 2e87976..ced62df 100644 --- a/chrome/browser/ui/views/frame/desktop_browser_frame_aura.cc +++ b/chrome/browser/ui/views/frame/desktop_browser_frame_aura.cc @@ -18,8 +18,8 @@ #include "ui/base/l10n/l10n_util.h" #include "ui/base/models/simple_menu_model.h" #include "ui/gfx/font.h" -#include "ui/views/corewm/visibility_controller.h" #include "ui/views/view.h" +#include "ui/wm/core/visibility_controller.h" using aura::Window; diff --git a/chrome/browser/ui/views/omnibox/omnibox_popup_contents_view.cc b/chrome/browser/ui/views/omnibox/omnibox_popup_contents_view.cc index 1e93f29..718a004 100644 --- a/chrome/browser/ui/views/omnibox/omnibox_popup_contents_view.cc +++ b/chrome/browser/ui/views/omnibox/omnibox_popup_contents_view.cc @@ -22,7 +22,7 @@ #include "ui/views/window/non_client_view.h" #if defined(USE_AURA) -#include "ui/views/corewm/window_animations.h" +#include "ui/wm/core/window_animations.h" #endif // This is the number of pixels in the border image interior to the actual diff --git a/chrome/browser/ui/views/screen_capture_notification_ui_views.cc b/chrome/browser/ui/views/screen_capture_notification_ui_views.cc index 12371bc8a6..cc73c93 100644 --- a/chrome/browser/ui/views/screen_capture_notification_ui_views.cc +++ b/chrome/browser/ui/views/screen_capture_notification_ui_views.cc @@ -17,11 +17,11 @@ #include "ui/views/bubble/bubble_frame_view.h" #include "ui/views/controls/button/blue_button.h" #include "ui/views/controls/image_view.h" -#include "ui/views/corewm/shadow_types.h" #include "ui/views/layout/box_layout.h" #include "ui/views/view.h" #include "ui/views/widget/widget.h" #include "ui/views/widget/widget_delegate.h" +#include "ui/wm/core/shadow_types.h" namespace { diff --git a/chrome/browser/ui/views/web_contents_modal_dialog_manager_views.cc b/chrome/browser/ui/views/web_contents_modal_dialog_manager_views.cc index 96577fb..1c8dfb7 100644 --- a/chrome/browser/ui/views/web_contents_modal_dialog_manager_views.cc +++ b/chrome/browser/ui/views/web_contents_modal_dialog_manager_views.cc @@ -23,9 +23,9 @@ #if defined(USE_AURA) #include "ui/aura/client/aura_constants.h" #include "ui/aura/window.h" -#include "ui/views/corewm/visibility_controller.h" -#include "ui/views/corewm/window_animations.h" -#include "ui/views/corewm/window_modality_controller.h" +#include "ui/wm/core/visibility_controller.h" +#include "ui/wm/core/window_animations.h" +#include "ui/wm/core/window_modality_controller.h" #endif // TODO(wittman): this code should not depend on ash. diff --git a/chrome/test/base/test_launcher_utils.cc b/chrome/test/base/test_launcher_utils.cc index 78b6b16..0bf1e28 100644 --- a/chrome/test/base/test_launcher_utils.cc +++ b/chrome/test/base/test_launcher_utils.cc @@ -15,7 +15,7 @@ #include "components/encryptor/encryptor_switches.h" #if defined(USE_AURA) -#include "ui/views/corewm/corewm_switches.h" +#include "ui/wm/core/wm_core_switches.h" #endif namespace test_launcher_utils { diff --git a/chrome/test/base/view_event_test_base.cc b/chrome/test/base/view_event_test_base.cc index 245f439a..8ef02b5 100644 --- a/chrome/test/base/view_event_test_base.cc +++ b/chrome/test/base/view_event_test_base.cc @@ -32,7 +32,7 @@ #include "ui/aura/window_event_dispatcher.h" #include "ui/aura/window_tree_host.h" #include "ui/compositor/test/context_factories_for_test.h" -#include "ui/views/corewm/wm_state.h" +#include "ui/wm/core/wm_state.h" #endif #if defined(OS_CHROMEOS) diff --git a/ui/views/DEPS b/ui/views/DEPS index d0e4439..065ceac 100644 --- a/ui/views/DEPS +++ b/ui/views/DEPS @@ -13,6 +13,7 @@ include_rules = [ "+ui/gl/gl_surface.h", # To initialize GL for tests. "+ui/native_theme", "+ui/ozone", + "+ui/wm/core", "+ui/wm/public", "-testing/gmock", diff --git a/ui/views/controls/menu/menu_host.cc b/ui/views/controls/menu/menu_host.cc index 650b36e5..e7f6fad 100644 --- a/ui/views/controls/menu/menu_host.cc +++ b/ui/views/controls/menu/menu_host.cc @@ -14,10 +14,10 @@ #include "ui/views/controls/menu/menu_item_view.h" #include "ui/views/controls/menu/menu_scroll_view_container.h" #include "ui/views/controls/menu/submenu_view.h" -#include "ui/views/corewm/shadow_types.h" #include "ui/views/round_rect_painter.h" #include "ui/views/widget/native_widget_private.h" #include "ui/views/widget/widget.h" +#include "ui/wm/core/shadow_types.h" namespace views { diff --git a/ui/views/corewm/capture_controller_unittest.cc b/ui/views/corewm/capture_controller_unittest.cc index 5258614..e9fb667 100644 --- a/ui/views/corewm/capture_controller_unittest.cc +++ b/ui/views/corewm/capture_controller_unittest.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/views/corewm/capture_controller.h" +#include "ui/wm/core/capture_controller.h" #include "base/logging.h" #include "ui/aura/env.h" diff --git a/ui/views/corewm/desktop_capture_controller_unittest.cc b/ui/views/corewm/desktop_capture_controller_unittest.cc index 679af19..0d42dc9 100644 --- a/ui/views/corewm/desktop_capture_controller_unittest.cc +++ b/ui/views/corewm/desktop_capture_controller_unittest.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/views/corewm/capture_controller.h" +#include "ui/wm/core/capture_controller.h" #include "base/logging.h" #include "ui/aura/env.h" diff --git a/ui/views/corewm/tooltip_controller_unittest.cc b/ui/views/corewm/tooltip_controller_unittest.cc index b995861..772ba33 100644 --- a/ui/views/corewm/tooltip_controller_unittest.cc +++ b/ui/views/corewm/tooltip_controller_unittest.cc @@ -23,10 +23,10 @@ #include "ui/gfx/text_elider.h" #include "ui/views/corewm/tooltip_aura.h" #include "ui/views/corewm/tooltip_controller_test_helper.h" -#include "ui/views/corewm/wm_state.h" #include "ui/views/view.h" #include "ui/views/widget/tooltip_manager.h" #include "ui/views/widget/widget.h" +#include "ui/wm/core/wm_state.h" #include "ui/wm/public/window_types.h" #if defined(OS_WIN) diff --git a/ui/views/examples/content_client/examples_browser_main_parts.cc b/ui/views/examples/content_client/examples_browser_main_parts.cc index 2b4fd6b..ac966c4 100644 --- a/ui/views/examples/content_client/examples_browser_main_parts.cc +++ b/ui/views/examples/content_client/examples_browser_main_parts.cc @@ -16,11 +16,11 @@ #include "ui/aura/env.h" #include "ui/base/ime/input_method_initializer.h" #include "ui/gfx/screen.h" -#include "ui/views/corewm/wm_state.h" #include "ui/views/examples/examples_window_with_content.h" #include "ui/views/test/desktop_test_views_delegate.h" #include "ui/views/widget/desktop_aura/desktop_screen.h" #include "ui/views/widget/native_widget_aura.h" +#include "ui/wm/core/wm_state.h" #include "url/gurl.h" #if defined(OS_CHROMEOS) diff --git a/ui/views/examples/examples_main.cc b/ui/views/examples/examples_main.cc index f56bdd33a..55e46a6 100644 --- a/ui/views/examples/examples_main.cc +++ b/ui/views/examples/examples_main.cc @@ -15,10 +15,10 @@ #include "ui/compositor/test/context_factories_for_test.h" #include "ui/gfx/screen.h" #include "ui/gl/gl_surface.h" -#include "ui/views/corewm/wm_state.h" #include "ui/views/examples/example_base.h" #include "ui/views/examples/examples_window.h" #include "ui/views/test/desktop_test_views_delegate.h" +#include "ui/wm/core/wm_state.h" #if !defined(OS_CHROMEOS) #include "ui/views/widget/desktop_aura/desktop_screen.h" diff --git a/ui/views/test/child_modal_window.cc b/ui/views/test/child_modal_window.cc index db8f8a4..c5d40ad 100644 --- a/ui/views/test/child_modal_window.cc +++ b/ui/views/test/child_modal_window.cc @@ -11,9 +11,9 @@ #include "ui/views/controls/button/label_button.h" #include "ui/views/controls/native/native_view_host.h" #include "ui/views/controls/textfield/textfield.h" -#include "ui/views/corewm/window_modality_controller.h" #include "ui/views/widget/widget.h" #include "ui/views/widget/widget_delegate.h" +#include "ui/wm/core/window_modality_controller.h" namespace views { namespace test { diff --git a/ui/views/test/test_views_delegate.cc b/ui/views/test/test_views_delegate.cc index b299ceb..6caae1d 100644 --- a/ui/views/test/test_views_delegate.cc +++ b/ui/views/test/test_views_delegate.cc @@ -7,7 +7,7 @@ #include "base/command_line.h" #include "base/logging.h" #include "content/public/test/web_contents_tester.h" -#include "ui/views/corewm/wm_state.h" +#include "ui/wm/core/wm_state.h" #if !defined(OS_CHROMEOS) #include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h" diff --git a/ui/views/test/views_test_base.cc b/ui/views/test/views_test_base.cc index 26a0f07..7929f9a 100644 --- a/ui/views/test/views_test_base.cc +++ b/ui/views/test/views_test_base.cc @@ -11,8 +11,8 @@ #include "ui/aura/test/aura_test_helper.h" #include "ui/aura/window_event_dispatcher.h" #include "ui/compositor/test/context_factories_for_test.h" -#include "ui/views/corewm/capture_controller.h" -#include "ui/views/corewm/wm_state.h" +#include "ui/wm/core/capture_controller.h" +#include "ui/wm/core/wm_state.h" namespace views { diff --git a/ui/views/touchui/touch_selection_controller_impl.cc b/ui/views/touchui/touch_selection_controller_impl.cc index a6ae6d6..9796c77 100644 --- a/ui/views/touchui/touch_selection_controller_impl.cc +++ b/ui/views/touchui/touch_selection_controller_impl.cc @@ -15,9 +15,9 @@ #include "ui/gfx/rect.h" #include "ui/gfx/screen.h" #include "ui/gfx/size.h" -#include "ui/views/corewm/shadow_types.h" -#include "ui/views/corewm/window_animations.h" #include "ui/views/widget/widget.h" +#include "ui/wm/core/shadow_types.h" +#include "ui/wm/core/window_animations.h" #include "ui/wm/public/masked_window_targeter.h" namespace { diff --git a/ui/views/view_unittest.cc b/ui/views/view_unittest.cc index effb9d5..bd3b291 100644 --- a/ui/views/view_unittest.cc +++ b/ui/views/view_unittest.cc @@ -30,7 +30,6 @@ #include "ui/views/controls/native/native_view_host.h" #include "ui/views/controls/scroll_view.h" #include "ui/views/controls/textfield/textfield.h" -#include "ui/views/corewm/window_util.h" #include "ui/views/focus/view_storage.h" #include "ui/views/test/views_test_base.h" #include "ui/views/view.h" @@ -40,6 +39,7 @@ #include "ui/views/widget/root_view.h" #include "ui/views/window/dialog_client_view.h" #include "ui/views/window/dialog_delegate.h" +#include "ui/wm/core/window_util.h" #if defined(OS_WIN) #include "ui/views/test/test_views_delegate.h" diff --git a/ui/views/views.gyp b/ui/views/views.gyp index 5312383..8aac087 100644 --- a/ui/views/views.gyp +++ b/ui/views/views.gyp @@ -228,31 +228,6 @@ 'controls/tree/tree_view.h', 'controls/tree/tree_view_controller.cc', 'controls/tree/tree_view_controller.h', - 'corewm/base_focus_rules.cc', - 'corewm/base_focus_rules.h', - 'corewm/capture_controller.cc', - 'corewm/capture_controller.h', - 'corewm/compound_event_filter.cc', - 'corewm/compound_event_filter.h', - 'corewm/corewm_switches.cc', - 'corewm/corewm_switches.h', - 'corewm/cursor_manager.cc', - 'corewm/cursor_manager.h', - 'corewm/focus_controller.cc', - 'corewm/focus_controller.h', - 'corewm/focus_rules.h', - 'corewm/image_grid.cc', - 'corewm/image_grid.h', - 'corewm/input_method_event_filter.cc', - 'corewm/input_method_event_filter.h', - 'corewm/native_cursor_manager.h', - 'corewm/native_cursor_manager_delegate.h', - 'corewm/shadow.cc', - 'corewm/shadow.h', - 'corewm/shadow_controller.cc', - 'corewm/shadow_controller.h', - 'corewm/shadow_types.cc', - 'corewm/shadow_types.h', 'corewm/tooltip.h', 'corewm/tooltip_aura.cc', 'corewm/tooltip_aura.h', @@ -260,23 +235,6 @@ 'corewm/tooltip_controller.h', 'corewm/tooltip_win.cc', 'corewm/tooltip_win.h', - 'corewm/transient_window_controller.cc', - 'corewm/transient_window_controller.h', - 'corewm/transient_window_manager.cc', - 'corewm/transient_window_manager.h', - 'corewm/transient_window_observer.h', - 'corewm/transient_window_stacking_client.cc', - 'corewm/transient_window_stacking_client.h', - 'corewm/visibility_controller.cc', - 'corewm/visibility_controller.h', - 'corewm/window_animations.cc', - 'corewm/window_animations.h', - 'corewm/window_modality_controller.cc', - 'corewm/window_modality_controller.h', - 'corewm/window_util.cc', - 'corewm/window_util.h', - 'corewm/wm_state.cc', - 'corewm/wm_state.h', 'debug_utils.cc', 'debug_utils.h', 'drag_controller.h', @@ -468,6 +426,49 @@ 'window/window_resources.h', 'window/window_shape.cc', 'window/window_shape.h', + '../wm/core/base_focus_rules.cc', + '../wm/core/base_focus_rules.h', + '../wm/core/capture_controller.cc', + '../wm/core/capture_controller.h', + '../wm/core/compound_event_filter.cc', + '../wm/core/compound_event_filter.h', + '../wm/core/cursor_manager.cc', + '../wm/core/cursor_manager.h', + '../wm/core/focus_controller.cc', + '../wm/core/focus_controller.h', + '../wm/core/focus_rules.h', + '../wm/core/image_grid.cc', + '../wm/core/image_grid.h', + '../wm/core/input_method_event_filter.cc', + '../wm/core/input_method_event_filter.h', + '../wm/core/native_cursor_manager.h', + '../wm/core/native_cursor_manager_delegate.h', + '../wm/core/shadow.cc', + '../wm/core/shadow.h', + '../wm/core/shadow_controller.cc', + '../wm/core/shadow_controller.h', + '../wm/core/shadow_types.cc', + '../wm/core/shadow_types.h', + '../wm/core/transient_window_controller.cc', + '../wm/core/transient_window_controller.h', + '../wm/core/transient_window_manager.cc', + '../wm/core/transient_window_manager.h', + '../wm/core/transient_window_observer.h', + '../wm/core/transient_window_stacking_client.cc', + '../wm/core/transient_window_stacking_client.h', + '../wm/core/visibility_controller.cc', + '../wm/core/visibility_controller.h', + '../wm/core/window_animations.cc', + '../wm/core/window_animations.h', + '../wm/core/window_modality_controller.cc', + '../wm/core/window_modality_controller.h', + '../wm/core/window_util.cc', + '../wm/core/window_util.h', + '../wm/core/wm_core_export.h', + '../wm/core/wm_core_switches.cc', + '../wm/core/wm_core_switches.h', + '../wm/core/wm_state.cc', + '../wm/core/wm_state.h', ], 'include_dirs': [ '../../third_party/wtl/include', @@ -746,18 +747,8 @@ 'controls/textfield/textfield_model_unittest.cc', 'controls/tree/tree_view_unittest.cc', 'corewm/capture_controller_unittest.cc', - 'corewm/compound_event_filter_unittest.cc', - 'corewm/cursor_manager_unittest.cc', - 'corewm/focus_controller_unittest.cc', - 'corewm/image_grid_unittest.cc', - 'corewm/input_method_event_filter_unittest.cc', - 'corewm/shadow_controller_unittest.cc', 'corewm/tooltip_aura_unittest.cc', 'corewm/tooltip_controller_unittest.cc', - 'corewm/transient_window_manager_unittest.cc', - 'corewm/transient_window_stacking_client_unittest.cc', - 'corewm/visibility_controller_unittest.cc', - 'corewm/window_animations_unittest.cc', 'focus/focus_manager_test.h', 'focus/focus_manager_test.cc', 'focus/focus_manager_unittest.cc', @@ -784,6 +775,16 @@ 'widget/window_reorderer_unittest.cc', 'window/dialog_client_view_unittest.cc', 'window/dialog_delegate_unittest.cc', + '../wm/core/compound_event_filter_unittest.cc', + '../wm/core/cursor_manager_unittest.cc', + '../wm/core/focus_controller_unittest.cc', + '../wm/core/input_method_event_filter_unittest.cc', + '../wm/core/image_grid_unittest.cc', + '../wm/core/shadow_controller_unittest.cc', + '../wm/core/transient_window_manager_unittest.cc', + '../wm/core/transient_window_stacking_client_unittest.cc', + '../wm/core/visibility_controller_unittest.cc', + '../wm/core/window_animations_unittest.cc', ], 'conditions': [ ['chromeos==0', { diff --git a/ui/views/widget/desktop_aura/desktop_focus_rules.h b/ui/views/widget/desktop_aura/desktop_focus_rules.h index 338010a..ef913fa 100644 --- a/ui/views/widget/desktop_aura/desktop_focus_rules.h +++ b/ui/views/widget/desktop_aura/desktop_focus_rules.h @@ -5,7 +5,7 @@ #ifndef UI_VIEWS_WIDGET_DESKTOP_FOCUS_RULES_H_ #define UI_VIEWS_WIDGET_DESKTOP_FOCUS_RULES_H_ -#include "ui/views/corewm/base_focus_rules.h" +#include "ui/wm/core/base_focus_rules.h" namespace views { diff --git a/ui/views/widget/desktop_aura/desktop_focus_rules_unittest.cc b/ui/views/widget/desktop_aura/desktop_focus_rules_unittest.cc index 5967508..c654503 100644 --- a/ui/views/widget/desktop_aura/desktop_focus_rules_unittest.cc +++ b/ui/views/widget/desktop_aura/desktop_focus_rules_unittest.cc @@ -9,10 +9,10 @@ #include "ui/aura/window.h" #include "ui/aura/window_event_dispatcher.h" #include "ui/aura/window_layer_type.h" -#include "ui/views/corewm/window_util.h" #include "ui/views/test/views_test_base.h" #include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h" #include "ui/views/widget/widget.h" +#include "ui/wm/core/window_util.h" namespace views { diff --git a/ui/views/widget/desktop_aura/desktop_native_cursor_manager.h b/ui/views/widget/desktop_aura/desktop_native_cursor_manager.h index 8bd5f3e..1f11aad 100644 --- a/ui/views/widget/desktop_aura/desktop_native_cursor_manager.h +++ b/ui/views/widget/desktop_aura/desktop_native_cursor_manager.h @@ -9,8 +9,8 @@ #include "base/compiler_specific.h" #include "base/memory/scoped_ptr.h" -#include "ui/views/corewm/native_cursor_manager.h" #include "ui/views/views_export.h" +#include "ui/wm/core/native_cursor_manager.h" namespace aura { class WindowTreeHost; 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 5ff2cca..9e15db9 100644 --- a/ui/views/widget/desktop_aura/desktop_native_widget_aura.cc +++ b/ui/views/widget/desktop_aura/desktop_native_widget_aura.cc @@ -25,18 +25,8 @@ #include "ui/gfx/screen.h" #include "ui/gfx/size_conversions.h" #include "ui/native_theme/native_theme.h" -#include "ui/views/corewm/compound_event_filter.h" -#include "ui/views/corewm/corewm_switches.h" -#include "ui/views/corewm/cursor_manager.h" -#include "ui/views/corewm/focus_controller.h" -#include "ui/views/corewm/input_method_event_filter.h" -#include "ui/views/corewm/native_cursor_manager.h" -#include "ui/views/corewm/shadow_controller.h" -#include "ui/views/corewm/shadow_types.h" #include "ui/views/corewm/tooltip.h" #include "ui/views/corewm/tooltip_controller.h" -#include "ui/views/corewm/visibility_controller.h" -#include "ui/views/corewm/window_modality_controller.h" #include "ui/views/drag_utils.h" #include "ui/views/ime/input_method.h" #include "ui/views/ime/input_method_bridge.h" @@ -56,6 +46,15 @@ #include "ui/views/widget/widget_aura_utils.h" #include "ui/views/widget/widget_delegate.h" #include "ui/views/widget/window_reorderer.h" +#include "ui/wm/core/compound_event_filter.h" +#include "ui/wm/core/cursor_manager.h" +#include "ui/wm/core/focus_controller.h" +#include "ui/wm/core/input_method_event_filter.h" +#include "ui/wm/core/native_cursor_manager.h" +#include "ui/wm/core/shadow_controller.h" +#include "ui/wm/core/shadow_types.h" +#include "ui/wm/core/visibility_controller.h" +#include "ui/wm/core/window_modality_controller.h" #if defined(OS_WIN) #include "ui/base/win/shell.h" 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 04aaa17..d3efbeb 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 @@ -25,11 +25,7 @@ #include "ui/gfx/win/dpi.h" #include "ui/native_theme/native_theme_aura.h" #include "ui/native_theme/native_theme_win.h" -#include "ui/views/corewm/compound_event_filter.h" -#include "ui/views/corewm/corewm_switches.h" -#include "ui/views/corewm/input_method_event_filter.h" #include "ui/views/corewm/tooltip_win.h" -#include "ui/views/corewm/window_animations.h" #include "ui/views/ime/input_method_bridge.h" #include "ui/views/widget/desktop_aura/desktop_cursor_loader_updater.h" #include "ui/views/widget/desktop_aura/desktop_drag_drop_client_win.h" @@ -41,6 +37,9 @@ #include "ui/views/win/fullscreen_handler.h" #include "ui/views/win/hwnd_message_handler.h" #include "ui/views/window/native_frame_view.h" +#include "ui/wm/core/compound_event_filter.h" +#include "ui/wm/core/input_method_event_filter.h" +#include "ui/wm/core/window_animations.h" namespace views { diff --git a/ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc b/ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc index 92029cb..e3f1179 100644 --- a/ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc +++ b/ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc @@ -33,10 +33,7 @@ #include "ui/gfx/path.h" #include "ui/gfx/path_x11.h" #include "ui/native_theme/native_theme.h" -#include "ui/views/corewm/compound_event_filter.h" -#include "ui/views/corewm/corewm_switches.h" #include "ui/views/corewm/tooltip_aura.h" -#include "ui/views/corewm/window_util.h" #include "ui/views/ime/input_method.h" #include "ui/views/linux_ui/linux_ui.h" #include "ui/views/views_delegate.h" @@ -49,6 +46,8 @@ #include "ui/views/widget/desktop_aura/x11_desktop_window_move_client.h" #include "ui/views/widget/desktop_aura/x11_scoped_capture.h" #include "ui/views/widget/desktop_aura/x11_window_event_filter.h" +#include "ui/wm/core/compound_event_filter.h" +#include "ui/wm/core/window_util.h" namespace views { diff --git a/ui/views/widget/native_widget_aura.cc b/ui/views/widget/native_widget_aura.cc index 851da02..1c4dd16 100644 --- a/ui/views/widget/native_widget_aura.cc +++ b/ui/views/widget/native_widget_aura.cc @@ -27,7 +27,6 @@ #include "ui/gfx/font_list.h" #include "ui/gfx/screen.h" #include "ui/native_theme/native_theme_aura.h" -#include "ui/views/corewm/window_util.h" #include "ui/views/drag_utils.h" #include "ui/views/ime/input_method_bridge.h" #include "ui/views/views_delegate.h" @@ -39,6 +38,7 @@ #include "ui/views/widget/widget_aura_utils.h" #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/window_types.h" #if defined(OS_WIN) diff --git a/ui/views/window/dialog_delegate.cc b/ui/views/window/dialog_delegate.cc index cf26cad..627b923 100644 --- a/ui/views/window/dialog_delegate.cc +++ b/ui/views/window/dialog_delegate.cc @@ -10,10 +10,10 @@ #include "ui/views/bubble/bubble_border.h" #include "ui/views/bubble/bubble_frame_view.h" #include "ui/views/controls/button/label_button.h" -#include "ui/views/corewm/shadow_types.h" #include "ui/views/widget/widget.h" #include "ui/views/widget/widget_observer.h" #include "ui/views/window/dialog_client_view.h" +#include "ui/wm/core/shadow_types.h" namespace views { diff --git a/ui/wm/core/DEPS b/ui/wm/core/DEPS new file mode 100644 index 0000000..54c7090 --- /dev/null +++ b/ui/wm/core/DEPS @@ -0,0 +1,14 @@ +include_rules = [ + "+grit/ui_resources.h", + "+ui/aura", + "+ui/base/cursor", + "+ui/base/hit_test.h", + "+ui/base/ime", + "+ui/base/resource", + "+ui/base/ui_base_types.h", + "+ui/compositor", + "+ui/events", + "+ui/gfx", + "+ui/views/views_export.h", + "+third_party/skia", +] diff --git a/ui/views/corewm/base_focus_rules.cc b/ui/wm/core/base_focus_rules.cc index 3674ff0..1092f07 100644 --- a/ui/views/corewm/base_focus_rules.cc +++ b/ui/wm/core/base_focus_rules.cc @@ -2,14 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ui/views/corewm/base_focus_rules.h" +#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/views/corewm/window_modality_controller.h" -#include "ui/views/corewm/window_util.h" +#include "ui/wm/core/window_modality_controller.h" +#include "ui/wm/core/window_util.h" namespace views { namespace corewm { diff --git a/ui/views/corewm/base_focus_rules.h b/ui/wm/core/base_focus_rules.h index 4c564b0..cfa0f94 100644 --- a/ui/views/corewm/base_focus_rules.h +++ b/ui/wm/core/base_focus_rules.h @@ -2,19 +2,19 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef UI_VIEWS_COREWM_BASE_FOCUS_RULES_H_ -#define UI_VIEWS_COREWM_BASE_FOCUS_RULES_H_ +#ifndef UI_WM_CORE_BASE_FOCUS_RULES_H_ +#define UI_WM_CORE_BASE_FOCUS_RULES_H_ #include "base/basictypes.h" #include "base/compiler_specific.h" -#include "ui/views/corewm/focus_rules.h" +#include "ui/wm/core/focus_rules.h" namespace views { namespace corewm { // A set of basic focus and activation rules. Specializations should most likely // subclass this and call up to these methods rather than reimplementing them. -class VIEWS_EXPORT BaseFocusRules : public FocusRules { +class WM_CORE_EXPORT BaseFocusRules : public FocusRules { protected: BaseFocusRules(); virtual ~BaseFocusRules(); @@ -44,4 +44,4 @@ class VIEWS_EXPORT BaseFocusRules : public FocusRules { } // namespace corewm } // namespace views -#endif // UI_VIEWS_COREWM_BASE_FOCUS_RULES_H_ +#endif // UI_WM_CORE_BASE_FOCUS_RULES_H_ diff --git a/ui/views/corewm/capture_controller.cc b/ui/wm/core/capture_controller.cc index daa34dd1..558ac3d0 100644 --- a/ui/views/corewm/capture_controller.cc +++ b/ui/wm/core/capture_controller.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/views/corewm/capture_controller.h" +#include "ui/wm/core/capture_controller.h" #include "ui/aura/window.h" #include "ui/aura/window_event_dispatcher.h" diff --git a/ui/views/corewm/capture_controller.h b/ui/wm/core/capture_controller.h index e7d1ffd..ab9afa8 100644 --- a/ui/views/corewm/capture_controller.h +++ b/ui/wm/core/capture_controller.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_VIEWS_COREWM_CAPTURE_CONTROLLER_H_ -#define UI_VIEWS_COREWM_CAPTURE_CONTROLLER_H_ +#ifndef UI_WM_CORE_CAPTURE_CONTROLLER_H_ +#define UI_WM_CORE_CAPTURE_CONTROLLER_H_ #include <set> @@ -11,13 +11,13 @@ #include "base/compiler_specific.h" #include "ui/aura/client/capture_client.h" #include "ui/aura/window_observer.h" -#include "ui/views/views_export.h" +#include "ui/wm/core/wm_core_export.h" namespace views { namespace corewm { // Internal CaptureClient implementation. See ScopedCaptureClient for details. -class VIEWS_EXPORT CaptureController : public aura::client::CaptureClient { +class WM_CORE_EXPORT CaptureController : public aura::client::CaptureClient { public: // Adds |root| to the list of RootWindows notified when capture changes. void Attach(aura::Window* root); @@ -54,7 +54,7 @@ class VIEWS_EXPORT CaptureController : public aura::client::CaptureClient { // ScopedCaptureClient is responsible for creating a CaptureClient for a // RootWindow. Specifically it creates a single CaptureController that is shared // among all ScopedCaptureClients and adds the RootWindow to it. -class VIEWS_EXPORT ScopedCaptureClient : public aura::WindowObserver { +class WM_CORE_EXPORT ScopedCaptureClient : public aura::WindowObserver { public: explicit ScopedCaptureClient(aura::Window* root); virtual ~ScopedCaptureClient(); @@ -85,4 +85,4 @@ class VIEWS_EXPORT ScopedCaptureClient : public aura::WindowObserver { } // namespace corewm } // namespace views -#endif // UI_VIEWS_COREWM_CAPTURE_CONTROLLER_H_ +#endif // UI_WM_CORE_CAPTURE_CONTROLLER_H_ diff --git a/ui/views/corewm/compound_event_filter.cc b/ui/wm/core/compound_event_filter.cc index 0e5609f..a1eb7ef 100644 --- a/ui/views/corewm/compound_event_filter.cc +++ b/ui/wm/core/compound_event_filter.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/views/corewm/compound_event_filter.h" +#include "ui/wm/core/compound_event_filter.h" #include "base/containers/hash_tables.h" #include "base/logging.h" diff --git a/ui/views/corewm/compound_event_filter.h b/ui/wm/core/compound_event_filter.h index 7f724c3..a12e57b 100644 --- a/ui/views/corewm/compound_event_filter.h +++ b/ui/wm/core/compound_event_filter.h @@ -2,15 +2,15 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef UI_VIEWS_COREWM_COMPOUND_EVENT_FILTER_H_ -#define UI_VIEWS_COREWM_COMPOUND_EVENT_FILTER_H_ +#ifndef UI_WM_CORE_COMPOUND_EVENT_FILTER_H_ +#define UI_WM_CORE_COMPOUND_EVENT_FILTER_H_ #include "base/compiler_specific.h" #include "base/observer_list.h" #include "ui/events/event.h" #include "ui/events/event_handler.h" #include "ui/gfx/native_widget_types.h" -#include "ui/views/views_export.h" +#include "ui/wm/core/wm_core_export.h" namespace aura { class CursorManager; @@ -28,6 +28,8 @@ class TouchEvent; namespace views { namespace corewm { +// TODO(beng): This class should die. AddEventHandler() on the root Window +// should be used instead. // CompoundEventFilter gets all events first and can provide actions to those // events. It implements global features such as click to activate a window and // cursor change when moving mouse. @@ -36,7 +38,7 @@ namespace corewm { // consumed by any of those filters. If an event is consumed by a filter, the // rest of the filter(s) and CompoundEventFilter will not see the consumed // event. -class VIEWS_EXPORT CompoundEventFilter : public ui::EventHandler { +class WM_CORE_EXPORT CompoundEventFilter : public ui::EventHandler { public: CompoundEventFilter(); virtual ~CompoundEventFilter(); @@ -90,4 +92,4 @@ class VIEWS_EXPORT CompoundEventFilter : public ui::EventHandler { } // namespace corewm } // namespace views -#endif // UI_VIEWS_COREWM_COMPOUND_EVENT_FILTER_H_ +#endif // UI_WM_CORE_COMPOUND_EVENT_FILTER_H_ diff --git a/ui/views/corewm/compound_event_filter_unittest.cc b/ui/wm/core/compound_event_filter_unittest.cc index 6a00c93..0c73504 100644 --- a/ui/views/corewm/compound_event_filter_unittest.cc +++ b/ui/wm/core/compound_event_filter_unittest.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/views/corewm/compound_event_filter.h" +#include "ui/wm/core/compound_event_filter.h" #include "ui/aura/client/activation_client.h" #include "ui/aura/client/cursor_client.h" diff --git a/ui/views/corewm/cursor_manager.cc b/ui/wm/core/cursor_manager.cc index 2335fdd..9d1e2db 100644 --- a/ui/views/corewm/cursor_manager.cc +++ b/ui/wm/core/cursor_manager.cc @@ -2,12 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ui/views/corewm/cursor_manager.h" +#include "ui/wm/core/cursor_manager.h" #include "base/logging.h" #include "ui/aura/client/cursor_client_observer.h" -#include "ui/views/corewm/native_cursor_manager.h" -#include "ui/views/corewm/native_cursor_manager_delegate.h" +#include "ui/wm/core/native_cursor_manager.h" +#include "ui/wm/core/native_cursor_manager_delegate.h" namespace views { namespace corewm { diff --git a/ui/views/corewm/cursor_manager.h b/ui/wm/core/cursor_manager.h index 29f890a..1f96ebd 100644 --- a/ui/views/corewm/cursor_manager.h +++ b/ui/wm/core/cursor_manager.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_VIEWS_COREWM_CURSOR_MANAGER_H_ -#define UI_VIEWS_COREWM_CURSOR_MANAGER_H_ +#ifndef UI_WM_CORE_CURSOR_MANAGER_H_ +#define UI_WM_CORE_CURSOR_MANAGER_H_ #include "base/basictypes.h" #include "base/compiler_specific.h" @@ -13,8 +13,8 @@ #include "ui/base/cursor/cursor.h" #include "ui/gfx/native_widget_types.h" #include "ui/gfx/point.h" -#include "ui/views/corewm/native_cursor_manager_delegate.h" -#include "ui/views/views_export.h" +#include "ui/wm/core/native_cursor_manager_delegate.h" +#include "ui/wm/core/wm_core_export.h" namespace gfx { class Display; @@ -33,8 +33,8 @@ class NativeCursorManager; // requests to queue any further changes until a later time. It sends changes // to the NativeCursorManager, which communicates back to us when these changes // were made through the NativeCursorManagerDelegate interface. -class VIEWS_EXPORT CursorManager : public aura::client::CursorClient, - public NativeCursorManagerDelegate { +class WM_CORE_EXPORT CursorManager : public aura::client::CursorClient, + public NativeCursorManagerDelegate { public: CursorManager(scoped_ptr<NativeCursorManager> delegate); virtual ~CursorManager(); @@ -89,4 +89,4 @@ class VIEWS_EXPORT CursorManager : public aura::client::CursorClient, } // namespace corewm } // namespace views -#endif // UI_VIEWS_COREWM_CURSOR_MANAGER_H_ +#endif // UI_WM_CORE_CURSOR_MANAGER_H_ diff --git a/ui/views/corewm/cursor_manager_unittest.cc b/ui/wm/core/cursor_manager_unittest.cc index 3e6d723..f9fa087 100644 --- a/ui/views/corewm/cursor_manager_unittest.cc +++ b/ui/wm/core/cursor_manager_unittest.cc @@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ui/views/corewm/cursor_manager.h" +#include "ui/wm/core/cursor_manager.h" #include "ui/aura/client/cursor_client_observer.h" #include "ui/aura/test/aura_test_base.h" -#include "ui/views/corewm/native_cursor_manager.h" +#include "ui/wm/core/native_cursor_manager.h" namespace { diff --git a/ui/views/corewm/focus_controller.cc b/ui/wm/core/focus_controller.cc index a3107a1..197e04a 100644 --- a/ui/views/corewm/focus_controller.cc +++ b/ui/wm/core/focus_controller.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/views/corewm/focus_controller.h" +#include "ui/wm/core/focus_controller.h" #include "base/auto_reset.h" #include "ui/aura/client/activation_change_observer.h" @@ -12,8 +12,8 @@ #include "ui/aura/env.h" #include "ui/aura/window_tracker.h" #include "ui/events/event.h" -#include "ui/views/corewm/focus_rules.h" -#include "ui/views/corewm/window_util.h" +#include "ui/wm/core/focus_rules.h" +#include "ui/wm/core/window_util.h" namespace views { namespace corewm { diff --git a/ui/views/corewm/focus_controller.h b/ui/wm/core/focus_controller.h index 1dc69b7..9e46ec7 100644 --- a/ui/views/corewm/focus_controller.h +++ b/ui/wm/core/focus_controller.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_VIEWS_COREWM_FOCUS_CONTROLLER_H_ -#define UI_VIEWS_COREWM_FOCUS_CONTROLLER_H_ +#ifndef UI_WM_CORE_FOCUS_CONTROLLER_H_ +#define UI_WM_CORE_FOCUS_CONTROLLER_H_ #include "base/compiler_specific.h" #include "base/memory/scoped_ptr.h" @@ -13,7 +13,7 @@ #include "ui/aura/client/focus_client.h" #include "ui/aura/window_observer.h" #include "ui/events/event_handler.h" -#include "ui/views/views_export.h" +#include "ui/wm/core/wm_core_export.h" namespace views { namespace corewm { @@ -35,10 +35,10 @@ class FocusRules; // . Window disposition changes (implemented here in aura::WindowObserver). // (The FocusController registers itself as an observer of the active and // focused windows). -class VIEWS_EXPORT FocusController : public aura::client::ActivationClient, - public aura::client::FocusClient, - public ui::EventHandler, - public aura::WindowObserver { +class WM_CORE_EXPORT FocusController : public aura::client::ActivationClient, + public aura::client::FocusClient, + public ui::EventHandler, + public aura::WindowObserver { public: // |rules| cannot be NULL. explicit FocusController(FocusRules* rules); @@ -127,4 +127,4 @@ class VIEWS_EXPORT FocusController : public aura::client::ActivationClient, } // namespace corewm } // namespace views -#endif // UI_VIEWS_COREWM_FOCUS_CONTROLLER_H_ +#endif // UI_WM_CORE_FOCUS_CONTROLLER_H_ diff --git a/ui/views/corewm/focus_controller_unittest.cc b/ui/wm/core/focus_controller_unittest.cc index c845592..0dd9791 100644 --- a/ui/views/corewm/focus_controller_unittest.cc +++ b/ui/wm/core/focus_controller_unittest.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/views/corewm/focus_controller.h" +#include "ui/wm/core/focus_controller.h" #include <map> @@ -19,8 +19,8 @@ #include "ui/aura/window_event_dispatcher.h" #include "ui/aura/window_tracker.h" #include "ui/events/event_handler.h" -#include "ui/views/corewm/base_focus_rules.h" -#include "ui/views/corewm/wm_state.h" +#include "ui/wm/core/base_focus_rules.h" +#include "ui/wm/core/wm_state.h" namespace views { namespace corewm { diff --git a/ui/views/corewm/focus_rules.h b/ui/wm/core/focus_rules.h index 559a238..68cd7c4 100644 --- a/ui/views/corewm/focus_rules.h +++ b/ui/wm/core/focus_rules.h @@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef UI_VIEWS_COREWM_FOCUS_RULES_H_ -#define UI_VIEWS_COREWM_FOCUS_RULES_H_ +#ifndef UI_WM_CORE_FOCUS_RULES_H_ +#define UI_WM_CORE_FOCUS_RULES_H_ -#include "ui/views/views_export.h" +#include "ui/wm/core/wm_core_export.h" namespace aura { class Window; @@ -16,7 +16,7 @@ namespace corewm { // Implemented by an object that establishes the rules about what can be // focused or activated. -class VIEWS_EXPORT FocusRules { +class WM_CORE_EXPORT FocusRules { public: virtual ~FocusRules() {} @@ -65,4 +65,4 @@ class VIEWS_EXPORT FocusRules { } // namespace corewm } // namespace views -#endif // UI_VIEWS_COREWM_FOCUS_RULES_H_ +#endif // UI_WM_CORE_FOCUS_RULES_H_ diff --git a/ui/views/corewm/image_grid.cc b/ui/wm/core/image_grid.cc index 29c7757..4650a9f 100644 --- a/ui/views/corewm/image_grid.cc +++ b/ui/wm/core/image_grid.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/views/corewm/image_grid.h" +#include "ui/wm/core/image_grid.h" #include <algorithm> diff --git a/ui/views/corewm/image_grid.h b/ui/wm/core/image_grid.h index 51b1b56..0547157 100644 --- a/ui/views/corewm/image_grid.h +++ b/ui/wm/core/image_grid.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_VIEWS_COREWM_IMAGE_GRID_H_ -#define UI_VIEWS_COREWM_IMAGE_GRID_H_ +#ifndef UI_WM_CORE_IMAGE_GRID_H_ +#define UI_WM_CORE_IMAGE_GRID_H_ #include "base/basictypes.h" #include "base/gtest_prod_util.h" @@ -12,7 +12,7 @@ #include "ui/compositor/layer_delegate.h" #include "ui/gfx/rect.h" #include "ui/gfx/size.h" -#include "ui/views/views_export.h" +#include "ui/wm/core/wm_core_export.h" namespace gfx { class Image; @@ -57,10 +57,10 @@ namespace corewm { // | xXX| // ... // -class VIEWS_EXPORT ImageGrid { +class WM_CORE_EXPORT ImageGrid { public: // Helper class for use by tests. - class VIEWS_EXPORT TestAPI { + class WM_CORE_EXPORT TestAPI { public: TestAPI(ImageGrid* grid) : grid_(grid) {} @@ -225,4 +225,4 @@ class VIEWS_EXPORT ImageGrid { } // namespace corewm } // namespace views -#endif // UI_VIEWS_COREWM_IMAGE_GRID_H_ +#endif // UI_WM_CORE_IMAGE_GRID_H_ diff --git a/ui/views/corewm/image_grid_unittest.cc b/ui/wm/core/image_grid_unittest.cc index 61e1dda..82fa4e3 100644 --- a/ui/views/corewm/image_grid_unittest.cc +++ b/ui/wm/core/image_grid_unittest.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/views/corewm/image_grid.h" +#include "ui/wm/core/image_grid.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/skia/include/core/SkBitmap.h" diff --git a/ui/views/corewm/input_method_event_filter.cc b/ui/wm/core/input_method_event_filter.cc index 56b1940..d97bf03 100644 --- a/ui/views/corewm/input_method_event_filter.cc +++ b/ui/wm/core/input_method_event_filter.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/views/corewm/input_method_event_filter.h" +#include "ui/wm/core/input_method_event_filter.h" #include "ui/aura/client/aura_constants.h" #include "ui/aura/window_event_dispatcher.h" diff --git a/ui/views/corewm/input_method_event_filter.h b/ui/wm/core/input_method_event_filter.h index 8327bf1..9ed5216 100644 --- a/ui/views/corewm/input_method_event_filter.h +++ b/ui/wm/core/input_method_event_filter.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_VIEWS_COREWM_INPUT_METHOD_EVENT_FILTER_H_ -#define UI_VIEWS_COREWM_INPUT_METHOD_EVENT_FILTER_H_ +#ifndef UI_WM_CORE_INPUT_METHOD_EVENT_FILTER_H_ +#define UI_WM_CORE_INPUT_METHOD_EVENT_FILTER_H_ #include "base/compiler_specific.h" #include "base/macros.h" @@ -11,7 +11,7 @@ #include "ui/base/ime/input_method_delegate.h" #include "ui/events/event_handler.h" #include "ui/gfx/native_widget_types.h" -#include "ui/views/views_export.h" +#include "ui/wm/core/wm_core_export.h" namespace ui { class EventProcessor; @@ -23,7 +23,7 @@ namespace corewm { // An event filter that forwards a KeyEvent to a system IME, and dispatches a // TranslatedKeyEvent to the root window as needed. -class VIEWS_EXPORT InputMethodEventFilter +class WM_CORE_EXPORT InputMethodEventFilter : public ui::EventHandler, public ui::internal::InputMethodDelegate { public: @@ -52,4 +52,4 @@ class VIEWS_EXPORT InputMethodEventFilter } // namespace corewm } // namespace views -#endif // UI_VIEWS_COREWM_INPUT_METHOD_EVENT_FILTER_H_ +#endif // UI_WM_CORE_INPUT_METHOD_EVENT_FILTER_H_ diff --git a/ui/views/corewm/input_method_event_filter_unittest.cc b/ui/wm/core/input_method_event_filter_unittest.cc index 78abb75..ef1a847 100644 --- a/ui/views/corewm/input_method_event_filter_unittest.cc +++ b/ui/wm/core/input_method_event_filter_unittest.cc @@ -2,17 +2,17 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ui/views/corewm/input_method_event_filter.h" +#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/window_event_dispatcher.h" -#include "ui/views/corewm/compound_event_filter.h" #include "ui/aura/test/aura_test_base.h" #include "ui/aura/test/event_generator.h" #include "ui/aura/test/test_event_handler.h" #include "ui/aura/test/test_windows.h" +#include "ui/aura/window_event_dispatcher.h" +#include "ui/wm/core/compound_event_filter.h" #if !defined(OS_WIN) && !defined(USE_X11) // On platforms except Windows and X11, aura::test::EventGenerator::PressKey diff --git a/ui/views/corewm/native_cursor_manager.h b/ui/wm/core/native_cursor_manager.h index 75e4c85..def5c96 100644 --- a/ui/views/corewm/native_cursor_manager.h +++ b/ui/wm/core/native_cursor_manager.h @@ -2,12 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef UI_VIEWS_COREWM_NATIVE_CURSOR_MANAGER_H_ -#define UI_VIEWS_COREWM_NATIVE_CURSOR_MANAGER_H_ +#ifndef UI_WM_CORE_NATIVE_CURSOR_MANAGER_H_ +#define UI_WM_CORE_NATIVE_CURSOR_MANAGER_H_ #include "base/strings/string16.h" -#include "ui/views/corewm/native_cursor_manager_delegate.h" -#include "ui/views/views_export.h" +#include "ui/wm/core/native_cursor_manager_delegate.h" +#include "ui/wm/core/wm_core_export.h" namespace gfx { class Display; @@ -20,7 +20,7 @@ namespace corewm { // requested changes to cursor state. When requested, implementer should tell // the CursorManager of any actual state changes performed through the // delegate. -class VIEWS_EXPORT NativeCursorManager { +class WM_CORE_EXPORT NativeCursorManager { public: virtual ~NativeCursorManager() {} @@ -64,4 +64,4 @@ class VIEWS_EXPORT NativeCursorManager { } // namespace corewm } // namespace views -#endif // UI_VIEWS_COREWM_NATIVE_CURSOR_MANAGER_H_ +#endif // UI_WM_CORE_NATIVE_CURSOR_MANAGER_H_ diff --git a/ui/views/corewm/native_cursor_manager_delegate.h b/ui/wm/core/native_cursor_manager_delegate.h index 491ab47..c147700 100644 --- a/ui/views/corewm/native_cursor_manager_delegate.h +++ b/ui/wm/core/native_cursor_manager_delegate.h @@ -2,12 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef UI_VIEWS_COREWM_NATIVE_CURSOR_MANAGER_DELEGATE_H_ -#define UI_VIEWS_COREWM_NATIVE_CURSOR_MANAGER_DELEGATE_H_ +#ifndef UI_WM_CORE_NATIVE_CURSOR_MANAGER_DELEGATE_H_ +#define UI_WM_CORE_NATIVE_CURSOR_MANAGER_DELEGATE_H_ #include "ui/base/cursor/cursor.h" #include "ui/gfx/native_widget_types.h" -#include "ui/views/views_export.h" +#include "ui/wm/core/wm_core_export.h" namespace views { namespace corewm { @@ -15,7 +15,7 @@ namespace corewm { // The non-public interface that CursorManager exposes to its users. This // gives accessors to all the current state, and mutators to all the current // state. -class VIEWS_EXPORT NativeCursorManagerDelegate { +class WM_CORE_EXPORT NativeCursorManagerDelegate { public: virtual ~NativeCursorManagerDelegate() {} @@ -33,4 +33,4 @@ class VIEWS_EXPORT NativeCursorManagerDelegate { } // namespace corewm } // namespace views -#endif // UI_VIEWS_COREWM_NATIVE_CURSOR_MANAGER_DELEGATE_H_ +#endif // UI_WM_CORE_NATIVE_CURSOR_MANAGER_DELEGATE_H_ diff --git a/ui/views/corewm/shadow.cc b/ui/wm/core/shadow.cc index 4411c8d56..fb2d940 100644 --- a/ui/views/corewm/shadow.cc +++ b/ui/wm/core/shadow.cc @@ -2,12 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ui/views/corewm/shadow.h" +#include "ui/wm/core/shadow.h" #include "grit/ui_resources.h" #include "ui/base/resource/resource_bundle.h" #include "ui/compositor/scoped_layer_animation_settings.h" -#include "ui/views/corewm/image_grid.h" +#include "ui/wm/core/image_grid.h" namespace { diff --git a/ui/views/corewm/shadow.h b/ui/wm/core/shadow.h index 794ba3d..0513782 100644 --- a/ui/views/corewm/shadow.h +++ b/ui/wm/core/shadow.h @@ -2,14 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef UI_VIEWS_COREWM_SHADOW_H_ -#define UI_VIEWS_COREWM_SHADOW_H_ +#ifndef UI_WM_CORE_SHADOW_H_ +#define UI_WM_CORE_SHADOW_H_ #include "base/basictypes.h" #include "base/memory/scoped_ptr.h" #include "ui/compositor/layer_animation_observer.h" #include "ui/gfx/rect.h" -#include "ui/views/views_export.h" +#include "ui/wm/core/wm_core_export.h" namespace ui { class Layer; @@ -21,7 +21,7 @@ namespace corewm { class ImageGrid; // Simple class that draws a drop shadow around content at given bounds. -class VIEWS_EXPORT Shadow : public ui::ImplicitAnimationObserver { +class WM_CORE_EXPORT Shadow : public ui::ImplicitAnimationObserver { public: enum Style { // Active windows have more opaque shadows, shifted down to make the window @@ -85,4 +85,4 @@ class VIEWS_EXPORT Shadow : public ui::ImplicitAnimationObserver { } // namespace corewm } // namespace views -#endif // UI_VIEWS_COREWM_SHADOW_H_ +#endif // UI_WM_CORE_SHADOW_H_ diff --git a/ui/views/corewm/shadow_controller.cc b/ui/wm/core/shadow_controller.cc index 2ec2f15..5dcc942 100644 --- a/ui/views/corewm/shadow_controller.cc +++ b/ui/wm/core/shadow_controller.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/views/corewm/shadow_controller.h" +#include "ui/wm/core/shadow_controller.h" #include <utility> @@ -17,9 +17,9 @@ #include "ui/aura/window_event_dispatcher.h" #include "ui/aura/window_observer.h" #include "ui/compositor/layer.h" -#include "ui/views/corewm/shadow.h" -#include "ui/views/corewm/shadow_types.h" -#include "ui/views/corewm/window_util.h" +#include "ui/wm/core/shadow.h" +#include "ui/wm/core/shadow_types.h" +#include "ui/wm/core/window_util.h" using std::make_pair; diff --git a/ui/views/corewm/shadow_controller.h b/ui/wm/core/shadow_controller.h index 2a7e29c..3f3d1d9 100644 --- a/ui/views/corewm/shadow_controller.h +++ b/ui/wm/core/shadow_controller.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_VIEWS_COREWM_SHADOW_CONTROLLER_H_ -#define UI_VIEWS_COREWM_SHADOW_CONTROLLER_H_ +#ifndef UI_WM_CORE_SHADOW_CONTROLLER_H_ +#define UI_WM_CORE_SHADOW_CONTROLLER_H_ #include <map> @@ -11,7 +11,7 @@ #include "base/compiler_specific.h" #include "base/memory/ref_counted.h" #include "ui/aura/client/activation_change_observer.h" -#include "ui/views/views_export.h" +#include "ui/wm/core/wm_core_export.h" namespace aura { class Window; @@ -32,10 +32,10 @@ class Shadow; // shadows as needed. ShadowController itself is light weight and per // ActivationClient. ShadowController delegates to its implementation class, // which observes all window creation. -class VIEWS_EXPORT ShadowController : +class WM_CORE_EXPORT ShadowController : public aura::client::ActivationChangeObserver { public: - class VIEWS_EXPORT TestApi { + class WM_CORE_EXPORT TestApi { public: explicit TestApi(ShadowController* controller) : controller_(controller) {} ~TestApi() {} @@ -68,4 +68,4 @@ class VIEWS_EXPORT ShadowController : } // namespace corewm } // namespace views -#endif // UI_VIEWS_COREWM_SHADOW_CONTROLLER_H_ +#endif // UI_WM_CORE_SHADOW_CONTROLLER_H_ diff --git a/ui/views/corewm/shadow_controller_unittest.cc b/ui/wm/core/shadow_controller_unittest.cc index a21c057..057f2b2 100644 --- a/ui/views/corewm/shadow_controller_unittest.cc +++ b/ui/wm/core/shadow_controller_unittest.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/views/corewm/shadow_controller.h" +#include "ui/wm/core/shadow_controller.h" #include <algorithm> #include <vector> @@ -14,10 +14,10 @@ #include "ui/aura/window.h" #include "ui/aura/window_event_dispatcher.h" #include "ui/compositor/layer.h" -#include "ui/views/corewm/shadow.h" -#include "ui/views/corewm/shadow_types.h" -#include "ui/views/corewm/window_util.h" -#include "ui/views/corewm/wm_state.h" +#include "ui/wm/core/shadow.h" +#include "ui/wm/core/shadow_types.h" +#include "ui/wm/core/window_util.h" +#include "ui/wm/core/wm_state.h" namespace views { namespace corewm { diff --git a/ui/views/corewm/shadow_types.cc b/ui/wm/core/shadow_types.cc index 1e3a937..c6a590d7 100644 --- a/ui/views/corewm/shadow_types.cc +++ b/ui/wm/core/shadow_types.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/views/corewm/shadow_types.h" +#include "ui/wm/core/shadow_types.h" #include "ui/aura/window_property.h" diff --git a/ui/views/corewm/shadow_types.h b/ui/wm/core/shadow_types.h index 046ad70..235b48f 100644 --- a/ui/views/corewm/shadow_types.h +++ b/ui/wm/core/shadow_types.h @@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef UI_VIEWS_COREWM_SHADOW_TYPES_H_ -#define UI_VIEWS_COREWM_SHADOW_TYPES_H_ +#ifndef UI_WM_CORE_SHADOW_TYPES_H_ +#define UI_WM_CORE_SHADOW_TYPES_H_ #include "ui/aura/window.h" -#include "ui/views/views_export.h" +#include "ui/wm/core/wm_core_export.h" namespace aura { class Window; @@ -23,8 +23,8 @@ enum ShadowType { SHADOW_TYPE_RECTANGULAR, }; -VIEWS_EXPORT void SetShadowType(aura::Window* window, ShadowType shadow_type); -VIEWS_EXPORT ShadowType GetShadowType(aura::Window* window); +WM_CORE_EXPORT void SetShadowType(aura::Window* window, ShadowType shadow_type); +WM_CORE_EXPORT ShadowType GetShadowType(aura::Window* window); // A property key describing the drop shadow that should be displayed under the // window. If unset, no shadow is displayed. @@ -33,4 +33,4 @@ extern const aura::WindowProperty<ShadowType>* const kShadowTypeKey; } // namespace corewm } // namespace views -#endif // UI_VIEWS_COREWM_SHADOW_TYPES_H_ +#endif // UI_WM_CORE_SHADOW_TYPES_H_ diff --git a/ui/views/corewm/transient_window_controller.cc b/ui/wm/core/transient_window_controller.cc index 13a5b1f..c0fbce1 100644 --- a/ui/views/corewm/transient_window_controller.cc +++ b/ui/wm/core/transient_window_controller.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/views/corewm/transient_window_controller.h" +#include "ui/wm/core/transient_window_controller.h" -#include "ui/views/corewm/transient_window_manager.h" +#include "ui/wm/core/transient_window_manager.h" namespace views { namespace corewm { diff --git a/ui/views/corewm/transient_window_controller.h b/ui/wm/core/transient_window_controller.h index 88d473d..01a8de2 100644 --- a/ui/views/corewm/transient_window_controller.h +++ b/ui/wm/core/transient_window_controller.h @@ -2,18 +2,18 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef UI_VIEWS_COREWM_TRANSIENT_WINDOW_CONTROLLER_H_ -#define UI_VIEWS_COREWM_TRANSIENT_WINDOW_CONTROLLER_H_ +#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/views/views_export.h" +#include "ui/wm/core/wm_core_export.h" namespace views { namespace corewm { // TransientWindowClient implementation. Uses TransientWindowManager to handle // tracking transient per window. -class VIEWS_EXPORT TransientWindowController +class WM_CORE_EXPORT TransientWindowController : public aura::client::TransientWindowClient { public: TransientWindowController(); @@ -35,4 +35,4 @@ class VIEWS_EXPORT TransientWindowController } // namespace corewm } // namespace views -#endif // UI_VIEWS_COREWM_TRANSIENT_WINDOW_CONTROLLER_H_ +#endif // UI_WM_CORE_TRANSIENT_WINDOW_CONTROLLER_H_ diff --git a/ui/views/corewm/transient_window_manager.cc b/ui/wm/core/transient_window_manager.cc index 4de6861..eb67bd3 100644 --- a/ui/views/corewm/transient_window_manager.cc +++ b/ui/wm/core/transient_window_manager.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/views/corewm/transient_window_manager.h" +#include "ui/wm/core/transient_window_manager.h" #include <algorithm> #include <functional> @@ -11,9 +11,9 @@ #include "base/stl_util.h" #include "ui/aura/window.h" #include "ui/aura/window_property.h" -#include "ui/views/corewm/transient_window_observer.h" -#include "ui/views/corewm/transient_window_stacking_client.h" -#include "ui/views/corewm/window_util.h" +#include "ui/wm/core/transient_window_observer.h" +#include "ui/wm/core/transient_window_stacking_client.h" +#include "ui/wm/core/window_util.h" using aura::Window; diff --git a/ui/views/corewm/transient_window_manager.h b/ui/wm/core/transient_window_manager.h index 93404dd..bd4ef02 100644 --- a/ui/views/corewm/transient_window_manager.h +++ b/ui/wm/core/transient_window_manager.h @@ -2,14 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef UI_VIEWS_COREWM_TRANSIENT_WINDOW_MANAGER_H_ -#define UI_VIEWS_COREWM_TRANSIENT_WINDOW_MANAGER_H_ +#ifndef UI_WM_CORE_TRANSIENT_WINDOW_MANAGER_H_ +#define UI_WM_CORE_TRANSIENT_WINDOW_MANAGER_H_ #include <vector> #include "base/observer_list.h" #include "ui/aura/window_observer.h" -#include "ui/views/views_export.h" +#include "ui/wm/core/wm_core_export.h" namespace views { namespace corewm { @@ -27,7 +27,7 @@ class TransientWindowObserver; // Transient windows are typically used for popups and menus. // TODO(sky): when we nuke TransientWindowClient rename this to // TransientWindowController. -class VIEWS_EXPORT TransientWindowManager : public aura::WindowObserver { +class WM_CORE_EXPORT TransientWindowManager : public aura::WindowObserver { public: typedef std::vector<aura::Window*> Windows; @@ -101,4 +101,4 @@ class VIEWS_EXPORT TransientWindowManager : public aura::WindowObserver { } // namespace corewm } // namespace views -#endif // UI_VIEWS_COREWM_TRANSIENT_WINDOW_MANAGER_H_ +#endif // UI_WM_CORE_TRANSIENT_WINDOW_MANAGER_H_ diff --git a/ui/views/corewm/transient_window_manager_unittest.cc b/ui/wm/core/transient_window_manager_unittest.cc index 20d57c2..c344552 100644 --- a/ui/views/corewm/transient_window_manager_unittest.cc +++ b/ui/wm/core/transient_window_manager_unittest.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/views/corewm/transient_window_manager.h" +#include "ui/wm/core/transient_window_manager.h" #include "ui/aura/client/visibility_client.h" #include "ui/aura/client/window_tree_client.h" @@ -10,9 +10,9 @@ #include "ui/aura/test/aura_test_base.h" #include "ui/aura/test/test_windows.h" #include "ui/aura/window.h" -#include "ui/views/corewm/transient_window_observer.h" -#include "ui/views/corewm/window_util.h" -#include "ui/views/corewm/wm_state.h" +#include "ui/wm/core/transient_window_observer.h" +#include "ui/wm/core/window_util.h" +#include "ui/wm/core/wm_state.h" using aura::Window; diff --git a/ui/views/corewm/transient_window_observer.h b/ui/wm/core/transient_window_observer.h index f00a6fa..0f7df7c 100644 --- a/ui/views/corewm/transient_window_observer.h +++ b/ui/wm/core/transient_window_observer.h @@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef UI_VIEWS_COREWM_TRANSIENT_WINDOW_OBSERVER_H_ -#define UI_VIEWS_COREWM_TRANSIENT_WINDOW_OBSERVER_H_ +#ifndef UI_WM_CORE_TRANSIENT_WINDOW_OBSERVER_H_ +#define UI_WM_CORE_TRANSIENT_WINDOW_OBSERVER_H_ -#include "ui/views/views_export.h" +#include "ui/wm/core/wm_core_export.h" namespace aura { class Window; @@ -14,7 +14,7 @@ class Window; namespace views { namespace corewm { -class VIEWS_EXPORT TransientWindowObserver { +class WM_CORE_EXPORT TransientWindowObserver { public: // Called when a transient child is added to |window|. virtual void OnTransientChildAdded(aura::Window* window, @@ -31,4 +31,4 @@ class VIEWS_EXPORT TransientWindowObserver { } // namespace corewm } // namespace views -#endif // UI_VIEWS_COREWM_TRANSIENT_WINDOW_OBSERVER_H_ +#endif // UI_WM_CORE_TRANSIENT_WINDOW_OBSERVER_H_ diff --git a/ui/views/corewm/transient_window_stacking_client.cc b/ui/wm/core/transient_window_stacking_client.cc index 303c502..c217bea 100644 --- a/ui/views/corewm/transient_window_stacking_client.cc +++ b/ui/wm/core/transient_window_stacking_client.cc @@ -2,12 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ui/views/corewm/transient_window_stacking_client.h" +#include "ui/wm/core/transient_window_stacking_client.h" #include <algorithm> -#include "ui/views/corewm/transient_window_manager.h" -#include "ui/views/corewm/window_util.h" +#include "ui/wm/core/transient_window_manager.h" +#include "ui/wm/core/window_util.h" using aura::Window; diff --git a/ui/views/corewm/transient_window_stacking_client.h b/ui/wm/core/transient_window_stacking_client.h index 04e0eaf..8384b3f 100644 --- a/ui/views/corewm/transient_window_stacking_client.h +++ b/ui/wm/core/transient_window_stacking_client.h @@ -2,18 +2,18 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef UI_VIEWS_COREWM_TRANSIENT_WINDOW_STACKING_CLIENT_H_ -#define UI_VIEWS_COREWM_TRANSIENT_WINDOW_STACKING_CLIENT_H_ +#ifndef UI_WM_CORE_TRANSIENT_WINDOW_STACKING_CLIENT_H_ +#define UI_WM_CORE_TRANSIENT_WINDOW_STACKING_CLIENT_H_ #include "ui/aura/client/window_stacking_client.h" -#include "ui/views/views_export.h" +#include "ui/wm/core/wm_core_export.h" namespace views { namespace corewm { class TransientWindowManager; -class VIEWS_EXPORT TransientWindowStackingClient +class WM_CORE_EXPORT TransientWindowStackingClient : public aura::client::WindowStackingClient { public: TransientWindowStackingClient(); @@ -36,4 +36,4 @@ class VIEWS_EXPORT TransientWindowStackingClient } // namespace corewm } // namespace views -#endif // UI_VIEWS_COREWM_TRANSIENT_WINDOW_STACKING_CLIENT_H_ +#endif // UI_WM_CORE_TRANSIENT_WINDOW_STACKING_CLIENT_H_ diff --git a/ui/views/corewm/transient_window_stacking_client_unittest.cc b/ui/wm/core/transient_window_stacking_client_unittest.cc index c4570b7..c05520b 100644 --- a/ui/views/corewm/transient_window_stacking_client_unittest.cc +++ b/ui/wm/core/transient_window_stacking_client_unittest.cc @@ -2,13 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ui/views/corewm/transient_window_stacking_client.h" +#include "ui/wm/core/transient_window_stacking_client.h" #include "base/memory/scoped_ptr.h" #include "ui/aura/test/aura_test_base.h" #include "ui/aura/test/test_windows.h" #include "ui/compositor/test/test_layers.h" -#include "ui/views/corewm/window_util.h" +#include "ui/wm/core/window_util.h" using aura::test::ChildWindowIDsAsString; using aura::test::CreateTestWindowWithId; diff --git a/ui/views/corewm/visibility_controller.cc b/ui/wm/core/visibility_controller.cc index c34f4f3..6f0931d 100644 --- a/ui/views/corewm/visibility_controller.cc +++ b/ui/wm/core/visibility_controller.cc @@ -2,12 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ui/views/corewm/visibility_controller.h" +#include "ui/wm/core/visibility_controller.h" #include "ui/aura/window.h" #include "ui/aura/window_property.h" #include "ui/compositor/layer.h" -#include "ui/views/corewm/window_animations.h" +#include "ui/wm/core/window_animations.h" namespace views { namespace corewm { diff --git a/ui/views/corewm/visibility_controller.h b/ui/wm/core/visibility_controller.h index ec48982..3a08aa3 100644 --- a/ui/views/corewm/visibility_controller.h +++ b/ui/wm/core/visibility_controller.h @@ -2,18 +2,18 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef UI_VIEWS_COREWM_VISIBILITY_CONTROLLER_H_ -#define UI_VIEWS_COREWM_VISIBILITY_CONTROLLER_H_ +#ifndef UI_WM_CORE_VISIBILITY_CONTROLLER_H_ +#define UI_WM_CORE_VISIBILITY_CONTROLLER_H_ #include "base/compiler_specific.h" #include "base/logging.h" #include "ui/aura/client/visibility_client.h" -#include "ui/views/views_export.h" +#include "ui/wm/core/wm_core_export.h" namespace views { namespace corewm { -class VIEWS_EXPORT VisibilityController +class WM_CORE_EXPORT VisibilityController : public aura::client::VisibilityClient { public: VisibilityController(); @@ -48,7 +48,7 @@ class VIEWS_EXPORT VisibilityController // // previous state. // } // -class VIEWS_EXPORT SuspendChildWindowVisibilityAnimations { +class WM_CORE_EXPORT SuspendChildWindowVisibilityAnimations { public: // Suspend visibility animations of child windows. explicit SuspendChildWindowVisibilityAnimations(aura::Window* window); @@ -67,9 +67,10 @@ class VIEWS_EXPORT SuspendChildWindowVisibilityAnimations { }; // Tells |window| to animate visibility changes to its children. -void VIEWS_EXPORT SetChildWindowVisibilityChangesAnimated(aura::Window* window); +void WM_CORE_EXPORT SetChildWindowVisibilityChangesAnimated( + aura::Window* window); } // namespace corewm } // namespace views -#endif // UI_VIEWS_COREWM_VISIBILITY_CONTROLLER_H_ +#endif // UI_WM_CORE_VISIBILITY_CONTROLLER_H_ diff --git a/ui/views/corewm/visibility_controller_unittest.cc b/ui/wm/core/visibility_controller_unittest.cc index 5439bca..ac0244c 100644 --- a/ui/views/corewm/visibility_controller_unittest.cc +++ b/ui/wm/core/visibility_controller_unittest.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/views/corewm/visibility_controller.h" +#include "ui/wm/core/visibility_controller.h" #include "ui/aura/test/aura_test_base.h" #include "ui/aura/test/test_window_delegate.h" diff --git a/ui/views/corewm/window_animations.cc b/ui/wm/core/window_animations.cc index 42b2641..feccce3 100644 --- a/ui/views/corewm/window_animations.cc +++ b/ui/wm/core/window_animations.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/views/corewm/window_animations.h" +#include "ui/wm/core/window_animations.h" #include <math.h> @@ -33,14 +33,14 @@ #include "ui/gfx/screen.h" #include "ui/gfx/vector2d.h" #include "ui/gfx/vector3d_f.h" -#include "ui/views/corewm/corewm_switches.h" -#include "ui/views/corewm/window_util.h" +#include "ui/wm/core/window_util.h" +#include "ui/wm/core/wm_core_switches.h" DECLARE_WINDOW_PROPERTY_TYPE(int) DECLARE_WINDOW_PROPERTY_TYPE(views::corewm::WindowVisibilityAnimationType) DECLARE_WINDOW_PROPERTY_TYPE(views::corewm::WindowVisibilityAnimationTransition) DECLARE_WINDOW_PROPERTY_TYPE(float) -DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(VIEWS_EXPORT, bool) +DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(WM_CORE_EXPORT, bool) using aura::Window; using base::TimeDelta; diff --git a/ui/views/corewm/window_animations.h b/ui/wm/core/window_animations.h index f5728e6..2c7997d 100644 --- a/ui/views/corewm/window_animations.h +++ b/ui/wm/core/window_animations.h @@ -2,12 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef UI_VIEWS_COREWM_WINDOW_ANIMATIONS_H_ -#define UI_VIEWS_COREWM_WINDOW_ANIMATIONS_H_ +#ifndef UI_WM_CORE_WINDOW_ANIMATIONS_H_ +#define UI_WM_CORE_WINDOW_ANIMATIONS_H_ #include <vector> -#include "ui/views/views_export.h" +#include "ui/wm/core/wm_core_export.h" namespace aura { class Window; @@ -58,26 +58,26 @@ enum WindowVisibilityAnimationTransition { // These two methods use int for type rather than WindowVisibilityAnimationType // since downstream libraries can extend the set of animations. -VIEWS_EXPORT void SetWindowVisibilityAnimationType(aura::Window* window, - int type); -VIEWS_EXPORT int GetWindowVisibilityAnimationType(aura::Window* window); +WM_CORE_EXPORT void SetWindowVisibilityAnimationType(aura::Window* window, + int type); +WM_CORE_EXPORT int GetWindowVisibilityAnimationType(aura::Window* window); -VIEWS_EXPORT void SetWindowVisibilityAnimationTransition( +WM_CORE_EXPORT void SetWindowVisibilityAnimationTransition( aura::Window* window, WindowVisibilityAnimationTransition transition); -VIEWS_EXPORT bool HasWindowVisibilityAnimationTransition( +WM_CORE_EXPORT bool HasWindowVisibilityAnimationTransition( aura::Window* window, WindowVisibilityAnimationTransition transition); -VIEWS_EXPORT void SetWindowVisibilityAnimationDuration( +WM_CORE_EXPORT void SetWindowVisibilityAnimationDuration( aura::Window* window, const base::TimeDelta& duration); -VIEWS_EXPORT base::TimeDelta GetWindowVisibilityAnimationDuration( +WM_CORE_EXPORT base::TimeDelta GetWindowVisibilityAnimationDuration( const aura::Window& window); -VIEWS_EXPORT void SetWindowVisibilityAnimationVerticalPosition( +WM_CORE_EXPORT void SetWindowVisibilityAnimationVerticalPosition( aura::Window* window, float position); @@ -85,20 +85,21 @@ VIEWS_EXPORT void SetWindowVisibilityAnimationVerticalPosition( // associated with a Window so that the animation can continue after the Window // has been destroyed. // The returned object deletes itself when the animations are done. -VIEWS_EXPORT ui::ImplicitAnimationObserver* CreateHidingWindowAnimationObserver( - aura::Window* window); +WM_CORE_EXPORT ui::ImplicitAnimationObserver* + CreateHidingWindowAnimationObserver(aura::Window* window); // Returns false if the |window| didn't animate. -VIEWS_EXPORT bool AnimateOnChildWindowVisibilityChanged(aura::Window* window, - bool visible); -VIEWS_EXPORT bool AnimateWindow(aura::Window* window, WindowAnimationType type); +WM_CORE_EXPORT bool AnimateOnChildWindowVisibilityChanged(aura::Window* window, + bool visible); +WM_CORE_EXPORT bool AnimateWindow(aura::Window* window, + WindowAnimationType type); // Returns true if window animations are disabled for |window|. Window // animations are enabled by default. If |window| is NULL, this just checks // if the global flag disabling window animations is present. -VIEWS_EXPORT bool WindowAnimationsDisabled(aura::Window* window); +WM_CORE_EXPORT bool WindowAnimationsDisabled(aura::Window* window); } // namespace corewm } // namespace views -#endif // UI_VIEWS_COREWM_WINDOW_ANIMATIONS_H_ +#endif // UI_WM_CORE_WINDOW_ANIMATIONS_H_ diff --git a/ui/views/corewm/window_animations_unittest.cc b/ui/wm/core/window_animations_unittest.cc index 89d48c6..20428fa 100644 --- a/ui/views/corewm/window_animations_unittest.cc +++ b/ui/wm/core/window_animations_unittest.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/views/corewm/window_animations.h" +#include "ui/wm/core/window_animations.h" #include "base/time/time.h" #include "ui/aura/client/animation_host.h" diff --git a/ui/views/corewm/window_modality_controller.cc b/ui/wm/core/window_modality_controller.cc index 68273fd..7372e1e 100644 --- a/ui/views/corewm/window_modality_controller.cc +++ b/ui/wm/core/window_modality_controller.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/views/corewm/window_modality_controller.h" +#include "ui/wm/core/window_modality_controller.h" #include <algorithm> @@ -16,8 +16,8 @@ #include "ui/events/event.h" #include "ui/events/event_target.h" #include "ui/events/gestures/gesture_recognizer.h" -#include "ui/views/corewm/window_animations.h" -#include "ui/views/corewm/window_util.h" +#include "ui/wm/core/window_animations.h" +#include "ui/wm/core/window_util.h" namespace views { namespace corewm { diff --git a/ui/views/corewm/window_modality_controller.h b/ui/wm/core/window_modality_controller.h index 88150a5..f31162a 100644 --- a/ui/views/corewm/window_modality_controller.h +++ b/ui/wm/core/window_modality_controller.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_VIEWS_COREWM_WINDOW_MODALITY_CONTROLLER_H_ -#define UI_VIEWS_COREWM_WINDOW_MODALITY_CONTROLLER_H_ +#ifndef UI_WM_CORE_WINDOW_MODALITY_CONTROLLER_H_ +#define UI_WM_CORE_WINDOW_MODALITY_CONTROLLER_H_ #include <vector> @@ -11,7 +11,7 @@ #include "ui/aura/env_observer.h" #include "ui/aura/window_observer.h" #include "ui/events/event_handler.h" -#include "ui/views/views_export.h" +#include "ui/wm/core/wm_core_export.h" namespace ui { class EventTarget; @@ -22,18 +22,18 @@ namespace views { namespace corewm { // Sets the modal parent for the child. -VIEWS_EXPORT void SetModalParent(aura::Window* child, aura::Window* parent); +WM_CORE_EXPORT void SetModalParent(aura::Window* child, aura::Window* parent); // Returns the modal transient child of |window|, or NULL if |window| does not // have any modal transient children. -VIEWS_EXPORT aura::Window* GetModalTransient(aura::Window* window); +WM_CORE_EXPORT aura::Window* GetModalTransient(aura::Window* window); // WindowModalityController is an event filter that consumes events sent to // windows that are the transient parents of window-modal windows. This filter // must be added to the CompoundEventFilter so that activation works properly. -class VIEWS_EXPORT WindowModalityController : public ui::EventHandler, - public aura::EnvObserver, - public aura::WindowObserver { +class WM_CORE_EXPORT WindowModalityController : public ui::EventHandler, + public aura::EnvObserver, + public aura::WindowObserver { public: explicit WindowModalityController(ui::EventTarget* event_target); virtual ~WindowModalityController(); @@ -70,4 +70,4 @@ class VIEWS_EXPORT WindowModalityController : public ui::EventHandler, } // namespace corewm } // namespace views -#endif // UI_VIEWS_COREWM_WINDOW_MODALITY_CONTROLLER_H_ +#endif // UI_WM_CORE_WINDOW_MODALITY_CONTROLLER_H_ diff --git a/ui/views/corewm/window_util.cc b/ui/wm/core/window_util.cc index a460ef5..9af7cfa 100644 --- a/ui/views/corewm/window_util.cc +++ b/ui/wm/core/window_util.cc @@ -2,14 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ui/views/corewm/window_util.h" +#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/views/corewm/transient_window_manager.h" +#include "ui/wm/core/transient_window_manager.h" namespace { diff --git a/ui/views/corewm/window_util.h b/ui/wm/core/window_util.h index 1772e19..3cb7484 100644 --- a/ui/views/corewm/window_util.h +++ b/ui/wm/core/window_util.h @@ -2,15 +2,15 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef UI_VIEWS_COREWM_WINDOW_UTIL_H_ -#define UI_VIEWS_COREWM_WINDOW_UTIL_H_ +#ifndef UI_WM_CORE_WINDOW_UTIL_H_ +#define UI_WM_CORE_WINDOW_UTIL_H_ #include <vector> #include "base/basictypes.h" #include "base/compiler_specific.h" #include "base/memory/scoped_ptr.h" -#include "ui/views/views_export.h" +#include "ui/wm/core/wm_core_export.h" namespace aura { class Window; @@ -25,18 +25,18 @@ class LayerTreeOwner; namespace views { namespace corewm { -VIEWS_EXPORT void ActivateWindow(aura::Window* window); -VIEWS_EXPORT void DeactivateWindow(aura::Window* window); -VIEWS_EXPORT bool IsActiveWindow(aura::Window* window); -VIEWS_EXPORT bool CanActivateWindow(aura::Window* window); +WM_CORE_EXPORT void ActivateWindow(aura::Window* window); +WM_CORE_EXPORT void DeactivateWindow(aura::Window* window); +WM_CORE_EXPORT bool IsActiveWindow(aura::Window* window); +WM_CORE_EXPORT bool CanActivateWindow(aura::Window* window); // Retrieves the activatable window for |window|. The ActivationClient makes // this determination. -VIEWS_EXPORT aura::Window* GetActivatableWindow(aura::Window* window); +WM_CORE_EXPORT aura::Window* GetActivatableWindow(aura::Window* window); // Retrieves the toplevel window for |window|. The ActivationClient makes this // determination. -VIEWS_EXPORT aura::Window* GetToplevelWindow(aura::Window* window); +WM_CORE_EXPORT aura::Window* GetToplevelWindow(aura::Window* window); // Returns the existing Layer for |root| (and all its descendants) and creates // a new layer for |root| and all its descendants. This is intended for @@ -44,26 +44,28 @@ VIEWS_EXPORT aura::Window* GetToplevelWindow(aura::Window* window); // // As a result of this |root| has freshly created layers, meaning the layers // have not yet been painted to. -VIEWS_EXPORT scoped_ptr<ui::LayerTreeOwner> RecreateLayers( +WM_CORE_EXPORT scoped_ptr<ui::LayerTreeOwner> RecreateLayers( ui::LayerOwner* root); // Convenience functions that get the TransientWindowManager for the window and // redirect appropriately. These are preferable to calling functions on // TransientWindowManager as they handle the appropriate NULL checks. -VIEWS_EXPORT aura::Window* GetTransientParent(aura::Window* window); -VIEWS_EXPORT const aura::Window* GetTransientParent(const aura::Window* window); -VIEWS_EXPORT const std::vector<aura::Window*>& GetTransientChildren( +WM_CORE_EXPORT aura::Window* GetTransientParent(aura::Window* window); +WM_CORE_EXPORT const aura::Window* GetTransientParent( const aura::Window* window); -VIEWS_EXPORT void AddTransientChild(aura::Window* parent, aura::Window* child); -VIEWS_EXPORT void RemoveTransientChild(aura::Window* parent, - aura::Window* child); +WM_CORE_EXPORT const std::vector<aura::Window*>& GetTransientChildren( + const aura::Window* window); +WM_CORE_EXPORT void AddTransientChild(aura::Window* parent, + aura::Window* child); +WM_CORE_EXPORT void RemoveTransientChild(aura::Window* parent, + aura::Window* child); // Returns true if |window| has |ancestor| as a transient ancestor. A transient // ancestor is found by following the transient parent chain of the window. -VIEWS_EXPORT bool HasTransientAncestor(const aura::Window* window, - const aura::Window* ancestor); +WM_CORE_EXPORT bool HasTransientAncestor(const aura::Window* window, + const aura::Window* ancestor); } // namespace corewm } // namespace views -#endif // UI_VIEWS_COREWM_WINDOW_UTIL_H_ +#endif // UI_WM_CORE_WINDOW_UTIL_H_ diff --git a/ui/wm/core/wm_core_export.h b/ui/wm/core/wm_core_export.h new file mode 100644 index 0000000..c38c731 --- /dev/null +++ b/ui/wm/core/wm_core_export.h @@ -0,0 +1,40 @@ +// Copyright 2014 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. + +#ifndef UI_WM_CORE_WM_CORE_EXPORT_H_ +#define UI_WM_CORE_WM_CORE_EXPORT_H_ + +#include "ui/views/views_export.h" + +#if 1 +#define WM_CORE_EXPORT VIEWS_EXPORT +#else + +// Defines WM_CORE_EXPORT so that functionality implemented by the Views module +// can be exported to consumers. + +#if defined(COMPONENT_BUILD) +#if defined(WIN32) + +#if defined(WM_CORE_IMPLEMENTATION) +#define WM_CORE_EXPORT __declspec(dllexport) +#else +#define WM_CORE_EXPORT __declspec(dllimport) +#endif // defined(WM_CORE_IMPLEMENTATION) + +#else // defined(WIN32) +#if defined(WM_CORE_IMPLEMENTATION) +#define WM_CORE_EXPORT __attribute__((visibility("default"))) +#else +#define WM_CORE_EXPORT +#endif +#endif + +#else // defined(COMPONENT_BUILD) +#define WM_CORE_EXPORT +#endif + +#endif + +#endif // UI_WM_CORE_WM_CORE_EXPORT_H_ diff --git a/ui/views/corewm/corewm_switches.cc b/ui/wm/core/wm_core_switches.cc index 52ddff7..a417ed8 100644 --- a/ui/views/corewm/corewm_switches.cc +++ b/ui/wm/core/wm_core_switches.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/views/corewm/corewm_switches.h" +#include "ui/wm/core/wm_core_switches.h" #include "base/command_line.h" @@ -11,8 +11,7 @@ namespace corewm { namespace switches { // If present animations are disabled. -const char kWindowAnimationsDisabled[] = - "views-corewm-window-animations-disabled"; +const char kWindowAnimationsDisabled[] = "wm-window-animations-disabled"; } // namespace switches } // namespace corewm diff --git a/ui/views/corewm/corewm_switches.h b/ui/wm/core/wm_core_switches.h index 472e7b0..77bcdb0 100644 --- a/ui/views/corewm/corewm_switches.h +++ b/ui/wm/core/wm_core_switches.h @@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef UI_VIEWS_COREWM_COREWM_SWITCHES_H_ -#define UI_VIEWS_COREWM_COREWM_SWITCHES_H_ +#ifndef UI_WM_CORE_WM_CORE_SWITCHES_H_ +#define UI_WM_CORE_WM_CORE_SWITCHES_H_ #include "build/build_config.h" -#include "ui/views/views_export.h" +#include "ui/wm/core/wm_core_export.h" namespace views { namespace corewm { @@ -17,10 +17,10 @@ namespace switches { // see chromeos::LoginUtil::GetOffTheRecordCommandLine().) // Please keep alphabetized. -VIEWS_EXPORT extern const char kWindowAnimationsDisabled[]; +WM_CORE_EXPORT extern const char kWindowAnimationsDisabled[]; } // namespace switches } // namespace corewm } // namespace views -#endif // UI_VIEWS_COREWM_COREWM_SWITCHES_H_ +#endif // UI_WM_CORE_WM_CORE_SWITCHES_H_ diff --git a/ui/views/corewm/wm_state.cc b/ui/wm/core/wm_state.cc index 16d9e7a..aa2a5ef 100644 --- a/ui/views/corewm/wm_state.cc +++ b/ui/wm/core/wm_state.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/views/corewm/wm_state.h" +#include "ui/wm/core/wm_state.h" -#include "ui/views/corewm/transient_window_controller.h" -#include "ui/views/corewm/transient_window_stacking_client.h" +#include "ui/wm/core/transient_window_controller.h" +#include "ui/wm/core/transient_window_stacking_client.h" namespace views { namespace corewm { diff --git a/ui/views/corewm/wm_state.h b/ui/wm/core/wm_state.h index e8a09f2..f3573e0 100644 --- a/ui/views/corewm/wm_state.h +++ b/ui/wm/core/wm_state.h @@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef UI_VIEWS_COREWM_WM_STATE_H_ -#define UI_VIEWS_COREWM_WM_STATE_H_ +#ifndef UI_WM_CORE_WM_STATE_H_ +#define UI_WM_CORE_WM_STATE_H_ #include "base/memory/scoped_ptr.h" -#include "ui/views/views_export.h" +#include "ui/wm/core/wm_core_export.h" namespace views { namespace corewm { @@ -15,7 +15,7 @@ class TransientWindowController; class TransientWindowStackingClient; // Installs state needed by the window manager. -class VIEWS_EXPORT WMState { +class WM_CORE_EXPORT WMState { public: WMState(); ~WMState(); @@ -31,4 +31,4 @@ class VIEWS_EXPORT WMState { } // namespace corewm } // namespace views -#endif // UI_VIEWS_COREWM_WM_STATE_H_ +#endif // UI_WM_CORE_WM_STATE_H_ diff --git a/ui/wm/test/wm_test_helper.cc b/ui/wm/test/wm_test_helper.cc index bae2aca..a8f9aa8 100644 --- a/ui/wm/test/wm_test_helper.cc +++ b/ui/wm/test/wm_test_helper.cc @@ -9,8 +9,8 @@ #include "ui/aura/env.h" #include "ui/aura/test/test_focus_client.h" #include "ui/aura/window.h" -#include "ui/views/corewm/compound_event_filter.h" -#include "ui/views/corewm/input_method_event_filter.h" +#include "ui/wm/core/compound_event_filter.h" +#include "ui/wm/core/input_method_event_filter.h" namespace wm { |