diff options
Diffstat (limited to 'ash/wm')
41 files changed, 47 insertions, 47 deletions
diff --git a/ash/wm/app_list_controller.h b/ash/wm/app_list_controller.h index dcb559f..ca1160cc 100644 --- a/ash/wm/app_list_controller.h +++ b/ash/wm/app_list_controller.h @@ -14,7 +14,7 @@ #include "ui/aura/window_observer.h" #include "ui/compositor/layer_animation_observer.h" #include "ui/events/event_handler.h" -#include "ui/gfx/rect.h" +#include "ui/gfx/geometry/rect.h" #include "ui/keyboard/keyboard_controller_observer.h" #include "ui/views/widget/widget_observer.h" diff --git a/ash/wm/ash_native_cursor_manager.h b/ash/wm/ash_native_cursor_manager.h index 0c1da82..3278e43 100644 --- a/ash/wm/ash_native_cursor_manager.h +++ b/ash/wm/ash_native_cursor_manager.h @@ -10,8 +10,8 @@ #include "base/compiler_specific.h" #include "base/memory/scoped_ptr.h" #include "base/strings/string16.h" +#include "ui/gfx/geometry/point.h" #include "ui/gfx/native_widget_types.h" -#include "ui/gfx/point.h" #include "ui/wm/core/native_cursor_manager.h" #include "ui/wm/core/native_cursor_manager_delegate.h" diff --git a/ash/wm/coordinate_conversion.cc b/ash/wm/coordinate_conversion.cc index 258f976..c13ccdc9 100644 --- a/ash/wm/coordinate_conversion.cc +++ b/ash/wm/coordinate_conversion.cc @@ -8,8 +8,8 @@ #include "ash/shell.h" #include "ui/aura/client/screen_position_client.h" #include "ui/gfx/display.h" -#include "ui/gfx/point.h" -#include "ui/gfx/rect.h" +#include "ui/gfx/geometry/point.h" +#include "ui/gfx/geometry/rect.h" #include "ui/gfx/screen.h" namespace ash { diff --git a/ash/wm/default_state.cc b/ash/wm/default_state.cc index 46a8545..f6e3315 100644 --- a/ash/wm/default_state.cc +++ b/ash/wm/default_state.cc @@ -21,7 +21,7 @@ #include "ui/aura/window.h" #include "ui/aura/window_delegate.h" #include "ui/gfx/display.h" -#include "ui/gfx/rect.h" +#include "ui/gfx/geometry/rect.h" namespace ash { namespace wm { diff --git a/ash/wm/dock/docked_window_layout_manager.cc b/ash/wm/dock/docked_window_layout_manager.cc index db7c9c2..dbf6d55 100644 --- a/ash/wm/dock/docked_window_layout_manager.cc +++ b/ash/wm/dock/docked_window_layout_manager.cc @@ -33,8 +33,8 @@ #include "ui/base/resource/resource_bundle.h" #include "ui/compositor/scoped_layer_animation_settings.h" #include "ui/gfx/canvas.h" +#include "ui/gfx/geometry/rect.h" #include "ui/gfx/image/image_skia_operations.h" -#include "ui/gfx/rect.h" #include "ui/views/background.h" #include "ui/wm/core/window_util.h" #include "ui/wm/public/activation_client.h" diff --git a/ash/wm/dock/docked_window_layout_manager.h b/ash/wm/dock/docked_window_layout_manager.h index dfb1c20..aad8804 100644 --- a/ash/wm/dock/docked_window_layout_manager.h +++ b/ash/wm/dock/docked_window_layout_manager.h @@ -20,7 +20,7 @@ #include "base/time/time.h" #include "ui/aura/window.h" #include "ui/aura/window_observer.h" -#include "ui/gfx/rect.h" +#include "ui/gfx/geometry/rect.h" #include "ui/keyboard/keyboard_controller_observer.h" #include "ui/wm/public/activation_change_observer.h" diff --git a/ash/wm/drag_details.h b/ash/wm/drag_details.h index d8f7d6e..5fe0c6a 100644 --- a/ash/wm/drag_details.h +++ b/ash/wm/drag_details.h @@ -9,7 +9,7 @@ #include "ash/wm/wm_types.h" #include "base/basictypes.h" #include "base/memory/scoped_ptr.h" -#include "ui/gfx/rect.h" +#include "ui/gfx/geometry/rect.h" #include "ui/wm/public/window_move_client.h" namespace aura { diff --git a/ash/wm/drag_window_controller.h b/ash/wm/drag_window_controller.h index c5d8b4b..2a158c0 100644 --- a/ash/wm/drag_window_controller.h +++ b/ash/wm/drag_window_controller.h @@ -10,7 +10,7 @@ #include "base/gtest_prod_util.h" #include "base/memory/scoped_ptr.h" #include "ui/gfx/display.h" -#include "ui/gfx/rect.h" +#include "ui/gfx/geometry/rect.h" namespace aura { class Window; diff --git a/ash/wm/drag_window_resizer.h b/ash/wm/drag_window_resizer.h index 3c6e1e2..11d1544b 100644 --- a/ash/wm/drag_window_resizer.h +++ b/ash/wm/drag_window_resizer.h @@ -10,7 +10,7 @@ #include "base/gtest_prod_util.h" #include "base/memory/scoped_vector.h" #include "base/memory/weak_ptr.h" -#include "ui/gfx/point.h" +#include "ui/gfx/geometry/point.h" namespace ash { diff --git a/ash/wm/drag_window_resizer_unittest.cc b/ash/wm/drag_window_resizer_unittest.cc index 7f507a0..d8dac7f 100644 --- a/ash/wm/drag_window_resizer_unittest.cc +++ b/ash/wm/drag_window_resizer_unittest.cc @@ -21,7 +21,7 @@ #include "ui/base/hit_test.h" #include "ui/base/ui_base_types.h" #include "ui/compositor/layer_tree_owner.h" -#include "ui/gfx/insets.h" +#include "ui/gfx/geometry/insets.h" #include "ui/gfx/screen.h" #include "ui/views/widget/widget.h" #include "ui/wm/core/window_util.h" diff --git a/ash/wm/gestures/long_press_affordance_handler.h b/ash/wm/gestures/long_press_affordance_handler.h index 9c7a1a4..a98834e 100644 --- a/ash/wm/gestures/long_press_affordance_handler.h +++ b/ash/wm/gestures/long_press_affordance_handler.h @@ -8,7 +8,7 @@ #include "base/timer/timer.h" #include "ui/aura/window_observer.h" #include "ui/gfx/animation/linear_animation.h" -#include "ui/gfx/point.h" +#include "ui/gfx/geometry/point.h" namespace ui { class GestureEvent; diff --git a/ash/wm/gestures/overview_gesture_handler.cc b/ash/wm/gestures/overview_gesture_handler.cc index 87c867b..c0ceec9 100644 --- a/ash/wm/gestures/overview_gesture_handler.cc +++ b/ash/wm/gestures/overview_gesture_handler.cc @@ -10,7 +10,7 @@ #include "ui/aura/window.h" #include "ui/events/event.h" #include "ui/events/event_constants.h" -#include "ui/gfx/rect.h" +#include "ui/gfx/geometry/rect.h" #include "ui/gfx/screen.h" #include "ui/wm/core/coordinate_conversion.h" diff --git a/ash/wm/immersive_fullscreen_controller.cc b/ash/wm/immersive_fullscreen_controller.cc index 9b3c01c..75781d5 100644 --- a/ash/wm/immersive_fullscreen_controller.cc +++ b/ash/wm/immersive_fullscreen_controller.cc @@ -20,8 +20,8 @@ #include "ui/aura/window_event_dispatcher.h" #include "ui/gfx/animation/slide_animation.h" #include "ui/gfx/display.h" -#include "ui/gfx/point.h" -#include "ui/gfx/rect.h" +#include "ui/gfx/geometry/point.h" +#include "ui/gfx/geometry/rect.h" #include "ui/gfx/screen.h" #include "ui/views/bubble/bubble_delegate.h" #include "ui/views/view.h" diff --git a/ash/wm/lock_layout_manager.h b/ash/wm/lock_layout_manager.h index 716baf0..ec79434 100644 --- a/ash/wm/lock_layout_manager.h +++ b/ash/wm/lock_layout_manager.h @@ -14,7 +14,7 @@ #include "base/memory/scoped_ptr.h" #include "ui/aura/layout_manager.h" #include "ui/aura/window_observer.h" -#include "ui/gfx/rect.h" +#include "ui/gfx/geometry/rect.h" #include "ui/keyboard/keyboard_controller.h" #include "ui/keyboard/keyboard_controller_observer.h" diff --git a/ash/wm/lock_state_controller_unittest.cc b/ash/wm/lock_state_controller_unittest.cc index 4fc14d6..4f3c4d0 100644 --- a/ash/wm/lock_state_controller_unittest.cc +++ b/ash/wm/lock_state_controller_unittest.cc @@ -18,7 +18,7 @@ #include "base/memory/scoped_vector.h" #include "base/time/time.h" #include "ui/events/test/event_generator.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" #if defined(OS_CHROMEOS) #include "ui/display/chromeos/display_configurator.h" diff --git a/ash/wm/lock_window_state.cc b/ash/wm/lock_window_state.cc index 35f1986..fae4708 100644 --- a/ash/wm/lock_window_state.cc +++ b/ash/wm/lock_window_state.cc @@ -15,7 +15,7 @@ #include "ash/wm/wm_event.h" #include "ui/aura/window.h" #include "ui/aura/window_delegate.h" -#include "ui/gfx/rect.h" +#include "ui/gfx/geometry/rect.h" #include "ui/keyboard/keyboard_controller.h" #include "ui/keyboard/keyboard_util.h" #include "ui/wm/core/window_animations.h" diff --git a/ash/wm/maximize_mode/maximize_mode_window_state.cc b/ash/wm/maximize_mode/maximize_mode_window_state.cc index 46345ba..61d6931 100644 --- a/ash/wm/maximize_mode/maximize_mode_window_state.cc +++ b/ash/wm/maximize_mode/maximize_mode_window_state.cc @@ -22,7 +22,7 @@ #include "ui/aura/window_delegate.h" #include "ui/compositor/layer.h" #include "ui/gfx/display.h" -#include "ui/gfx/rect.h" +#include "ui/gfx/geometry/rect.h" #include "ui/views/view_constants_aura.h" #include "ui/views/widget/widget.h" diff --git a/ash/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_x11.h b/ash/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_x11.h index 1b1ae96..199f4d5 100644 --- a/ash/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_x11.h +++ b/ash/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_x11.h @@ -11,7 +11,7 @@ #include "ash/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard.h" #include "base/macros.h" #include "ui/events/platform/platform_event_observer.h" -#include "ui/gfx/point.h" +#include "ui/gfx/geometry/point.h" namespace ash { diff --git a/ash/wm/overview/scoped_transform_overview_window.h b/ash/wm/overview/scoped_transform_overview_window.h index 220835e..b38f517 100644 --- a/ash/wm/overview/scoped_transform_overview_window.h +++ b/ash/wm/overview/scoped_transform_overview_window.h @@ -11,7 +11,7 @@ #include "base/compiler_specific.h" #include "base/memory/scoped_ptr.h" #include "base/memory/scoped_vector.h" -#include "ui/gfx/rect.h" +#include "ui/gfx/geometry/rect.h" #include "ui/gfx/transform.h" #include "ui/views/widget/widget.h" diff --git a/ash/wm/overview/window_grid.cc b/ash/wm/overview/window_grid.cc index 3302e61..defc09b 100644 --- a/ash/wm/overview/window_grid.cc +++ b/ash/wm/overview/window_grid.cc @@ -25,7 +25,7 @@ #include "ui/compositor/layer_animation_observer.h" #include "ui/compositor/scoped_layer_animation_settings.h" #include "ui/gfx/animation/tween.h" -#include "ui/gfx/vector2d.h" +#include "ui/gfx/geometry/vector2d.h" #include "ui/views/background.h" #include "ui/views/view.h" #include "ui/views/widget/widget.h" diff --git a/ash/wm/overview/window_selector_item.h b/ash/wm/overview/window_selector_item.h index 68ae2a9..584d275 100644 --- a/ash/wm/overview/window_selector_item.h +++ b/ash/wm/overview/window_selector_item.h @@ -12,7 +12,7 @@ #include "base/compiler_specific.h" #include "base/memory/scoped_ptr.h" #include "ui/aura/window_observer.h" -#include "ui/gfx/rect.h" +#include "ui/gfx/geometry/rect.h" #include "ui/views/controls/button/button.h" #include "ui/views/controls/button/image_button.h" diff --git a/ash/wm/overview/window_selector_unittest.cc b/ash/wm/overview/window_selector_unittest.cc index 230fe9d..cd25675 100644 --- a/ash/wm/overview/window_selector_unittest.cc +++ b/ash/wm/overview/window_selector_unittest.cc @@ -43,7 +43,7 @@ #include "ui/compositor/scoped_animation_duration_scale_mode.h" #include "ui/events/test/event_generator.h" #include "ui/gfx/geometry/point_conversions.h" -#include "ui/gfx/rect_conversions.h" +#include "ui/gfx/geometry/rect_conversions.h" #include "ui/gfx/transform.h" #include "ui/gfx/transform_util.h" #include "ui/views/controls/label.h" diff --git a/ash/wm/panels/panel_layout_manager.cc b/ash/wm/panels/panel_layout_manager.cc index 519d569..ccbf450 100644 --- a/ash/wm/panels/panel_layout_manager.cc +++ b/ash/wm/panels/panel_layout_manager.cc @@ -32,8 +32,8 @@ #include "ui/aura/window_tracker.h" #include "ui/compositor/scoped_layer_animation_settings.h" #include "ui/gfx/canvas.h" -#include "ui/gfx/rect.h" -#include "ui/gfx/vector2d.h" +#include "ui/gfx/geometry/rect.h" +#include "ui/gfx/geometry/vector2d.h" #include "ui/views/background.h" #include "ui/views/widget/widget.h" #include "ui/wm/public/activation_client.h" diff --git a/ash/wm/screen_dimmer.cc b/ash/wm/screen_dimmer.cc index b570c2d..90edc69 100644 --- a/ash/wm/screen_dimmer.cc +++ b/ash/wm/screen_dimmer.cc @@ -9,8 +9,8 @@ #include "ui/aura/window_event_dispatcher.h" #include "ui/compositor/layer.h" #include "ui/compositor/scoped_layer_animation_settings.h" -#include "ui/gfx/rect.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/rect.h" +#include "ui/gfx/geometry/size.h" namespace ash { namespace { diff --git a/ash/wm/system_gesture_event_filter_unittest.cc b/ash/wm/system_gesture_event_filter_unittest.cc index 59f30a1..de7d7bc 100644 --- a/ash/wm/system_gesture_event_filter_unittest.cc +++ b/ash/wm/system_gesture_event_filter_unittest.cc @@ -32,8 +32,8 @@ #include "ui/events/gesture_detection/gesture_configuration.h" #include "ui/events/test/event_generator.h" #include "ui/events/test/test_event_handler.h" +#include "ui/gfx/geometry/size.h" #include "ui/gfx/screen.h" -#include "ui/gfx/size.h" #include "ui/views/widget/widget.h" #include "ui/views/widget/widget_delegate.h" #include "ui/views/window/non_client_view.h" diff --git a/ash/wm/toplevel_window_event_handler.h b/ash/wm/toplevel_window_event_handler.h index ce744a9..a51eb5c 100644 --- a/ash/wm/toplevel_window_event_handler.h +++ b/ash/wm/toplevel_window_event_handler.h @@ -14,8 +14,8 @@ #include "base/compiler_specific.h" #include "base/memory/scoped_ptr.h" #include "ui/events/event_handler.h" -#include "ui/gfx/point.h" -#include "ui/gfx/rect.h" +#include "ui/gfx/geometry/point.h" +#include "ui/gfx/geometry/rect.h" #include "ui/wm/public/window_move_client.h" namespace aura { diff --git a/ash/wm/video_detector.cc b/ash/wm/video_detector.cc index 816a9c4..2d919e1f 100644 --- a/ash/wm/video_detector.cc +++ b/ash/wm/video_detector.cc @@ -10,7 +10,7 @@ #include "ui/aura/env.h" #include "ui/aura/window.h" #include "ui/aura/window_event_dispatcher.h" -#include "ui/gfx/rect.h" +#include "ui/gfx/geometry/rect.h" #include "ui/wm/core/window_util.h" namespace ash { diff --git a/ash/wm/video_detector_unittest.cc b/ash/wm/video_detector_unittest.cc index d431c2c..edc0544 100644 --- a/ash/wm/video_detector_unittest.cc +++ b/ash/wm/video_detector_unittest.cc @@ -16,7 +16,7 @@ #include "ui/aura/test/test_windows.h" #include "ui/aura/window.h" #include "ui/aura/window_event_dispatcher.h" -#include "ui/gfx/rect.h" +#include "ui/gfx/geometry/rect.h" #include "ui/wm/public/window_types.h" namespace ash { diff --git a/ash/wm/window_cycle_controller_unittest.cc b/ash/wm/window_cycle_controller_unittest.cc index ec34f7a..5d8e9bd 100644 --- a/ash/wm/window_cycle_controller_unittest.cc +++ b/ash/wm/window_cycle_controller_unittest.cc @@ -26,7 +26,7 @@ #include "ui/aura/test/test_windows.h" #include "ui/aura/window.h" #include "ui/aura/window_event_dispatcher.h" -#include "ui/gfx/rect.h" +#include "ui/gfx/geometry/rect.h" #include "ui/gfx/screen.h" namespace ash { diff --git a/ash/wm/window_positioner.h b/ash/wm/window_positioner.h index 2efbac0..cba3a0c 100644 --- a/ash/wm/window_positioner.h +++ b/ash/wm/window_positioner.h @@ -8,7 +8,7 @@ #include "ash/ash_export.h" #include "base/basictypes.h" #include "ui/base/ui_base_types.h" -#include "ui/gfx/rect.h" +#include "ui/gfx/geometry/rect.h" namespace aura { class Window; diff --git a/ash/wm/window_properties.h b/ash/wm/window_properties.h index 96c5519..d8e5921 100644 --- a/ash/wm/window_properties.h +++ b/ash/wm/window_properties.h @@ -7,7 +7,7 @@ #include "ash/ash_export.h" #include "ui/base/ui_base_types.h" -#include "ui/gfx/rect.h" +#include "ui/gfx/geometry/rect.h" namespace aura { class Window; diff --git a/ash/wm/window_resizer.h b/ash/wm/window_resizer.h index 21cfd52..6c8de5e 100644 --- a/ash/wm/window_resizer.h +++ b/ash/wm/window_resizer.h @@ -10,7 +10,7 @@ #include "ash/wm/window_state.h" #include "base/basictypes.h" #include "base/memory/scoped_ptr.h" -#include "ui/gfx/rect.h" +#include "ui/gfx/geometry/rect.h" #include "ui/wm/public/window_move_client.h" namespace aura { diff --git a/ash/wm/window_util.cc b/ash/wm/window_util.cc index cd39d9c..e05ae2f 100644 --- a/ash/wm/window_util.cc +++ b/ash/wm/window_util.cc @@ -19,9 +19,9 @@ #include "ui/aura/window_event_dispatcher.h" #include "ui/compositor/dip_util.h" #include "ui/gfx/display.h" -#include "ui/gfx/rect.h" +#include "ui/gfx/geometry/rect.h" +#include "ui/gfx/geometry/size.h" #include "ui/gfx/screen.h" -#include "ui/gfx/size.h" #include "ui/views/view.h" #include "ui/views/widget/widget.h" #include "ui/wm/core/window_util.h" diff --git a/ash/wm/wm_event.h b/ash/wm/wm_event.h index bcb00e3..6630026 100644 --- a/ash/wm/wm_event.h +++ b/ash/wm/wm_event.h @@ -7,7 +7,7 @@ #include "ash/ash_export.h" #include "ash/wm/wm_types.h" -#include "ui/gfx/rect.h" +#include "ui/gfx/geometry/rect.h" namespace ash { namespace wm { diff --git a/ash/wm/workspace/magnetism_matcher.h b/ash/wm/workspace/magnetism_matcher.h index 5c17c7a58..141303d 100644 --- a/ash/wm/workspace/magnetism_matcher.h +++ b/ash/wm/workspace/magnetism_matcher.h @@ -12,7 +12,7 @@ #include "base/compiler_specific.h" #include "base/logging.h" #include "base/memory/scoped_vector.h" -#include "ui/gfx/rect.h" +#include "ui/gfx/geometry/rect.h" namespace ash { diff --git a/ash/wm/workspace/multi_window_resize_controller.h b/ash/wm/workspace/multi_window_resize_controller.h index 0e387e8..35a25a6 100644 --- a/ash/wm/workspace/multi_window_resize_controller.h +++ b/ash/wm/workspace/multi_window_resize_controller.h @@ -12,7 +12,7 @@ #include "base/memory/scoped_ptr.h" #include "base/timer/timer.h" #include "ui/aura/window_observer.h" -#include "ui/gfx/rect.h" +#include "ui/gfx/geometry/rect.h" #include "ui/views/mouse_watcher.h" namespace aura { diff --git a/ash/wm/workspace/phantom_window_controller.h b/ash/wm/workspace/phantom_window_controller.h index 11d6f95..717366d 100644 --- a/ash/wm/workspace/phantom_window_controller.h +++ b/ash/wm/workspace/phantom_window_controller.h @@ -8,7 +8,7 @@ #include "ash/ash_export.h" #include "base/basictypes.h" #include "base/memory/scoped_ptr.h" -#include "ui/gfx/rect.h" +#include "ui/gfx/geometry/rect.h" namespace aura { class Window; diff --git a/ash/wm/workspace/two_step_edge_cycler.h b/ash/wm/workspace/two_step_edge_cycler.h index ffa1620..01ca086 100644 --- a/ash/wm/workspace/two_step_edge_cycler.h +++ b/ash/wm/workspace/two_step_edge_cycler.h @@ -8,7 +8,7 @@ #include "ash/ash_export.h" #include "base/basictypes.h" #include "base/time/time.h" -#include "ui/gfx/point.h" +#include "ui/gfx/geometry/point.h" namespace ash { diff --git a/ash/wm/workspace/workspace_layout_manager.h b/ash/wm/workspace/workspace_layout_manager.h index 2eb8107..5570dd5 100644 --- a/ash/wm/workspace/workspace_layout_manager.h +++ b/ash/wm/workspace/workspace_layout_manager.h @@ -16,7 +16,7 @@ #include "base/memory/scoped_ptr.h" #include "ui/aura/layout_manager.h" #include "ui/aura/window_observer.h" -#include "ui/gfx/rect.h" +#include "ui/gfx/geometry/rect.h" #include "ui/keyboard/keyboard_controller_observer.h" #include "ui/wm/public/activation_change_observer.h" diff --git a/ash/wm/workspace/workspace_layout_manager_unittest.cc b/ash/wm/workspace/workspace_layout_manager_unittest.cc index 7bbd685..a1830df 100644 --- a/ash/wm/workspace/workspace_layout_manager_unittest.cc +++ b/ash/wm/workspace/workspace_layout_manager_unittest.cc @@ -32,7 +32,7 @@ #include "ui/base/ime/text_input_focus_manager.h" #include "ui/base/ui_base_switches_util.h" #include "ui/base/ui_base_types.h" -#include "ui/gfx/insets.h" +#include "ui/gfx/geometry/insets.h" #include "ui/gfx/screen.h" #include "ui/views/widget/widget.h" #include "ui/views/widget/widget_delegate.h" diff --git a/ash/wm/workspace/workspace_window_resizer_unittest.cc b/ash/wm/workspace/workspace_window_resizer_unittest.cc index 1f5c208..263eb0e 100644 --- a/ash/wm/workspace/workspace_window_resizer_unittest.cc +++ b/ash/wm/workspace/workspace_window_resizer_unittest.cc @@ -25,7 +25,7 @@ #include "ui/base/hit_test.h" #include "ui/events/gesture_detection/gesture_configuration.h" #include "ui/events/test/event_generator.h" -#include "ui/gfx/insets.h" +#include "ui/gfx/geometry/insets.h" #include "ui/gfx/screen.h" #include "ui/views/widget/widget.h" |