diff options
327 files changed, 465 insertions, 465 deletions
diff --git a/ash/accelerators/accelerator_controller.cc b/ash/accelerators/accelerator_controller.cc index 32d627f..108cb3b 100644 --- a/ash/accelerators/accelerator_controller.cc +++ b/ash/accelerators/accelerator_controller.cc @@ -56,11 +56,11 @@ #include "ui/aura/root_window.h" #include "ui/base/accelerators/accelerator.h" #include "ui/base/accelerators/accelerator_manager.h" -#include "ui/base/events/event.h" #include "ui/compositor/debug_utils.h" #include "ui/compositor/layer.h" #include "ui/compositor/layer_animation_sequence.h" #include "ui/compositor/layer_animator.h" +#include "ui/events/event.h" #include "ui/events/keycodes/keyboard_codes.h" #include "ui/gfx/screen.h" #include "ui/oak/oak.h" diff --git a/ash/accelerators/accelerator_controller_unittest.cc b/ash/accelerators/accelerator_controller_unittest.cc index bc709b2..6c6355f 100644 --- a/ash/accelerators/accelerator_controller_unittest.cc +++ b/ash/accelerators/accelerator_controller_unittest.cc @@ -22,7 +22,7 @@ #include "ui/aura/test/test_window_delegate.h" #include "ui/aura/test/test_windows.h" #include "ui/aura/window.h" -#include "ui/base/events/event.h" +#include "ui/events/event.h" #if defined(USE_X11) #include <X11/Xlib.h> diff --git a/ash/accelerators/accelerator_dispatcher.cc b/ash/accelerators/accelerator_dispatcher.cc index 91f0154..d023c6e 100644 --- a/ash/accelerators/accelerator_dispatcher.cc +++ b/ash/accelerators/accelerator_dispatcher.cc @@ -19,9 +19,9 @@ #include "ui/aura/env.h" #include "ui/aura/root_window.h" #include "ui/base/accelerators/accelerator.h" -#include "ui/base/events/event.h" -#include "ui/base/events/event_constants.h" -#include "ui/base/events/event_utils.h" +#include "ui/events/event.h" +#include "ui/events/event_constants.h" +#include "ui/events/event_utils.h" #include "ui/views/controls/menu/menu_controller.h" namespace ash { diff --git a/ash/accelerators/accelerator_filter.cc b/ash/accelerators/accelerator_filter.cc index 892beab..ab7acd3 100644 --- a/ash/accelerators/accelerator_filter.cc +++ b/ash/accelerators/accelerator_filter.cc @@ -10,7 +10,7 @@ #include "ui/aura/root_window.h" #include "ui/base/accelerators/accelerator.h" #include "ui/base/accelerators/accelerator_manager.h" -#include "ui/base/events/event.h" +#include "ui/events/event.h" namespace ash { namespace { diff --git a/ash/accelerators/accelerator_filter.h b/ash/accelerators/accelerator_filter.h index a43241a..1df7637 100644 --- a/ash/accelerators/accelerator_filter.h +++ b/ash/accelerators/accelerator_filter.h @@ -8,7 +8,7 @@ #include "ash/ash_export.h" #include "base/basictypes.h" #include "base/compiler_specific.h" -#include "ui/base/events/event_handler.h" +#include "ui/events/event_handler.h" namespace ash { namespace internal { diff --git a/ash/accelerators/accelerator_table.h b/ash/accelerators/accelerator_table.h index 6de8125..7d23adf 100644 --- a/ash/accelerators/accelerator_table.h +++ b/ash/accelerators/accelerator_table.h @@ -7,7 +7,7 @@ #include "ash/ash_export.h" #include "base/basictypes.h" -#include "ui/base/events/event_constants.h" +#include "ui/events/event_constants.h" #include "ui/events/keycodes/keyboard_codes.h" namespace ash { diff --git a/ash/accelerators/nested_dispatcher_controller_unittest.cc b/ash/accelerators/nested_dispatcher_controller_unittest.cc index 8b0f6a5..4c07232 100644 --- a/ash/accelerators/nested_dispatcher_controller_unittest.cc +++ b/ash/accelerators/nested_dispatcher_controller_unittest.cc @@ -15,8 +15,8 @@ #include "ui/aura/test/test_windows.h" #include "ui/aura/window.h" #include "ui/base/accelerators/accelerator.h" -#include "ui/base/events/event_constants.h" -#include "ui/base/events/event_utils.h" +#include "ui/events/event_constants.h" +#include "ui/events/event_utils.h" #if defined(USE_X11) #include <X11/Xlib.h> diff --git a/ash/display/display_controller_unittest.cc b/ash/display/display_controller_unittest.cc index 9e89cff..485e582 100644 --- a/ash/display/display_controller_unittest.cc +++ b/ash/display/display_controller_unittest.cc @@ -23,7 +23,7 @@ #include "ui/aura/root_window.h" #include "ui/aura/test/event_generator.h" #include "ui/aura/window_tracker.h" -#include "ui/base/events/event_handler.h" +#include "ui/events/event_handler.h" #include "ui/gfx/display.h" #include "ui/gfx/screen.h" #include "ui/views/widget/widget.h" diff --git a/ash/display/event_transformation_handler.cc b/ash/display/event_transformation_handler.cc index cb33891..5f9e450 100644 --- a/ash/display/event_transformation_handler.cc +++ b/ash/display/event_transformation_handler.cc @@ -12,8 +12,8 @@ #include "ash/wm/window_util.h" #include "ui/aura/root_window.h" #include "ui/aura/window.h" -#include "ui/base/events/event.h" #include "ui/compositor/dip_util.h" +#include "ui/events/event.h" #include "ui/gfx/display.h" #include "ui/gfx/screen.h" diff --git a/ash/display/event_transformation_handler.h b/ash/display/event_transformation_handler.h index b2a7167..da9560f 100644 --- a/ash/display/event_transformation_handler.h +++ b/ash/display/event_transformation_handler.h @@ -7,7 +7,7 @@ #include "ash/ash_export.h" #include "base/compiler_specific.h" -#include "ui/base/events/event_handler.h" +#include "ui/events/event_handler.h" namespace ash { diff --git a/ash/display/mouse_cursor_event_filter.cc b/ash/display/mouse_cursor_event_filter.cc index f3c3a74..b03aad7 100644 --- a/ash/display/mouse_cursor_event_filter.cc +++ b/ash/display/mouse_cursor_event_filter.cc @@ -15,9 +15,9 @@ #include "ui/aura/env.h" #include "ui/aura/root_window.h" #include "ui/aura/window.h" -#include "ui/base/events/event.h" #include "ui/base/layout.h" #include "ui/compositor/dip_util.h" +#include "ui/events/event.h" #include "ui/gfx/screen.h" namespace ash { diff --git a/ash/display/mouse_cursor_event_filter.h b/ash/display/mouse_cursor_event_filter.h index 593448f..32ecf9f 100644 --- a/ash/display/mouse_cursor_event_filter.h +++ b/ash/display/mouse_cursor_event_filter.h @@ -9,7 +9,7 @@ #include "base/compiler_specific.h" #include "base/gtest_prod_util.h" #include "base/memory/scoped_ptr.h" -#include "ui/base/events/event_handler.h" +#include "ui/events/event_handler.h" #include "ui/gfx/rect.h" namespace aura { diff --git a/ash/display/root_window_transformers_unittest.cc b/ash/display/root_window_transformers_unittest.cc index 39d500c..d426a63 100644 --- a/ash/display/root_window_transformers_unittest.cc +++ b/ash/display/root_window_transformers_unittest.cc @@ -21,7 +21,7 @@ #include "ui/aura/root_window_transformer.h" #include "ui/aura/test/event_generator.h" #include "ui/aura/window_tracker.h" -#include "ui/base/events/event_handler.h" +#include "ui/events/event_handler.h" #include "ui/gfx/display.h" #include "ui/gfx/rect_conversions.h" #include "ui/gfx/screen.h" diff --git a/ash/drag_drop/drag_drop_controller.cc b/ash/drag_drop/drag_drop_controller.cc index fec1a6c..9c8f930 100644 --- a/ash/drag_drop/drag_drop_controller.cc +++ b/ash/drag_drop/drag_drop_controller.cc @@ -19,9 +19,9 @@ #include "ui/aura/window_delegate.h" #include "ui/base/dragdrop/drag_drop_types.h" #include "ui/base/dragdrop/os_exchange_data.h" -#include "ui/base/events/event.h" -#include "ui/base/events/event_utils.h" #include "ui/base/hit_test.h" +#include "ui/events/event.h" +#include "ui/events/event_utils.h" #include "ui/gfx/animation/linear_animation.h" #include "ui/gfx/path.h" #include "ui/gfx/point.h" diff --git a/ash/drag_drop/drag_drop_controller.h b/ash/drag_drop/drag_drop_controller.h index ec5cac1..6471db2 100644 --- a/ash/drag_drop/drag_drop_controller.h +++ b/ash/drag_drop/drag_drop_controller.h @@ -11,8 +11,8 @@ #include "ui/aura/client/drag_drop_client.h" #include "ui/aura/window_observer.h" #include "ui/base/dragdrop/os_exchange_data.h" -#include "ui/base/events/event_constants.h" -#include "ui/base/events/event_handler.h" +#include "ui/events/event_constants.h" +#include "ui/events/event_handler.h" #include "ui/gfx/animation/animation_delegate.h" #include "ui/gfx/rect.h" diff --git a/ash/drag_drop/drag_drop_controller_unittest.cc b/ash/drag_drop/drag_drop_controller_unittest.cc index ce4e752..ba46192 100644 --- a/ash/drag_drop/drag_drop_controller_unittest.cc +++ b/ash/drag_drop/drag_drop_controller_unittest.cc @@ -19,10 +19,10 @@ #include "ui/base/dragdrop/drag_drop_types.h" #include "ui/base/dragdrop/drag_utils.h" #include "ui/base/dragdrop/os_exchange_data.h" -#include "ui/base/events/event.h" -#include "ui/base/events/event_utils.h" #include "ui/base/gestures/gesture_types.h" #include "ui/base/ui_base_switches.h" +#include "ui/events/event.h" +#include "ui/events/event_utils.h" #include "ui/gfx/animation/linear_animation.h" #include "ui/gfx/image/image_skia_rep.h" #include "ui/views/test/test_views_delegate.h" diff --git a/ash/drag_drop/drag_drop_tracker.cc b/ash/drag_drop/drag_drop_tracker.cc index 9de4645..4fd1de8 100644 --- a/ash/drag_drop/drag_drop_tracker.cc +++ b/ash/drag_drop/drag_drop_tracker.cc @@ -8,7 +8,7 @@ #include "ash/shell_window_ids.h" #include "ash/wm/coordinate_conversion.h" #include "ui/aura/root_window.h" -#include "ui/base/events/event.h" +#include "ui/events/event.h" #include "ui/gfx/screen.h" namespace ash { diff --git a/ash/drag_drop/drag_drop_tracker.h b/ash/drag_drop/drag_drop_tracker.h index d7212ef..c20952c 100644 --- a/ash/drag_drop/drag_drop_tracker.h +++ b/ash/drag_drop/drag_drop_tracker.h @@ -8,7 +8,7 @@ #include "ash/ash_export.h" #include "base/basictypes.h" #include "base/memory/scoped_ptr.h" -#include "ui/base/events/event.h" +#include "ui/events/event.h" namespace aura { class RootWindow; diff --git a/ash/extended_desktop_unittest.cc b/ash/extended_desktop_unittest.cc index f0719d0..a6a9107 100644 --- a/ash/extended_desktop_unittest.cc +++ b/ash/extended_desktop_unittest.cc @@ -24,7 +24,7 @@ #include "ui/aura/test/window_test_api.h" #include "ui/aura/window.h" #include "ui/base/cursor/cursor.h" -#include "ui/base/events/event_handler.h" +#include "ui/events/event_handler.h" #include "ui/gfx/display.h" #include "ui/gfx/screen.h" #include "ui/views/controls/textfield/textfield.h" diff --git a/ash/keyboard_overlay/keyboard_overlay_view.cc b/ash/keyboard_overlay/keyboard_overlay_view.cc index 2144caa..2847653 100644 --- a/ash/keyboard_overlay/keyboard_overlay_view.cc +++ b/ash/keyboard_overlay/keyboard_overlay_view.cc @@ -9,8 +9,8 @@ #include "base/strings/utf_string_conversions.h" #include "content/public/browser/browser_context.h" #include "grit/ash_strings.h" -#include "ui/base/events/event.h" #include "ui/base/l10n/l10n_util.h" +#include "ui/events/event.h" #include "ui/gfx/screen.h" #include "ui/views/widget/widget.h" #include "ui/web_dialogs/web_dialog_delegate.h" diff --git a/ash/launcher/launcher_button.cc b/ash/launcher/launcher_button.cc index 6b9dedd..38b166f2 100644 --- a/ash/launcher/launcher_button.cc +++ b/ash/launcher/launcher_button.cc @@ -12,10 +12,10 @@ #include "grit/ash_resources.h" #include "skia/ext/image_operations.h" #include "ui/base/accessibility/accessible_view_state.h" -#include "ui/base/events/event_constants.h" #include "ui/base/resource/resource_bundle.h" #include "ui/compositor/layer.h" #include "ui/compositor/scoped_layer_animation_settings.h" +#include "ui/events/event_constants.h" #include "ui/gfx/animation/animation_delegate.h" #include "ui/gfx/animation/throb_animation.h" #include "ui/gfx/canvas.h" diff --git a/ash/launcher/launcher_tooltip_manager.cc b/ash/launcher/launcher_tooltip_manager.cc index 901330a..5e99167 100644 --- a/ash/launcher/launcher_tooltip_manager.cc +++ b/ash/launcher/launcher_tooltip_manager.cc @@ -15,8 +15,8 @@ #include "base/timer/timer.h" #include "ui/aura/root_window.h" #include "ui/aura/window.h" -#include "ui/base/events/event.h" -#include "ui/base/events/event_constants.h" +#include "ui/events/event.h" +#include "ui/events/event_constants.h" #include "ui/gfx/insets.h" #include "ui/views/bubble/bubble_delegate.h" #include "ui/views/bubble/bubble_frame_view.h" diff --git a/ash/launcher/launcher_tooltip_manager.h b/ash/launcher/launcher_tooltip_manager.h index 1e2ff3a..4b5bfc6 100644 --- a/ash/launcher/launcher_tooltip_manager.h +++ b/ash/launcher/launcher_tooltip_manager.h @@ -11,7 +11,7 @@ #include "base/basictypes.h" #include "base/memory/weak_ptr.h" #include "base/strings/string16.h" -#include "ui/base/events/event_handler.h" +#include "ui/events/event_handler.h" #include "ui/gfx/rect.h" #include "ui/views/bubble/bubble_border.h" #include "ui/views/bubble/bubble_delegate.h" diff --git a/ash/launcher/launcher_tooltip_manager_unittest.cc b/ash/launcher/launcher_tooltip_manager_unittest.cc index be07208..b0f2289 100644 --- a/ash/launcher/launcher_tooltip_manager_unittest.cc +++ b/ash/launcher/launcher_tooltip_manager_unittest.cc @@ -15,9 +15,9 @@ #include "base/strings/string16.h" #include "base/time/time.h" #include "ui/aura/root_window.h" -#include "ui/base/events/event.h" -#include "ui/base/events/event_constants.h" -#include "ui/base/events/event_handler.h" +#include "ui/events/event.h" +#include "ui/events/event_constants.h" +#include "ui/events/event_handler.h" #include "ui/events/keycodes/keyboard_codes.h" #include "ui/views/widget/widget.h" diff --git a/ash/launcher/launcher_view_unittest.cc b/ash/launcher/launcher_view_unittest.cc index eb5e420..4fc7d7a 100644 --- a/ash/launcher/launcher_view_unittest.cc +++ b/ash/launcher/launcher_view_unittest.cc @@ -33,10 +33,10 @@ #include "ui/aura/test/aura_test_base.h" #include "ui/aura/test/event_generator.h" #include "ui/aura/window.h" -#include "ui/base/events/event.h" -#include "ui/base/events/event_constants.h" #include "ui/base/l10n/l10n_util.h" #include "ui/compositor/layer.h" +#include "ui/events/event.h" +#include "ui/events/event_constants.h" #include "ui/views/view_model.h" #include "ui/views/widget/widget.h" #include "ui/views/widget/widget_delegate.h" diff --git a/ash/magnifier/magnification_controller.cc b/ash/magnifier/magnification_controller.cc index 02a2a8b..c2e269d 100644 --- a/ash/magnifier/magnification_controller.cc +++ b/ash/magnifier/magnification_controller.cc @@ -14,12 +14,12 @@ #include "ui/aura/root_window_transformer.h" #include "ui/aura/window.h" #include "ui/aura/window_property.h" -#include "ui/base/events/event.h" -#include "ui/base/events/event_handler.h" #include "ui/compositor/dip_util.h" #include "ui/compositor/layer.h" #include "ui/compositor/layer_animation_observer.h" #include "ui/compositor/scoped_layer_animation_settings.h" +#include "ui/events/event.h" +#include "ui/events/event_handler.h" #include "ui/gfx/point3_f.h" #include "ui/gfx/point_conversions.h" #include "ui/gfx/point_f.h" diff --git a/ash/magnifier/partial_magnification_controller.h b/ash/magnifier/partial_magnification_controller.h index 1b8c8fb..54c15f3 100644 --- a/ash/magnifier/partial_magnification_controller.h +++ b/ash/magnifier/partial_magnification_controller.h @@ -6,7 +6,7 @@ #define ASH_MAGNIFIER_PARTIAL_MAGNIFICATION_CONTROLLER_H_ #include "ui/aura/window_observer.h" -#include "ui/base/events/event_handler.h" +#include "ui/events/event_handler.h" #include "ui/gfx/point.h" #include "ui/views/widget/widget_observer.h" diff --git a/ash/shelf/overflow_bubble.cc b/ash/shelf/overflow_bubble.cc index 6bf2f96..84a3b8b 100644 --- a/ash/shelf/overflow_bubble.cc +++ b/ash/shelf/overflow_bubble.cc @@ -15,7 +15,7 @@ #include "ash/system/tray/system_tray.h" #include "ui/aura/client/screen_position_client.h" #include "ui/aura/root_window.h" -#include "ui/base/events/event.h" +#include "ui/events/event.h" #include "ui/gfx/insets.h" #include "ui/gfx/screen.h" #include "ui/views/bubble/bubble_delegate.h" diff --git a/ash/shelf/overflow_bubble.h b/ash/shelf/overflow_bubble.h index 1d4dcb9..2b1cf6d 100644 --- a/ash/shelf/overflow_bubble.h +++ b/ash/shelf/overflow_bubble.h @@ -7,7 +7,7 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" -#include "ui/base/events/event_handler.h" +#include "ui/events/event_handler.h" #include "ui/views/widget/widget_observer.h" namespace ui { diff --git a/ash/shelf/shelf_bezel_event_filter.h b/ash/shelf/shelf_bezel_event_filter.h index 5390c4e..33d1f5e 100644 --- a/ash/shelf/shelf_bezel_event_filter.h +++ b/ash/shelf/shelf_bezel_event_filter.h @@ -6,7 +6,7 @@ #define ASH_SHELF_SHELF_BEZEL_EVENT_FILTER_H_ #include "ash/wm/gestures/shelf_gesture_handler.h" -#include "ui/base/events/event_handler.h" +#include "ui/events/event_handler.h" #include "ui/gfx/rect.h" namespace ash { diff --git a/ash/shelf/shelf_layout_manager.cc b/ash/shelf/shelf_layout_manager.cc index 0d94aa4..e023ed8 100644 --- a/ash/shelf/shelf_layout_manager.cc +++ b/ash/shelf/shelf_layout_manager.cc @@ -38,13 +38,13 @@ #include "ui/aura/client/activation_client.h" #include "ui/aura/client/cursor_client.h" #include "ui/aura/root_window.h" -#include "ui/base/events/event.h" -#include "ui/base/events/event_handler.h" #include "ui/base/ui_base_switches.h" #include "ui/compositor/layer.h" #include "ui/compositor/layer_animation_observer.h" #include "ui/compositor/layer_animator.h" #include "ui/compositor/scoped_layer_animation_settings.h" +#include "ui/events/event.h" +#include "ui/events/event_handler.h" #include "ui/gfx/screen.h" #include "ui/views/widget/widget.h" diff --git a/ash/shelf/shelf_widget.cc b/ash/shelf/shelf_widget.cc index b5bb8cd..b98d7a9ef 100644 --- a/ash/shelf/shelf_widget.cc +++ b/ash/shelf/shelf_widget.cc @@ -26,10 +26,10 @@ #include "ui/aura/root_window.h" #include "ui/aura/window.h" #include "ui/aura/window_observer.h" -#include "ui/base/events/event_constants.h" #include "ui/base/resource/resource_bundle.h" #include "ui/compositor/layer.h" #include "ui/compositor/scoped_layer_animation_settings.h" +#include "ui/events/event_constants.h" #include "ui/gfx/canvas.h" #include "ui/gfx/image/image.h" #include "ui/gfx/image/image_skia_operations.h" diff --git a/ash/shell.h b/ash/shell.h index e603bde..944581b 100644 --- a/ash/shell.h +++ b/ash/shell.h @@ -18,8 +18,8 @@ #include "base/memory/scoped_ptr.h" #include "base/observer_list.h" #include "ui/aura/client/activation_change_observer.h" -#include "ui/base/events/event_target.h" #include "ui/base/ui_base_types.h" +#include "ui/events/event_target.h" #include "ui/gfx/insets.h" #include "ui/gfx/screen.h" #include "ui/gfx/size.h" diff --git a/ash/system/chromeos/screen_security/screen_tray_item_unittest.cc b/ash/system/chromeos/screen_security/screen_tray_item_unittest.cc index e51a91f..80f54b4 100644 --- a/ash/system/chromeos/screen_security/screen_tray_item_unittest.cc +++ b/ash/system/chromeos/screen_security/screen_tray_item_unittest.cc @@ -10,7 +10,7 @@ #include "ash/test/ash_test_base.h" #include "base/callback.h" #include "base/strings/utf_string_conversions.h" -#include "ui/base/events/event.h" +#include "ui/events/event.h" #include "ui/gfx/point.h" #include "ui/message_center/message_center.h" #include "ui/views/view.h" diff --git a/ash/system/logout_button/logout_button_tray.cc b/ash/system/logout_button/logout_button_tray.cc index f62921f..c060730 100644 --- a/ash/system/logout_button/logout_button_tray.cc +++ b/ash/system/logout_button/logout_button_tray.cc @@ -14,7 +14,7 @@ #include "base/logging.h" #include "grit/ash_resources.h" #include "third_party/skia/include/core/SkColor.h" -#include "ui/base/events/event.h" +#include "ui/events/event.h" #include "ui/gfx/font.h" #include "ui/gfx/insets.h" #include "ui/gfx/size.h" diff --git a/ash/system/tray/system_tray.cc b/ash/system/tray/system_tray.cc index fa78257..6cb4d72 100644 --- a/ash/system/tray/system_tray.cc +++ b/ash/system/tray/system_tray.cc @@ -34,9 +34,9 @@ #include "base/timer/timer.h" #include "grit/ash_strings.h" #include "ui/aura/root_window.h" -#include "ui/base/events/event_constants.h" #include "ui/base/l10n/l10n_util.h" #include "ui/compositor/layer.h" +#include "ui/events/event_constants.h" #include "ui/gfx/canvas.h" #include "ui/gfx/screen.h" #include "ui/gfx/skia_util.h" diff --git a/ash/system/tray/tray_event_filter.h b/ash/system/tray/tray_event_filter.h index 5ee8e27..4059315 100644 --- a/ash/system/tray/tray_event_filter.h +++ b/ash/system/tray/tray_event_filter.h @@ -8,8 +8,8 @@ #include <set> #include "base/basictypes.h" -#include "ui/base/events/event.h" -#include "ui/base/events/event_handler.h" +#include "ui/events/event.h" +#include "ui/events/event_handler.h" namespace aura { class Window; diff --git a/ash/test/test_activation_delegate.cc b/ash/test/test_activation_delegate.cc index 5ad14d0..f583a05 100644 --- a/ash/test/test_activation_delegate.cc +++ b/ash/test/test_activation_delegate.cc @@ -7,7 +7,7 @@ #include "ash/wm/window_util.h" #include "ui/aura/client/aura_constants.h" #include "ui/aura/window.h" -#include "ui/base/events/event.h" +#include "ui/events/event.h" namespace ash { namespace test { diff --git a/ash/test/test_activation_delegate.h b/ash/test/test_activation_delegate.h index e898e74..02aeb45 100644 --- a/ash/test/test_activation_delegate.h +++ b/ash/test/test_activation_delegate.h @@ -9,7 +9,7 @@ #include "base/logging.h" #include "ui/aura/client/activation_change_observer.h" #include "ui/aura/client/activation_delegate.h" -#include "ui/base/events/event_handler.h" +#include "ui/events/event_handler.h" namespace aura { class Window; diff --git a/ash/touch/touch_hud_debug.cc b/ash/touch/touch_hud_debug.cc index 2953cb9..e46b303 100644 --- a/ash/touch/touch_hud_debug.cc +++ b/ash/touch/touch_hud_debug.cc @@ -13,7 +13,7 @@ #include "base/strings/utf_string_conversions.h" #include "third_party/skia/include/core/SkPath.h" #include "ui/aura/root_window.h" -#include "ui/base/events/event.h" +#include "ui/events/event.h" #include "ui/gfx/animation/animation_delegate.h" #include "ui/gfx/canvas.h" #include "ui/gfx/display.h" diff --git a/ash/touch/touch_hud_projection.cc b/ash/touch/touch_hud_projection.cc index 066c401..7373916 100644 --- a/ash/touch/touch_hud_projection.cc +++ b/ash/touch/touch_hud_projection.cc @@ -8,7 +8,7 @@ #include "ash/shell.h" #include "ash/wm/property_util.h" #include "third_party/skia/include/effects/SkGradientShader.h" -#include "ui/base/events/event.h" +#include "ui/events/event.h" #include "ui/gfx/animation/animation_delegate.h" #include "ui/gfx/animation/linear_animation.h" #include "ui/gfx/canvas.h" diff --git a/ash/touch/touch_observer_hud.h b/ash/touch/touch_observer_hud.h index 70e23a7..b94cc17 100644 --- a/ash/touch/touch_observer_hud.h +++ b/ash/touch/touch_observer_hud.h @@ -7,7 +7,7 @@ #include "ash/ash_export.h" #include "ash/display/display_controller.h" -#include "ui/base/events/event_handler.h" +#include "ui/events/event_handler.h" #include "ui/gfx/display_observer.h" #include "ui/views/widget/widget_observer.h" diff --git a/ash/touch/touch_uma.cc b/ash/touch/touch_uma.cc index f8ab0f1..29f6185 100644 --- a/ash/touch/touch_uma.cc +++ b/ash/touch/touch_uma.cc @@ -11,8 +11,8 @@ #include "ui/aura/root_window.h" #include "ui/aura/window.h" #include "ui/aura/window_property.h" -#include "ui/base/events/event.h" -#include "ui/base/events/event_utils.h" +#include "ui/events/event.h" +#include "ui/events/event_utils.h" #include "ui/gfx/point_conversions.h" #if defined(USE_XI2_MT) diff --git a/ash/wm/app_list_controller.cc b/ash/wm/app_list_controller.cc index 35849bf..89f6a78 100644 --- a/ash/wm/app_list_controller.cc +++ b/ash/wm/app_list_controller.cc @@ -19,9 +19,9 @@ #include "ui/aura/client/focus_client.h" #include "ui/aura/root_window.h" #include "ui/aura/window.h" -#include "ui/base/events/event.h" #include "ui/compositor/layer.h" #include "ui/compositor/scoped_layer_animation_settings.h" +#include "ui/events/event.h" #include "ui/gfx/transform_util.h" #include "ui/views/widget/widget.h" diff --git a/ash/wm/app_list_controller.h b/ash/wm/app_list_controller.h index e359223..3475697 100644 --- a/ash/wm/app_list_controller.h +++ b/ash/wm/app_list_controller.h @@ -13,8 +13,8 @@ #include "ui/app_list/pagination_model_observer.h" #include "ui/aura/client/focus_change_observer.h" #include "ui/aura/window_observer.h" -#include "ui/base/events/event_handler.h" #include "ui/compositor/layer_animation_observer.h" +#include "ui/events/event_handler.h" #include "ui/gfx/rect.h" #include "ui/views/widget/widget_observer.h" diff --git a/ash/wm/base_layout_manager.h b/ash/wm/base_layout_manager.h index c9e49e3..3156f14 100644 --- a/ash/wm/base_layout_manager.h +++ b/ash/wm/base_layout_manager.h @@ -15,8 +15,8 @@ #include "ui/aura/client/activation_change_observer.h" #include "ui/aura/layout_manager.h" #include "ui/aura/window_observer.h" -#include "ui/base/events/event_handler.h" #include "ui/base/ui_base_types.h" +#include "ui/events/event_handler.h" namespace aura { class RootWindow; diff --git a/ash/wm/caption_buttons/frame_maximize_button.cc b/ash/wm/caption_buttons/frame_maximize_button.cc index 198fa8d..db5712f 100644 --- a/ash/wm/caption_buttons/frame_maximize_button.cc +++ b/ash/wm/caption_buttons/frame_maximize_button.cc @@ -19,10 +19,10 @@ #include "grit/ash_strings.h" #include "ui/aura/client/aura_constants.h" #include "ui/aura/window.h" -#include "ui/base/events/event.h" -#include "ui/base/events/event_handler.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" +#include "ui/events/event.h" +#include "ui/events/event_handler.h" #include "ui/gfx/image/image.h" #include "ui/gfx/screen.h" #include "ui/views/widget/widget.h" diff --git a/ash/wm/caption_buttons/frame_maximize_button_unittest.cc b/ash/wm/caption_buttons/frame_maximize_button_unittest.cc index adc4c26..d0b43b2 100644 --- a/ash/wm/caption_buttons/frame_maximize_button_unittest.cc +++ b/ash/wm/caption_buttons/frame_maximize_button_unittest.cc @@ -18,8 +18,8 @@ #include "ui/aura/root_window.h" #include "ui/aura/test/event_generator.h" #include "ui/aura/window.h" -#include "ui/base/events/event_utils.h" #include "ui/base/gestures/gesture_configuration.h" +#include "ui/events/event_utils.h" #include "ui/views/widget/widget.h" #include "ui/views/widget/widget_delegate.h" diff --git a/ash/wm/event_rewriter_event_filter.cc b/ash/wm/event_rewriter_event_filter.cc index 315f9c6..369ba15 100644 --- a/ash/wm/event_rewriter_event_filter.cc +++ b/ash/wm/event_rewriter_event_filter.cc @@ -6,7 +6,7 @@ #include "ash/event_rewriter_delegate.h" #include "base/logging.h" -#include "ui/base/events/event.h" +#include "ui/events/event.h" #if defined(OS_CHROMEOS) #include "ash/wm/sticky_keys.h" diff --git a/ash/wm/event_rewriter_event_filter.h b/ash/wm/event_rewriter_event_filter.h index 87cf07f..e109cef 100644 --- a/ash/wm/event_rewriter_event_filter.h +++ b/ash/wm/event_rewriter_event_filter.h @@ -9,7 +9,7 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" #include "base/memory/scoped_ptr.h" -#include "ui/base/events/event_handler.h" +#include "ui/events/event_handler.h" namespace ash { diff --git a/ash/wm/gestures/system_pinch_handler.cc b/ash/wm/gestures/system_pinch_handler.cc index a0f5d12..3b97f5a 100644 --- a/ash/wm/gestures/system_pinch_handler.cc +++ b/ash/wm/gestures/system_pinch_handler.cc @@ -13,9 +13,9 @@ #include "ash/wm/window_util.h" #include "ash/wm/workspace/snap_sizer.h" #include "ui/aura/window.h" -#include "ui/base/events/event_constants.h" #include "ui/base/gestures/gesture_types.h" #include "ui/compositor/scoped_layer_animation_settings.h" +#include "ui/events/event_constants.h" #include "ui/gfx/rect.h" #include "ui/views/widget/widget.h" #include "ui/views/widget/widget_delegate.h" diff --git a/ash/wm/gestures/tray_gesture_handler.cc b/ash/wm/gestures/tray_gesture_handler.cc index 78b0fb3..0d2e8cf 100644 --- a/ash/wm/gestures/tray_gesture_handler.cc +++ b/ash/wm/gestures/tray_gesture_handler.cc @@ -8,8 +8,8 @@ #include "ash/system/tray/system_tray.h" #include "ash/system/tray/system_tray_bubble.h" #include "ui/aura/window.h" -#include "ui/base/events/event.h" #include "ui/compositor/layer.h" +#include "ui/events/event.h" #include "ui/gfx/transform.h" #include "ui/views/widget/widget.h" diff --git a/ash/wm/gestures/two_finger_drag_handler.cc b/ash/wm/gestures/two_finger_drag_handler.cc index 49f7ecc..c379f54 100644 --- a/ash/wm/gestures/two_finger_drag_handler.cc +++ b/ash/wm/gestures/two_finger_drag_handler.cc @@ -10,11 +10,11 @@ #include "ui/aura/client/window_types.h" #include "ui/aura/window.h" #include "ui/aura/window_delegate.h" -#include "ui/base/events/event.h" -#include "ui/base/events/event_constants.h" #include "ui/base/hit_test.h" #include "ui/compositor/layer.h" #include "ui/compositor/scoped_layer_animation_settings.h" +#include "ui/events/event.h" +#include "ui/events/event_constants.h" namespace { diff --git a/ash/wm/mru_window_tracker.cc b/ash/wm/mru_window_tracker.cc index a476b3e..8b31c17 100644 --- a/ash/wm/mru_window_tracker.cc +++ b/ash/wm/mru_window_tracker.cc @@ -14,8 +14,8 @@ #include "ash/wm/workspace_controller.h" #include "ui/aura/client/activation_client.h" #include "ui/aura/root_window.h" -#include "ui/base/events/event.h" -#include "ui/base/events/event_handler.h" +#include "ui/events/event.h" +#include "ui/events/event_handler.h" namespace ash { diff --git a/ash/wm/overlay_event_filter.cc b/ash/wm/overlay_event_filter.cc index 2319d2f..07db4f3 100644 --- a/ash/wm/overlay_event_filter.cc +++ b/ash/wm/overlay_event_filter.cc @@ -7,7 +7,7 @@ #include "ash/wm/partial_screenshot_view.h" #include "ui/aura/window.h" #include "ui/aura/window_delegate.h" -#include "ui/base/events/event.h" +#include "ui/events/event.h" #include "ui/views/widget/widget.h" namespace ash { diff --git a/ash/wm/overlay_event_filter.h b/ash/wm/overlay_event_filter.h index 1989e45..0d5afb6 100644 --- a/ash/wm/overlay_event_filter.h +++ b/ash/wm/overlay_event_filter.h @@ -8,7 +8,7 @@ #include "ash/shell_observer.h" #include "base/compiler_specific.h" #include "ui/aura/window.h" -#include "ui/base/events/event_handler.h" +#include "ui/events/event_handler.h" namespace ash { namespace internal { diff --git a/ash/wm/overview/window_overview.cc b/ash/wm/overview/window_overview.cc index 3411c76..5674d3e 100644 --- a/ash/wm/overview/window_overview.cc +++ b/ash/wm/overview/window_overview.cc @@ -14,8 +14,8 @@ #include "third_party/skia/include/core/SkColor.h" #include "ui/aura/root_window.h" #include "ui/aura/window.h" -#include "ui/base/events/event.h" #include "ui/compositor/scoped_layer_animation_settings.h" +#include "ui/events/event.h" #include "ui/views/widget/widget.h" namespace ash { diff --git a/ash/wm/overview/window_overview.h b/ash/wm/overview/window_overview.h index 96f546b..b8c81db 100644 --- a/ash/wm/overview/window_overview.h +++ b/ash/wm/overview/window_overview.h @@ -8,7 +8,7 @@ #include "base/compiler_specific.h" #include "base/memory/scoped_ptr.h" #include "base/memory/scoped_vector.h" -#include "ui/base/events/event_handler.h" +#include "ui/events/event_handler.h" namespace aura { class Window; diff --git a/ash/wm/overview/window_selector.cc b/ash/wm/overview/window_selector.cc index b6a9beb..6989749 100644 --- a/ash/wm/overview/window_selector.cc +++ b/ash/wm/overview/window_selector.cc @@ -19,8 +19,8 @@ #include "ui/aura/client/focus_client.h" #include "ui/aura/root_window.h" #include "ui/aura/window.h" -#include "ui/base/events/event.h" -#include "ui/base/events/event_handler.h" +#include "ui/events/event.h" +#include "ui/events/event_handler.h" namespace ash { diff --git a/ash/wm/panels/panel_window_event_handler.cc b/ash/wm/panels/panel_window_event_handler.cc index 7f00e55..b15d8b6 100644 --- a/ash/wm/panels/panel_window_event_handler.cc +++ b/ash/wm/panels/panel_window_event_handler.cc @@ -7,8 +7,8 @@ #include "ui/aura/client/aura_constants.h" #include "ui/aura/window.h" #include "ui/aura/window_delegate.h" -#include "ui/base/events/event.h" #include "ui/base/hit_test.h" +#include "ui/events/event.h" namespace ash { namespace internal { diff --git a/ash/wm/partial_screenshot_view.cc b/ash/wm/partial_screenshot_view.cc index 1b2fa66..e3f5528 100644 --- a/ash/wm/partial_screenshot_view.cc +++ b/ash/wm/partial_screenshot_view.cc @@ -14,7 +14,7 @@ #include "ui/aura/client/capture_client.h" #include "ui/aura/root_window.h" #include "ui/base/cursor/cursor.h" -#include "ui/base/events/event.h" +#include "ui/events/event.h" #include "ui/gfx/canvas.h" #include "ui/gfx/rect.h" #include "ui/views/view.h" diff --git a/ash/wm/sticky_keys.cc b/ash/wm/sticky_keys.cc index dd2c75a..74a8699 100644 --- a/ash/wm/sticky_keys.cc +++ b/ash/wm/sticky_keys.cc @@ -10,7 +10,7 @@ #include "base/basictypes.h" #include "base/debug/stack_trace.h" #include "ui/aura/root_window.h" -#include "ui/base/events/event.h" +#include "ui/events/event.h" #include "ui/events/keycodes/keyboard_code_conversion.h" namespace ash { diff --git a/ash/wm/sticky_keys.h b/ash/wm/sticky_keys.h index 8a4bc68..7a75a43 100644 --- a/ash/wm/sticky_keys.h +++ b/ash/wm/sticky_keys.h @@ -7,7 +7,7 @@ #include "ash/ash_export.h" #include "base/memory/scoped_ptr.h" -#include "ui/base/events/event_constants.h" +#include "ui/events/event_constants.h" namespace ui { class KeyEvent; diff --git a/ash/wm/system_gesture_event_filter.cc b/ash/wm/system_gesture_event_filter.cc index 4371bd0..98e5abf 100644 --- a/ash/wm/system_gesture_event_filter.cc +++ b/ash/wm/system_gesture_event_filter.cc @@ -17,8 +17,8 @@ #include "ash/wm/window_util.h" #include "base/command_line.h" #include "ui/aura/root_window.h" -#include "ui/base/events/event.h" #include "ui/base/ui_base_switches.h" +#include "ui/events/event.h" #if defined(OS_CHROMEOS) #include "ui/base/touch/touch_factory_x11.h" diff --git a/ash/wm/system_gesture_event_filter.h b/ash/wm/system_gesture_event_filter.h index 303751b..aa85688 100644 --- a/ash/wm/system_gesture_event_filter.h +++ b/ash/wm/system_gesture_event_filter.h @@ -9,7 +9,7 @@ #include "ash/touch/touch_uma.h" #include "base/timer/timer.h" #include "ui/aura/window_observer.h" -#include "ui/base/events/event_handler.h" +#include "ui/events/event_handler.h" #include "ui/gfx/point.h" #include <map> diff --git a/ash/wm/system_gesture_event_filter_unittest.cc b/ash/wm/system_gesture_event_filter_unittest.cc index b54364e..c7305a0 100644 --- a/ash/wm/system_gesture_event_filter_unittest.cc +++ b/ash/wm/system_gesture_event_filter_unittest.cc @@ -25,11 +25,11 @@ #include "ui/aura/root_window.h" #include "ui/aura/test/event_generator.h" #include "ui/aura/test/test_windows.h" -#include "ui/base/events/event.h" -#include "ui/base/events/event_utils.h" #include "ui/base/gestures/gesture_configuration.h" #include "ui/base/hit_test.h" #include "ui/base/ui_base_switches.h" +#include "ui/events/event.h" +#include "ui/events/event_utils.h" #include "ui/gfx/screen.h" #include "ui/gfx/size.h" #include "ui/views/widget/widget_delegate.h" diff --git a/ash/wm/system_modal_container_event_filter.cc b/ash/wm/system_modal_container_event_filter.cc index 532bb44..4412a9c 100644 --- a/ash/wm/system_modal_container_event_filter.cc +++ b/ash/wm/system_modal_container_event_filter.cc @@ -6,7 +6,7 @@ #include "ash/wm/system_modal_container_event_filter_delegate.h" #include "ui/aura/window.h" -#include "ui/base/events/event.h" +#include "ui/events/event.h" namespace ash { namespace internal { diff --git a/ash/wm/system_modal_container_event_filter.h b/ash/wm/system_modal_container_event_filter.h index 64d522d..e1f2e8e 100644 --- a/ash/wm/system_modal_container_event_filter.h +++ b/ash/wm/system_modal_container_event_filter.h @@ -8,7 +8,7 @@ #include "ash/ash_export.h" #include "base/basictypes.h" #include "base/compiler_specific.h" -#include "ui/base/events/event_handler.h" +#include "ui/events/event_handler.h" namespace ash { namespace internal { diff --git a/ash/wm/system_modal_container_layout_manager.cc b/ash/wm/system_modal_container_layout_manager.cc index 4530026..99889d2 100644 --- a/ash/wm/system_modal_container_layout_manager.cc +++ b/ash/wm/system_modal_container_layout_manager.cc @@ -15,11 +15,11 @@ #include "ui/aura/client/capture_client.h" #include "ui/aura/root_window.h" #include "ui/aura/window.h" -#include "ui/base/events/event.h" #include "ui/base/ui_base_switches_util.h" #include "ui/compositor/layer.h" #include "ui/compositor/layer_animator.h" #include "ui/compositor/scoped_layer_animation_settings.h" +#include "ui/events/event.h" #include "ui/gfx/screen.h" #include "ui/views/corewm/compound_event_filter.h" #include "ui/views/view.h" diff --git a/ash/wm/toplevel_window_event_handler.cc b/ash/wm/toplevel_window_event_handler.cc index 49fc910..d58087d 100644 --- a/ash/wm/toplevel_window_event_handler.cc +++ b/ash/wm/toplevel_window_event_handler.cc @@ -21,13 +21,13 @@ #include "ui/aura/window_delegate.h" #include "ui/aura/window_observer.h" #include "ui/base/cursor/cursor.h" -#include "ui/base/events/event.h" -#include "ui/base/events/event_utils.h" #include "ui/base/gestures/gesture_recognizer.h" #include "ui/base/hit_test.h" #include "ui/base/ui_base_types.h" #include "ui/compositor/layer.h" #include "ui/compositor/scoped_layer_animation_settings.h" +#include "ui/events/event.h" +#include "ui/events/event_utils.h" #include "ui/gfx/screen.h" namespace { diff --git a/ash/wm/toplevel_window_event_handler.h b/ash/wm/toplevel_window_event_handler.h index 89ad46a..98c9296 100644 --- a/ash/wm/toplevel_window_event_handler.h +++ b/ash/wm/toplevel_window_event_handler.h @@ -13,7 +13,7 @@ #include "base/compiler_specific.h" #include "base/memory/scoped_ptr.h" #include "ui/aura/client/window_move_client.h" -#include "ui/base/events/event_handler.h" +#include "ui/events/event_handler.h" #include "ui/gfx/point.h" #include "ui/gfx/rect.h" diff --git a/ash/wm/toplevel_window_event_handler_unittest.cc b/ash/wm/toplevel_window_event_handler_unittest.cc index f92f0f0..ab6012e 100644 --- a/ash/wm/toplevel_window_event_handler_unittest.cc +++ b/ash/wm/toplevel_window_event_handler_unittest.cc @@ -25,8 +25,8 @@ #include "ui/aura/test/event_generator.h" #include "ui/aura/test/test_activation_client.h" #include "ui/aura/test/test_window_delegate.h" -#include "ui/base/events/event.h" #include "ui/base/hit_test.h" +#include "ui/events/event.h" #include "ui/gfx/screen.h" #if defined(OS_WIN) diff --git a/ash/wm/user_activity_detector.cc b/ash/wm/user_activity_detector.cc index 269b9ef..21503f3 100644 --- a/ash/wm/user_activity_detector.cc +++ b/ash/wm/user_activity_detector.cc @@ -6,7 +6,7 @@ #include "ash/wm/property_util.h" #include "ash/wm/user_activity_observer.h" -#include "ui/base/events/event.h" +#include "ui/events/event.h" namespace ash { diff --git a/ash/wm/user_activity_detector.h b/ash/wm/user_activity_detector.h index ca01ec1..1140c3d 100644 --- a/ash/wm/user_activity_detector.h +++ b/ash/wm/user_activity_detector.h @@ -10,7 +10,7 @@ #include "base/compiler_specific.h" #include "base/observer_list.h" #include "base/time/time.h" -#include "ui/base/events/event_handler.h" +#include "ui/events/event_handler.h" namespace ash { diff --git a/ash/wm/user_activity_detector_unittest.cc b/ash/wm/user_activity_detector_unittest.cc index 6c58200..89f6aee 100644 --- a/ash/wm/user_activity_detector_unittest.cc +++ b/ash/wm/user_activity_detector_unittest.cc @@ -12,8 +12,8 @@ #include "base/time/time.h" #include "ui/aura/test/test_windows.h" #include "ui/aura/window.h" -#include "ui/base/events/event.h" -#include "ui/base/events/event_constants.h" +#include "ui/events/event.h" +#include "ui/events/event_constants.h" #include "ui/events/keycodes/keyboard_codes.h" #include "ui/gfx/point.h" diff --git a/ash/wm/window_cycle_controller.cc b/ash/wm/window_cycle_controller.cc index 413d0da..703080f 100644 --- a/ash/wm/window_cycle_controller.cc +++ b/ash/wm/window_cycle_controller.cc @@ -14,8 +14,8 @@ #include "ash/wm/window_util.h" #include "ash/wm/workspace_controller.h" #include "ui/aura/root_window.h" -#include "ui/base/events/event.h" -#include "ui/base/events/event_handler.h" +#include "ui/events/event.h" +#include "ui/events/event_handler.h" namespace ash { diff --git a/ash/wm/window_manager_unittest.cc b/ash/wm/window_manager_unittest.cc index 52016cf6..75307ae 100644 --- a/ash/wm/window_manager_unittest.cc +++ b/ash/wm/window_manager_unittest.cc @@ -20,9 +20,9 @@ #include "ui/aura/test/test_window_delegate.h" #include "ui/aura/test/test_windows.h" #include "ui/base/cursor/cursor.h" -#include "ui/base/events/event.h" -#include "ui/base/events/event_utils.h" #include "ui/base/hit_test.h" +#include "ui/events/event.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" diff --git a/ash/wm/workspace/workspace_event_handler.cc b/ash/wm/workspace/workspace_event_handler.cc index b46d3de..870a925 100644 --- a/ash/wm/workspace/workspace_event_handler.cc +++ b/ash/wm/workspace/workspace_event_handler.cc @@ -15,10 +15,10 @@ #include "ui/aura/client/aura_constants.h" #include "ui/aura/window.h" #include "ui/aura/window_delegate.h" -#include "ui/base/events/event.h" -#include "ui/base/events/event_utils.h" #include "ui/base/hit_test.h" #include "ui/compositor/scoped_layer_animation_settings.h" +#include "ui/events/event.h" +#include "ui/events/event_utils.h" #include "ui/gfx/screen.h" namespace ash { diff --git a/ash/wm/workspace/workspace_layout_manager.cc b/ash/wm/workspace/workspace_layout_manager.cc index 8870b36..6d2ff18 100644 --- a/ash/wm/workspace/workspace_layout_manager.cc +++ b/ash/wm/workspace/workspace_layout_manager.cc @@ -21,8 +21,8 @@ #include "ui/aura/root_window.h" #include "ui/aura/window.h" #include "ui/aura/window_observer.h" -#include "ui/base/events/event.h" #include "ui/base/ui_base_types.h" +#include "ui/events/event.h" #include "ui/views/corewm/window_util.h" using aura::Window; diff --git a/chrome/browser/automation/testing_automation_provider.cc b/chrome/browser/automation/testing_automation_provider.cc index f2cb0dd..2eb3b0a 100644 --- a/chrome/browser/automation/testing_automation_provider.cc +++ b/chrome/browser/automation/testing_automation_provider.cc @@ -144,8 +144,8 @@ #include "extensions/common/url_pattern_set.h" #include "net/cookies/cookie_store.h" #include "third_party/WebKit/public/web/WebInputEvent.h" -#include "ui/base/events/event_constants.h" #include "ui/base/ui_base_types.h" +#include "ui/events/event_constants.h" #include "ui/events/keycodes/keyboard_codes.h" #if defined(ENABLE_CONFIGURATION_POLICY) diff --git a/chrome/browser/bookmarks/bookmark_utils.cc b/chrome/browser/bookmarks/bookmark_utils.cc index a8a1515..f6ddf6c 100644 --- a/chrome/browser/bookmarks/bookmark_utils.cc +++ b/chrome/browser/bookmarks/bookmark_utils.cc @@ -22,8 +22,8 @@ #include "components/user_prefs/pref_registry_syncable.h" #include "content/public/browser/user_metrics.h" #include "net/base/net_util.h" -#include "ui/base/events/event.h" #include "ui/base/models/tree_node_iterator.h" +#include "ui/events/event.h" using base::Time; using content::UserMetricsAction; diff --git a/chrome/browser/chromeos/device_uma.cc b/chrome/browser/chromeos/device_uma.cc index 2bba70e..3aee057 100644 --- a/chrome/browser/chromeos/device_uma.cc +++ b/chrome/browser/chromeos/device_uma.cc @@ -10,9 +10,9 @@ #include "base/logging.h" #include "base/memory/singleton.h" #include "base/metrics/histogram.h" -#include "ui/base/events/event_constants.h" -#include "ui/base/events/event_utils.h" #include "ui/base/x/device_data_manager.h" +#include "ui/events/event_constants.h" +#include "ui/events/event_utils.h" // Enum type for CrOS gesture lib UMA enum UMACrosGestureMetricsType{ diff --git a/chrome/browser/chromeos/keyboard_driven_event_rewriter.cc b/chrome/browser/chromeos/keyboard_driven_event_rewriter.cc index 121116c..7a1742c 100644 --- a/chrome/browser/chromeos/keyboard_driven_event_rewriter.cc +++ b/chrome/browser/chromeos/keyboard_driven_event_rewriter.cc @@ -8,7 +8,7 @@ #include "chrome/browser/chromeos/login/user_manager.h" #include "chrome/browser/chromeos/system/input_device_settings.h" -#include "ui/base/events/event.h" +#include "ui/events/event.h" namespace chromeos { diff --git a/chrome/browser/chromeos/keyboard_driven_event_rewriter_unittest.cc b/chrome/browser/chromeos/keyboard_driven_event_rewriter_unittest.cc index c197400..bad1aaa 100644 --- a/chrome/browser/chromeos/keyboard_driven_event_rewriter_unittest.cc +++ b/chrome/browser/chromeos/keyboard_driven_event_rewriter_unittest.cc @@ -7,8 +7,8 @@ #include "base/strings/stringprintf.h" #include "chrome/browser/chromeos/keyboard_driven_event_rewriter.h" #include "testing/gtest/include/gtest/gtest.h" -#include "ui/base/events/event.h" #include "ui/base/x/x11_util.h" +#include "ui/events/event.h" #include <X11/keysym.h> #include <X11/XF86keysym.h> diff --git a/chrome/browser/chromeos/login/login_display_host_impl.cc b/chrome/browser/chromeos/login/login_display_host_impl.cc index 36cdabe..98f6d51 100644 --- a/chrome/browser/chromeos/login/login_display_host_impl.cc +++ b/chrome/browser/chromeos/login/login_display_host_impl.cc @@ -62,13 +62,13 @@ #include "content/public/browser/web_contents_view.h" #include "content/public/browser/web_ui.h" #include "ui/aura/window.h" -#include "ui/base/events/event_utils.h" #include "ui/base/resource/resource_bundle.h" #include "ui/compositor/layer.h" #include "ui/compositor/layer_animation_element.h" #include "ui/compositor/layer_animation_sequence.h" #include "ui/compositor/layer_animator.h" #include "ui/compositor/scoped_layer_animation_settings.h" +#include "ui/events/event_utils.h" #include "ui/gfx/rect.h" #include "ui/gfx/transform.h" #include "ui/views/focus/focus_manager.h" diff --git a/chrome/browser/chromeos/options/vpn_config_view.cc b/chrome/browser/chromeos/options/vpn_config_view.cc index e247b77..cfbd30f 100644 --- a/chrome/browser/chromeos/options/vpn_config_view.cc +++ b/chrome/browser/chromeos/options/vpn_config_view.cc @@ -23,10 +23,10 @@ #include "grit/locale_settings.h" #include "grit/theme_resources.h" #include "third_party/cros_system_api/dbus/service_constants.h" -#include "ui/base/events/event.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/models/combobox_model.h" #include "ui/base/resource/resource_bundle.h" +#include "ui/events/event.h" #include "ui/views/controls/button/checkbox.h" #include "ui/views/controls/combobox/combobox.h" #include "ui/views/controls/label.h" diff --git a/chrome/browser/chromeos/options/wifi_config_view.cc b/chrome/browser/chromeos/options/wifi_config_view.cc index 603153d..869ea65 100644 --- a/chrome/browser/chromeos/options/wifi_config_view.cc +++ b/chrome/browser/chromeos/options/wifi_config_view.cc @@ -25,9 +25,9 @@ #include "grit/locale_settings.h" #include "grit/theme_resources.h" #include "third_party/cros_system_api/dbus/service_constants.h" -#include "ui/base/events/event.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" +#include "ui/events/event.h" #include "ui/views/controls/button/checkbox.h" #include "ui/views/controls/button/image_button.h" #include "ui/views/controls/combobox/combobox.h" diff --git a/chrome/browser/chromeos/options/wimax_config_view.cc b/chrome/browser/chromeos/options/wimax_config_view.cc index f792b33..288ae22 100644 --- a/chrome/browser/chromeos/options/wimax_config_view.cc +++ b/chrome/browser/chromeos/options/wimax_config_view.cc @@ -24,9 +24,9 @@ #include "grit/locale_settings.h" #include "grit/theme_resources.h" #include "third_party/cros_system_api/dbus/service_constants.h" -#include "ui/base/events/event.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" +#include "ui/events/event.h" #include "ui/views/controls/button/checkbox.h" #include "ui/views/controls/button/image_button.h" #include "ui/views/controls/label.h" diff --git a/chrome/browser/chromeos/power/user_activity_notifier.cc b/chrome/browser/chromeos/power/user_activity_notifier.cc index b83538f..02aea36 100644 --- a/chrome/browser/chromeos/power/user_activity_notifier.cc +++ b/chrome/browser/chromeos/power/user_activity_notifier.cc @@ -8,8 +8,8 @@ #include "ash/wm/user_activity_detector.h" #include "chromeos/dbus/dbus_thread_manager.h" #include "chromeos/dbus/power_manager_client.h" -#include "ui/base/events/event.h" -#include "ui/base/events/event_constants.h" +#include "ui/events/event.h" +#include "ui/events/event_constants.h" #include "ui/events/keycodes/keyboard_codes_posix.h" namespace { diff --git a/chrome/browser/chromeos/preferences.cc b/chrome/browser/chromeos/preferences.cc index 8fe5367..df79eca 100644 --- a/chrome/browser/chromeos/preferences.cc +++ b/chrome/browser/chromeos/preferences.cc @@ -35,8 +35,8 @@ #include "chromeos/ime/xkeyboard.h" #include "components/user_prefs/pref_registry_syncable.h" #include "third_party/icu/source/i18n/unicode/timezone.h" -#include "ui/base/events/event_constants.h" -#include "ui/base/events/event_utils.h" +#include "ui/events/event_constants.h" +#include "ui/events/event_utils.h" #include "url/gurl.h" namespace chromeos { diff --git a/chrome/browser/chromeos/swap_metrics.cc b/chrome/browser/chromeos/swap_metrics.cc index 974fcc8..8ced1c9 100644 --- a/chrome/browser/chromeos/swap_metrics.cc +++ b/chrome/browser/chromeos/swap_metrics.cc @@ -22,7 +22,7 @@ #include "chrome/browser/ui/browser_list.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" #include "content/public/browser/browser_thread.h" -#include "ui/base/events/event.h" +#include "ui/events/event.h" using base::FilePath; diff --git a/chrome/browser/chromeos/swap_metrics.h b/chrome/browser/chromeos/swap_metrics.h index ccda9db..8da72d2 100644 --- a/chrome/browser/chromeos/swap_metrics.h +++ b/chrome/browser/chromeos/swap_metrics.h @@ -12,7 +12,7 @@ #include "base/memory/ref_counted.h" #include "chrome/browser/ui/browser_list_observer.h" #include "chrome/browser/ui/tabs/tab_strip_model_observer.h" -#include "ui/base/events/event_handler.h" +#include "ui/events/event_handler.h" namespace base { class FilePath; diff --git a/chrome/browser/extensions/api/input/input.cc b/chrome/browser/extensions/api/input/input.cc index b0e57fd..ca2adfc 100644 --- a/chrome/browser/extensions/api/input/input.cc +++ b/chrome/browser/extensions/api/input/input.cc @@ -9,7 +9,7 @@ #include "base/strings/string16.h" #include "chrome/browser/extensions/extension_function_registry.h" #include "content/public/browser/browser_thread.h" -#include "ui/base/events/event.h" +#include "ui/events/event.h" #include "ui/keyboard/keyboard_controller.h" #if defined(USE_ASH) diff --git a/chrome/browser/history/redirect_browsertest.cc b/chrome/browser/history/redirect_browsertest.cc index b81ef92..100eb88 100644 --- a/chrome/browser/history/redirect_browsertest.cc +++ b/chrome/browser/history/redirect_browsertest.cc @@ -30,7 +30,7 @@ #include "content/public/test/test_navigation_observer.h" #include "net/base/net_util.h" #include "net/test/spawned_test_server/spawned_test_server.h" -#include "ui/base/events/event_constants.h" +#include "ui/events/event_constants.h" class RedirectTest : public InProcessBrowserTest { public: diff --git a/chrome/browser/ui/ash/event_rewriter.cc b/chrome/browser/ui/ash/event_rewriter.cc index 3d4bba3..cc3633a 100644 --- a/chrome/browser/ui/ash/event_rewriter.cc +++ b/chrome/browser/ui/ash/event_rewriter.cc @@ -12,8 +12,8 @@ #include "base/strings/string_util.h" #include "chrome/browser/profiles/profile_manager.h" #include "ui/aura/root_window.h" -#include "ui/base/events/event.h" -#include "ui/base/events/event_utils.h" +#include "ui/events/event.h" +#include "ui/events/event_utils.h" #include "ui/events/keycodes/keyboard_code_conversion.h" #if defined(OS_CHROMEOS) diff --git a/chrome/browser/ui/ash/event_rewriter_unittest.cc b/chrome/browser/ui/ash/event_rewriter_unittest.cc index d24774f..dc2dd86 100644 --- a/chrome/browser/ui/ash/event_rewriter_unittest.cc +++ b/chrome/browser/ui/ash/event_rewriter_unittest.cc @@ -11,7 +11,7 @@ #include "chrome/common/pref_names.h" #include "chrome/test/base/testing_pref_service_syncable.h" #include "testing/gtest/include/gtest/gtest.h" -#include "ui/base/events/event.h" +#include "ui/events/event.h" #if defined(OS_CHROMEOS) #include <X11/keysym.h> diff --git a/chrome/browser/ui/ash/ime_controller_chromeos_unittest.cc b/chrome/browser/ui/ash/ime_controller_chromeos_unittest.cc index 3ffa871..560039e 100644 --- a/chrome/browser/ui/ash/ime_controller_chromeos_unittest.cc +++ b/chrome/browser/ui/ash/ime_controller_chromeos_unittest.cc @@ -9,7 +9,7 @@ #include "chrome/browser/chromeos/input_method/mock_input_method_manager.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/base/accelerators/accelerator.h" -#include "ui/base/events/event_constants.h" +#include "ui/events/event_constants.h" #include "ui/events/keycodes/keyboard_codes.h" class ImeControllerTest : public testing::Test { 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 ec5ccab..edd1c1b 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 @@ -22,7 +22,7 @@ #include "chrome/common/extensions/manifest_handlers/app_launch_info.h" #include "content/public/browser/web_contents.h" #include "ui/aura/window.h" -#include "ui/base/events/event.h" +#include "ui/events/event.h" #include "ui/views/corewm/window_animations.h" using extensions::Extension; 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 5e1e8c5..ae6d444 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 @@ -28,9 +28,9 @@ #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "ui/aura/window.h" -#include "ui/base/events/event.h" #include "ui/base/l10n/l10n_util.h" #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" diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_app_menu_item_browser.cc b/chrome/browser/ui/ash/launcher/chrome_launcher_app_menu_item_browser.cc index 9ca859d..903d36e 100644 --- a/chrome/browser/ui/ash/launcher/chrome_launcher_app_menu_item_browser.cc +++ b/chrome/browser/ui/ash/launcher/chrome_launcher_app_menu_item_browser.cc @@ -11,7 +11,7 @@ #include "chrome/browser/ui/browser_window.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" #include "content/public/browser/notification_service.h" -#include "ui/base/events/event_constants.h" +#include "ui/events/event_constants.h" ChromeLauncherAppMenuItemBrowser::ChromeLauncherAppMenuItemBrowser( const string16 title, diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_app_menu_item_tab.cc b/chrome/browser/ui/ash/launcher/chrome_launcher_app_menu_item_tab.cc index 294c2f1..3b9864f 100644 --- a/chrome/browser/ui/ash/launcher/chrome_launcher_app_menu_item_tab.cc +++ b/chrome/browser/ui/ash/launcher/chrome_launcher_app_menu_item_tab.cc @@ -9,7 +9,7 @@ #include "chrome/browser/ui/browser_finder.h" #include "chrome/browser/ui/browser_window.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" -#include "ui/base/events/event_constants.h" +#include "ui/events/event_constants.h" ChromeLauncherAppMenuItemTab::ChromeLauncherAppMenuItemTab( const string16 title, diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc index a0b39fa..41b3058 100644 --- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc +++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc @@ -54,7 +54,7 @@ #include "ui/aura/client/aura_constants.h" #include "ui/aura/test/event_generator.h" #include "ui/aura/window.h" -#include "ui/base/events/event.h" +#include "ui/events/event.h" using apps::ShellWindow; using extensions::Extension; diff --git a/chrome/browser/ui/ash/launcher/shell_window_launcher_item_controller.cc b/chrome/browser/ui/ash/launcher/shell_window_launcher_item_controller.cc index 5eaf111..ec551c1 100644 --- a/chrome/browser/ui/ash/launcher/shell_window_launcher_item_controller.cc +++ b/chrome/browser/ui/ash/launcher/shell_window_launcher_item_controller.cc @@ -15,7 +15,7 @@ #include "content/public/browser/web_contents.h" #include "ui/aura/client/aura_constants.h" #include "ui/aura/window.h" -#include "ui/base/events/event.h" +#include "ui/events/event.h" #include "ui/views/corewm/window_animations.h" using apps::ShellWindow; diff --git a/chrome/browser/ui/autofill/autofill_dialog_controller_impl.cc b/chrome/browser/ui/autofill/autofill_dialog_controller_impl.cc index e0a7bcf..dc3a217 100644 --- a/chrome/browser/ui/autofill/autofill_dialog_controller_impl.cc +++ b/chrome/browser/ui/autofill/autofill_dialog_controller_impl.cc @@ -79,10 +79,10 @@ #include "grit/webkit_resources.h" #include "net/cert/cert_status_flags.h" #include "ui/base/base_window.h" -#include "ui/base/events/event.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/models/combobox_model.h" #include "ui/base/resource/resource_bundle.h" +#include "ui/events/event.h" #include "ui/gfx/canvas.h" #include "ui/gfx/image/image_skia_operations.h" #include "ui/gfx/skia_util.h" diff --git a/chrome/browser/ui/autofill/autofill_popup_controller_impl.cc b/chrome/browser/ui/autofill/autofill_popup_controller_impl.cc index 837025f..d6db9da 100644 --- a/chrome/browser/ui/autofill/autofill_popup_controller_impl.cc +++ b/chrome/browser/ui/autofill/autofill_popup_controller_impl.cc @@ -14,7 +14,7 @@ #include "content/public/browser/native_web_keyboard_event.h" #include "grit/webkit_resources.h" #include "third_party/WebKit/public/web/WebAutofillClient.h" -#include "ui/base/events/event.h" +#include "ui/events/event.h" #include "ui/gfx/display.h" #include "ui/gfx/rect_conversions.h" #include "ui/gfx/screen.h" diff --git a/chrome/browser/ui/bookmarks/bookmark_bubble_sign_in_delegate_unittest.cc b/chrome/browser/ui/bookmarks/bookmark_bubble_sign_in_delegate_unittest.cc index 64de69e..781ae68 100644 --- a/chrome/browser/ui/bookmarks/bookmark_bubble_sign_in_delegate_unittest.cc +++ b/chrome/browser/ui/bookmarks/bookmark_bubble_sign_in_delegate_unittest.cc @@ -12,7 +12,7 @@ #include "chrome/browser/ui/tabs/tab_strip_model.h" #include "chrome/test/base/browser_with_test_window_test.h" #include "chrome/test/base/testing_profile.h" -#include "ui/base/events/event_constants.h" +#include "ui/events/event_constants.h" #include "ui/gfx/range/range.h" class BookmarkBubbleSignInDelegateTest : public BrowserWithTestWindowTest { diff --git a/chrome/browser/ui/gtk/accelerators_gtk.cc b/chrome/browser/ui/gtk/accelerators_gtk.cc index 874ecb0..23deda5 100644 --- a/chrome/browser/ui/gtk/accelerators_gtk.cc +++ b/chrome/browser/ui/gtk/accelerators_gtk.cc @@ -11,7 +11,7 @@ #include "base/memory/singleton.h" #include "chrome/app/chrome_command_ids.h" #include "ui/base/accelerators/platform_accelerator_gtk.h" -#include "ui/base/events/event_conversion_gtk.h" +#include "ui/events/event_conversion_gtk.h" #include "ui/events/keycodes/keyboard_code_conversion_gtk.h" namespace { diff --git a/chrome/browser/ui/gtk/event_utils.cc b/chrome/browser/ui/gtk/event_utils.cc index 858fe7d..f61c121 100644 --- a/chrome/browser/ui/gtk/event_utils.cc +++ b/chrome/browser/ui/gtk/event_utils.cc @@ -5,8 +5,8 @@ #include "chrome/browser/ui/gtk/event_utils.h" #include "base/logging.h" -#include "ui/base/events/event_constants.h" #include "ui/base/window_open_disposition.h" +#include "ui/events/event_constants.h" namespace event_utils { diff --git a/chrome/browser/ui/gtk/event_utils_unittest.cc b/chrome/browser/ui/gtk/event_utils_unittest.cc index 35aa3be..b895242 100644 --- a/chrome/browser/ui/gtk/event_utils_unittest.cc +++ b/chrome/browser/ui/gtk/event_utils_unittest.cc @@ -7,7 +7,7 @@ #include "base/basictypes.h" #include "base/strings/stringprintf.h" #include "testing/gtest/include/gtest/gtest.h" -#include "ui/base/events/event_constants.h" +#include "ui/events/event_constants.h" namespace event_utils { diff --git a/chrome/browser/ui/libgtk2ui/gtk2_util.cc b/chrome/browser/ui/libgtk2ui/gtk2_util.cc index ba4b717..d057a2e 100644 --- a/chrome/browser/ui/libgtk2ui/gtk2_util.cc +++ b/chrome/browser/ui/libgtk2ui/gtk2_util.cc @@ -10,7 +10,7 @@ #include "base/environment.h" #include "base/memory/scoped_ptr.h" #include "ui/base/accelerators/accelerator.h" -#include "ui/base/events/event_constants.h" +#include "ui/events/event_constants.h" #include "ui/events/keycodes/keyboard_code_conversion_x.h" #include "ui/gfx/size.h" diff --git a/chrome/browser/ui/omnibox/omnibox_view_browsertest.cc b/chrome/browser/ui/omnibox/omnibox_view_browsertest.cc index eab9aea..8a3b3d8 100644 --- a/chrome/browser/ui/omnibox/omnibox_view_browsertest.cc +++ b/chrome/browser/ui/omnibox/omnibox_view_browsertest.cc @@ -42,7 +42,7 @@ #include "net/dns/mock_host_resolver.h" #include "ui/base/clipboard/clipboard.h" #include "ui/base/clipboard/scoped_clipboard_writer.h" -#include "ui/base/events/event_constants.h" +#include "ui/events/event_constants.h" #include "ui/events/keycodes/keyboard_codes.h" #include "ui/gfx/point.h" diff --git a/chrome/browser/ui/panels/panel_browsertest.cc b/chrome/browser/ui/panels/panel_browsertest.cc index e5db19c..e429973 100644 --- a/chrome/browser/ui/panels/panel_browsertest.cc +++ b/chrome/browser/ui/panels/panel_browsertest.cc @@ -40,7 +40,7 @@ #include "extensions/common/constants.h" #include "net/base/net_util.h" #include "testing/gtest/include/gtest/gtest.h" -#include "ui/base/events/event_utils.h" +#include "ui/events/event_utils.h" #include "ui/gfx/screen.h" using content::WebContents; diff --git a/chrome/browser/ui/views/accelerator_table.cc b/chrome/browser/ui/views/accelerator_table.cc index 5b84d1e..b799cbc 100644 --- a/chrome/browser/ui/views/accelerator_table.cc +++ b/chrome/browser/ui/views/accelerator_table.cc @@ -7,7 +7,7 @@ #include "base/basictypes.h" #include "chrome/app/chrome_command_ids.h" #include "ui/base/accelerators/accelerator.h" -#include "ui/base/events/event_constants.h" +#include "ui/events/event_constants.h" #if defined(USE_ASH) #include "ash/accelerators/accelerator_table.h" diff --git a/chrome/browser/ui/views/accelerator_table_unittest.cc b/chrome/browser/ui/views/accelerator_table_unittest.cc index 9cdf7af..f97303d 100644 --- a/chrome/browser/ui/views/accelerator_table_unittest.cc +++ b/chrome/browser/ui/views/accelerator_table_unittest.cc @@ -7,7 +7,7 @@ #include "base/basictypes.h" #include "chrome/browser/ui/views/accelerator_table.h" #include "testing/gtest/include/gtest/gtest.h" -#include "ui/base/events/event_constants.h" +#include "ui/events/event_constants.h" #if defined(USE_ASH) #include "ash/accelerators/accelerator_table.h" diff --git a/chrome/browser/ui/views/app_menu_button_win.cc b/chrome/browser/ui/views/app_menu_button_win.cc index 3e63d81..f2eadf0 100644 --- a/chrome/browser/ui/views/app_menu_button_win.cc +++ b/chrome/browser/ui/views/app_menu_button_win.cc @@ -4,7 +4,7 @@ #include "chrome/browser/ui/views/app_menu_button_win.h" -#include "ui/base/events/event.h" +#include "ui/events/event.h" #include "ui/gfx/win/hwnd_util.h" #include "ui/views/widget/widget.h" diff --git a/chrome/browser/ui/views/ash/tab_scrubber.cc b/chrome/browser/ui/views/ash/tab_scrubber.cc index 5b106d2..8cf7d97 100644 --- a/chrome/browser/ui/views/ash/tab_scrubber.cc +++ b/chrome/browser/ui/views/ash/tab_scrubber.cc @@ -18,9 +18,9 @@ #include "content/public/browser/notification_service.h" #include "content/public/browser/notification_source.h" #include "ui/aura/window.h" -#include "ui/base/events/event.h" -#include "ui/base/events/event_utils.h" #include "ui/base/gestures/gesture_configuration.h" +#include "ui/events/event.h" +#include "ui/events/event_utils.h" #include "ui/views/controls/glow_hover_controller.h" namespace { diff --git a/chrome/browser/ui/views/ash/tab_scrubber.h b/chrome/browser/ui/views/ash/tab_scrubber.h index 04436ca..29d7d2d 100644 --- a/chrome/browser/ui/views/ash/tab_scrubber.h +++ b/chrome/browser/ui/views/ash/tab_scrubber.h @@ -10,7 +10,7 @@ #include "chrome/browser/ui/views/tabs/tab_strip_observer.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" -#include "ui/base/events/event_handler.h" +#include "ui/events/event_handler.h" class Browser; class TabStrip; diff --git a/chrome/browser/ui/views/ash/tab_scrubber_browsertest.cc b/chrome/browser/ui/views/ash/tab_scrubber_browsertest.cc index 37a9b41..32fabba 100644 --- a/chrome/browser/ui/views/ash/tab_scrubber_browsertest.cc +++ b/chrome/browser/ui/views/ash/tab_scrubber_browsertest.cc @@ -25,7 +25,7 @@ #include "content/public/test/test_utils.h" #include "ui/aura/test/event_generator.h" #include "ui/aura/window.h" -#include "ui/base/events/event_utils.h" +#include "ui/events/event_utils.h" #if defined(OS_CHROMEOS) #include "chromeos/chromeos_switches.h" diff --git a/chrome/browser/ui/views/avatar_label.cc b/chrome/browser/ui/views/avatar_label.cc index fa51b5f..e854be1 100644 --- a/chrome/browser/ui/views/avatar_label.cc +++ b/chrome/browser/ui/views/avatar_label.cc @@ -10,10 +10,10 @@ #include "chrome/browser/ui/views/frame/browser_view.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" -#include "ui/base/events/event.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" #include "ui/base/theme_provider.h" +#include "ui/events/event.h" #include "ui/gfx/canvas.h" #include "ui/gfx/color_utils.h" #include "ui/views/painter.h" diff --git a/chrome/browser/ui/views/bookmarks/bookmark_drag_drop_views.cc b/chrome/browser/ui/views/bookmarks/bookmark_drag_drop_views.cc index 8a3d2b2..0c2de57 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_drag_drop_views.cc +++ b/chrome/browser/ui/views/bookmarks/bookmark_drag_drop_views.cc @@ -13,7 +13,7 @@ #include "components/user_prefs/user_prefs.h" #include "ui/base/dragdrop/drag_drop_types.h" #include "ui/base/dragdrop/os_exchange_data.h" -#include "ui/base/events/event.h" +#include "ui/events/event.h" #include "ui/views/drag_utils.h" #include "ui/views/widget/widget.h" diff --git a/chrome/browser/ui/views/bookmarks/bookmark_editor_view.cc b/chrome/browser/ui/views/bookmarks/bookmark_editor_view.cc index f987e04..750169a 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_editor_view.cc +++ b/chrome/browser/ui/views/bookmarks/bookmark_editor_view.cc @@ -23,8 +23,8 @@ #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" -#include "ui/base/events/event.h" #include "ui/base/l10n/l10n_util.h" +#include "ui/events/event.h" #include "ui/views/background.h" #include "ui/views/controls/button/label_button.h" #include "ui/views/controls/label.h" diff --git a/chrome/browser/ui/views/bookmarks/bookmark_sync_promo_view_unittest.cc b/chrome/browser/ui/views/bookmarks/bookmark_sync_promo_view_unittest.cc index 02459bf..008c32c 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_sync_promo_view_unittest.cc +++ b/chrome/browser/ui/views/bookmarks/bookmark_sync_promo_view_unittest.cc @@ -9,7 +9,7 @@ #include "base/memory/scoped_ptr.h" #include "chrome/browser/ui/bookmarks/bookmark_bubble_delegate.h" #include "testing/gtest/include/gtest/gtest.h" -#include "ui/base/events/event_constants.h" +#include "ui/events/event_constants.h" #include "ui/gfx/range/range.h" class BookmarkSyncPromoViewTest : public BookmarkBubbleDelegate, diff --git a/chrome/browser/ui/views/browser_action_view.cc b/chrome/browser/ui/views/browser_action_view.cc index db1b228..75705c7 100644 --- a/chrome/browser/ui/views/browser_action_view.cc +++ b/chrome/browser/ui/views/browser_action_view.cc @@ -21,9 +21,9 @@ #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "ui/base/accessibility/accessible_view_state.h" -#include "ui/base/events/event.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" +#include "ui/events/event.h" #include "ui/gfx/image/image_skia.h" #include "ui/gfx/image/image_skia_operations.h" #include "ui/gfx/image/image_skia_source.h" diff --git a/chrome/browser/ui/views/crypto_module_password_dialog_view.cc b/chrome/browser/ui/views/crypto_module_password_dialog_view.cc index fd6ed47..086e6f6 100644 --- a/chrome/browser/ui/views/crypto_module_password_dialog_view.cc +++ b/chrome/browser/ui/views/crypto_module_password_dialog_view.cc @@ -6,8 +6,8 @@ #include "base/strings/utf_string_conversions.h" #include "grit/generated_resources.h" -#include "ui/base/events/event.h" #include "ui/base/l10n/l10n_util.h" +#include "ui/events/event.h" #include "ui/views/controls/button/text_button.h" #include "ui/views/controls/label.h" #include "ui/views/controls/textfield/textfield.h" diff --git a/chrome/browser/ui/views/download/download_item_view.cc b/chrome/browser/ui/views/download/download_item_view.cc index 0c04e52..a9d7832 100644 --- a/chrome/browser/ui/views/download/download_item_view.cc +++ b/chrome/browser/ui/views/download/download_item_view.cc @@ -32,10 +32,10 @@ #include "grit/theme_resources.h" #include "third_party/icu/source/common/unicode/uchar.h" #include "ui/base/accessibility/accessible_view_state.h" -#include "ui/base/events/event.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" #include "ui/base/theme_provider.h" +#include "ui/events/event.h" #include "ui/gfx/animation/slide_animation.h" #include "ui/gfx/canvas.h" #include "ui/gfx/color_utils.h" diff --git a/chrome/browser/ui/views/dropdown_bar_host_aura.cc b/chrome/browser/ui/views/dropdown_bar_host_aura.cc index 93ea611..3cd73d2 100644 --- a/chrome/browser/ui/views/dropdown_bar_host_aura.cc +++ b/chrome/browser/ui/views/dropdown_bar_host_aura.cc @@ -6,7 +6,7 @@ #include "base/logging.h" #include "ui/aura/window.h" -#include "ui/base/events/event.h" +#include "ui/events/event.h" #include "ui/views/view_constants_aura.h" #include "ui/views/widget/widget.h" diff --git a/chrome/browser/ui/views/dropdown_bar_host_win.cc b/chrome/browser/ui/views/dropdown_bar_host_win.cc index 76a2b1b..c7de7b2 100644 --- a/chrome/browser/ui/views/dropdown_bar_host_win.cc +++ b/chrome/browser/ui/views/dropdown_bar_host_win.cc @@ -9,7 +9,7 @@ #include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents_view.h" -#include "ui/base/events/event.h" +#include "ui/events/event.h" #include "ui/events/keycodes/keyboard_code_conversion_win.h" #include "ui/views/controls/scrollbar/native_scroll_bar.h" diff --git a/chrome/browser/ui/views/edit_search_engine_dialog.cc b/chrome/browser/ui/views/edit_search_engine_dialog.cc index 93cb343..67da85e 100644 --- a/chrome/browser/ui/views/edit_search_engine_dialog.cc +++ b/chrome/browser/ui/views/edit_search_engine_dialog.cc @@ -13,9 +13,9 @@ #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "grit/ui_resources.h" -#include "ui/base/events/event.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" +#include "ui/events/event.h" #include "ui/views/controls/image_view.h" #include "ui/views/controls/label.h" #include "ui/views/controls/textfield/textfield.h" diff --git a/chrome/browser/ui/views/event_utils.cc b/chrome/browser/ui/views/event_utils.cc index abfee6c..961f3f8 100644 --- a/chrome/browser/ui/views/event_utils.cc +++ b/chrome/browser/ui/views/event_utils.cc @@ -4,7 +4,7 @@ #include "chrome/browser/ui/views/event_utils.h" -#include "ui/base/events/event.h" +#include "ui/events/event.h" namespace event_utils { diff --git a/chrome/browser/ui/views/extensions/extension_view_views.cc b/chrome/browser/ui/views/extensions/extension_view_views.cc index b987bf5..62fe5ff 100644 --- a/chrome/browser/ui/views/extensions/extension_view_views.cc +++ b/chrome/browser/ui/views/extensions/extension_view_views.cc @@ -12,7 +12,7 @@ #include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents_view.h" #include "extensions/common/view_type.h" -#include "ui/base/events/event.h" +#include "ui/events/event.h" #include "ui/views/widget/widget.h" #if defined(USE_AURA) diff --git a/chrome/browser/ui/views/external_tab_container_win.cc b/chrome/browser/ui/views/external_tab_container_win.cc index 88c0474..5fc81f0 100644 --- a/chrome/browser/ui/views/external_tab_container_win.cc +++ b/chrome/browser/ui/views/external_tab_container_win.cc @@ -66,10 +66,10 @@ #include "grit/generated_resources.h" #include "grit/locale_settings.h" #include "third_party/WebKit/public/platform/WebReferrerPolicy.h" -#include "ui/base/events/event_utils.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/models/menu_model.h" #include "ui/base/view_prop.h" +#include "ui/events/event_utils.h" #include "ui/views/controls/webview/webview.h" #include "ui/views/layout/grid_layout.h" #include "ui/views/widget/widget.h" diff --git a/chrome/browser/ui/views/find_bar_host.cc b/chrome/browser/ui/views/find_bar_host.cc index 4207123..93342bf 100644 --- a/chrome/browser/ui/views/find_bar_host.cc +++ b/chrome/browser/ui/views/find_bar_host.cc @@ -14,7 +14,7 @@ #include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents_view.h" -#include "ui/base/events/event.h" +#include "ui/events/event.h" #include "ui/events/keycodes/keyboard_codes.h" #include "ui/views/focus/external_focus_tracker.h" #include "ui/views/focus/view_storage.h" diff --git a/chrome/browser/ui/views/find_bar_host_aura.cc b/chrome/browser/ui/views/find_bar_host_aura.cc index c3d37bd..9b92984 100644 --- a/chrome/browser/ui/views/find_bar_host_aura.cc +++ b/chrome/browser/ui/views/find_bar_host_aura.cc @@ -5,7 +5,7 @@ #include "chrome/browser/ui/views/find_bar_host.h" #include "base/logging.h" -#include "ui/base/events/event.h" +#include "ui/events/event.h" void FindBarHost::AudibleAlert() { #if defined(OS_WIN) diff --git a/chrome/browser/ui/views/find_bar_host_win.cc b/chrome/browser/ui/views/find_bar_host_win.cc index d7ea817a..74e340d 100644 --- a/chrome/browser/ui/views/find_bar_host_win.cc +++ b/chrome/browser/ui/views/find_bar_host_win.cc @@ -8,7 +8,7 @@ #include "chrome/browser/ui/views/frame/browser_view.h" #include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents_view.h" -#include "ui/base/events/event.h" +#include "ui/events/event.h" #include "ui/views/controls/scrollbar/native_scroll_bar.h" #include "ui/views/widget/widget.h" diff --git a/chrome/browser/ui/views/find_bar_view.cc b/chrome/browser/ui/views/find_bar_view.cc index 549bc2b..c297d87 100644 --- a/chrome/browser/ui/views/find_bar_view.cc +++ b/chrome/browser/ui/views/find_bar_view.cc @@ -23,10 +23,10 @@ #include "grit/theme_resources.h" #include "grit/ui_resources.h" #include "third_party/skia/include/effects/SkGradientShader.h" -#include "ui/base/events/event.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" #include "ui/base/theme_provider.h" +#include "ui/events/event.h" #include "ui/gfx/canvas.h" #include "ui/views/controls/button/image_button.h" #include "ui/views/controls/label.h" diff --git a/chrome/browser/ui/views/frame/browser_view.cc b/chrome/browser/ui/views/frame/browser_view.cc index bbd7822..3c48696 100644 --- a/chrome/browser/ui/views/frame/browser_view.cc +++ b/chrome/browser/ui/views/frame/browser_view.cc @@ -108,11 +108,11 @@ #include "grit/webkit_resources.h" #include "ui/base/accelerators/accelerator.h" #include "ui/base/accessibility/accessible_view_state.h" -#include "ui/base/events/event_utils.h" #include "ui/base/hit_test.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" #include "ui/base/theme_provider.h" +#include "ui/events/event_utils.h" #include "ui/gfx/canvas.h" #include "ui/gfx/color_utils.h" #include "ui/gfx/sys_color_change_listener.h" diff --git a/chrome/browser/ui/views/frame/immersive_mode_controller_ash.h b/chrome/browser/ui/views/frame/immersive_mode_controller_ash.h index 09ace22..a1f90cb 100644 --- a/chrome/browser/ui/views/frame/immersive_mode_controller_ash.h +++ b/chrome/browser/ui/views/frame/immersive_mode_controller_ash.h @@ -11,7 +11,7 @@ #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" #include "ui/aura/window_observer.h" -#include "ui/base/events/event_handler.h" +#include "ui/events/event_handler.h" #include "ui/gfx/animation/animation_delegate.h" #include "ui/gfx/rect.h" #include "ui/views/focus/focus_manager.h" diff --git a/chrome/browser/ui/views/frame/immersive_mode_controller_ash_browsertest.cc b/chrome/browser/ui/views/frame/immersive_mode_controller_ash_browsertest.cc index 450115c..f15af8a 100644 --- a/chrome/browser/ui/views/frame/immersive_mode_controller_ash_browsertest.cc +++ b/chrome/browser/ui/views/frame/immersive_mode_controller_ash_browsertest.cc @@ -29,9 +29,9 @@ #include "ui/aura/client/screen_position_client.h" #include "ui/aura/env.h" #include "ui/aura/root_window.h" -#include "ui/base/events/event.h" #include "ui/compositor/layer_animator.h" #include "ui/compositor/scoped_animation_duration_scale_mode.h" +#include "ui/events/event.h" #include "ui/gfx/rect.h" #include "ui/views/view.h" diff --git a/chrome/browser/ui/views/keyboard_access_browsertest.cc b/chrome/browser/ui/views/keyboard_access_browsertest.cc index e06dfbc..362c277 100644 --- a/chrome/browser/ui/views/keyboard_access_browsertest.cc +++ b/chrome/browser/ui/views/keyboard_access_browsertest.cc @@ -19,8 +19,8 @@ #include "chrome/test/base/in_process_browser_test.h" #include "chrome/test/base/interactive_test_utils.h" #include "chrome/test/base/ui_test_utils.h" -#include "ui/base/events/event_constants.h" #include "ui/base/test/ui_controls.h" +#include "ui/events/event_constants.h" #include "ui/events/keycodes/keyboard_codes.h" #include "ui/views/controls/menu/menu_listener.h" #include "ui/views/focus/focus_manager.h" diff --git a/chrome/browser/ui/views/location_bar/location_bar_decoration_view.cc b/chrome/browser/ui/views/location_bar/location_bar_decoration_view.cc index c0bf64c..67f87bf 100644 --- a/chrome/browser/ui/views/location_bar/location_bar_decoration_view.cc +++ b/chrome/browser/ui/views/location_bar/location_bar_decoration_view.cc @@ -5,7 +5,7 @@ #include "chrome/browser/ui/views/location_bar/location_bar_decoration_view.h" #include "chrome/browser/ui/views/location_bar/location_bar_view.h" -#include "ui/base/events/event.h" +#include "ui/events/event.h" LocationBarDecorationView::LocationBarDecorationView() : could_handle_click_(true) { diff --git a/chrome/browser/ui/views/location_bar/location_bar_view.cc b/chrome/browser/ui/views/location_bar/location_bar_view.cc index 05d5743..5022b44 100644 --- a/chrome/browser/ui/views/location_bar/location_bar_view.cc +++ b/chrome/browser/ui/views/location_bar/location_bar_view.cc @@ -64,11 +64,11 @@ #include "grit/theme_resources.h" #include "ui/base/accessibility/accessible_view_state.h" #include "ui/base/dragdrop/drag_drop_types.h" -#include "ui/base/events/event.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/layout.h" #include "ui/base/resource/resource_bundle.h" #include "ui/base/theme_provider.h" +#include "ui/events/event.h" #include "ui/gfx/canvas.h" #include "ui/gfx/color_utils.h" #include "ui/gfx/image/image.h" diff --git a/chrome/browser/ui/views/location_bar/page_action_image_view.cc b/chrome/browser/ui/views/location_bar/page_action_image_view.cc index aba4564..bd2d06b 100644 --- a/chrome/browser/ui/views/location_bar/page_action_image_view.cc +++ b/chrome/browser/ui/views/location_bar/page_action_image_view.cc @@ -23,7 +23,7 @@ #include "chrome/browser/ui/webui/extensions/extension_info_ui.h" #include "chrome/common/extensions/extension.h" #include "ui/base/accessibility/accessible_view_state.h" -#include "ui/base/events/event.h" +#include "ui/events/event.h" #include "ui/gfx/canvas.h" #include "ui/gfx/image/image.h" #include "ui/views/controls/menu/menu_item_view.h" diff --git a/chrome/browser/ui/views/location_bar/star_view.cc b/chrome/browser/ui/views/location_bar/star_view.cc index bb70241..e952661 100644 --- a/chrome/browser/ui/views/location_bar/star_view.cc +++ b/chrome/browser/ui/views/location_bar/star_view.cc @@ -15,9 +15,9 @@ #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "ui/base/accessibility/accessible_view_state.h" -#include "ui/base/events/event.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" +#include "ui/events/event.h" StarView::StarView(CommandUpdater* command_updater) : command_updater_(command_updater), diff --git a/chrome/browser/ui/views/location_bar/zoom_view.cc b/chrome/browser/ui/views/location_bar/zoom_view.cc index 0ed27fb..d0b1541 100644 --- a/chrome/browser/ui/views/location_bar/zoom_view.cc +++ b/chrome/browser/ui/views/location_bar/zoom_view.cc @@ -11,9 +11,9 @@ #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "ui/base/accessibility/accessible_view_state.h" -#include "ui/base/events/event.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" +#include "ui/events/event.h" #include "ui/gfx/size.h" ZoomView::ZoomView(LocationBarView::Delegate* location_bar_delegate) diff --git a/chrome/browser/ui/views/notifications/balloon_collection_views.cc b/chrome/browser/ui/views/notifications/balloon_collection_views.cc index 110fa34..8da6940 100644 --- a/chrome/browser/ui/views/notifications/balloon_collection_views.cc +++ b/chrome/browser/ui/views/notifications/balloon_collection_views.cc @@ -6,8 +6,8 @@ #include "chrome/browser/notifications/balloon.h" #include "chrome/browser/ui/views/notifications/balloon_view_views.h" -#include "ui/base/events/event_constants.h" -#include "ui/base/events/event_utils.h" +#include "ui/events/event_constants.h" +#include "ui/events/event_utils.h" #include "ui/gfx/rect.h" #include "ui/gfx/screen.h" diff --git a/chrome/browser/ui/views/omnibox/omnibox_view_views.cc b/chrome/browser/ui/views/omnibox/omnibox_view_views.cc index f4a5c85..bf56ecc 100644 --- a/chrome/browser/ui/views/omnibox/omnibox_view_views.cc +++ b/chrome/browser/ui/views/omnibox/omnibox_view_views.cc @@ -32,12 +32,12 @@ #include "ui/base/clipboard/scoped_clipboard_writer.h" #include "ui/base/dragdrop/drag_drop_types.h" #include "ui/base/dragdrop/os_exchange_data.h" -#include "ui/base/events/event.h" #include "ui/base/ime/text_input_client.h" #include "ui/base/ime/text_input_type.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/models/simple_menu_model.h" #include "ui/base/resource/resource_bundle.h" +#include "ui/events/event.h" #include "ui/gfx/canvas.h" #include "ui/gfx/font_list.h" #include "ui/gfx/selection_model.h" diff --git a/chrome/browser/ui/views/omnibox/omnibox_view_win.cc b/chrome/browser/ui/views/omnibox/omnibox_view_win.cc index 53cb06a..43bf0c7 100644 --- a/chrome/browser/ui/views/omnibox/omnibox_view_win.cc +++ b/chrome/browser/ui/views/omnibox/omnibox_view_win.cc @@ -54,8 +54,6 @@ #include "ui/base/dragdrop/drop_target_win.h" #include "ui/base/dragdrop/os_exchange_data.h" #include "ui/base/dragdrop/os_exchange_data_provider_win.h" -#include "ui/base/events/event.h" -#include "ui/base/events/event_constants.h" #include "ui/base/ime/win/tsf_bridge.h" #include "ui/base/ime/win/tsf_event_router.h" #include "ui/base/l10n/l10n_util.h" @@ -63,6 +61,8 @@ #include "ui/base/touch/touch_enabled.h" #include "ui/base/win/mouse_wheel_util.h" #include "ui/base/win/touch_input.h" +#include "ui/events/event.h" +#include "ui/events/event_constants.h" #include "ui/events/keycodes/keyboard_codes.h" #include "ui/gfx/canvas.h" #include "ui/gfx/image/image.h" diff --git a/chrome/browser/ui/views/tabs/tab_drag_controller.cc b/chrome/browser/ui/views/tabs/tab_drag_controller.cc index c54a233..69d15ed 100644 --- a/chrome/browser/ui/views/tabs/tab_drag_controller.cc +++ b/chrome/browser/ui/views/tabs/tab_drag_controller.cc @@ -36,9 +36,9 @@ #include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents_view.h" #include "grit/theme_resources.h" -#include "ui/base/events/event_constants.h" -#include "ui/base/events/event_utils.h" #include "ui/base/resource/resource_bundle.h" +#include "ui/events/event_constants.h" +#include "ui/events/event_utils.h" #include "ui/gfx/animation/animation.h" #include "ui/gfx/animation/animation_delegate.h" #include "ui/gfx/animation/slide_animation.h" diff --git a/chrome/test/reliability/automated_ui_test_base.cc b/chrome/test/reliability/automated_ui_test_base.cc index b753329..95b84a9 100644 --- a/chrome/test/reliability/automated_ui_test_base.cc +++ b/chrome/test/reliability/automated_ui_test_base.cc @@ -12,7 +12,7 @@ #include "chrome/test/automation/tab_proxy.h" #include "chrome/test/automation/window_proxy.h" #include "chrome/test/ui/ui_test.h" -#include "ui/base/events/event_constants.h" +#include "ui/events/event_constants.h" #include "ui/gfx/point.h" #include "ui/gfx/rect.h" diff --git a/content/browser/renderer_host/input/immediate_input_router.cc b/content/browser/renderer_host/input/immediate_input_router.cc index d1c5a57d..a4c6905 100644 --- a/content/browser/renderer_host/input/immediate_input_router.cc +++ b/content/browser/renderer_host/input/immediate_input_router.cc @@ -21,7 +21,7 @@ #include "content/public/browser/notification_types.h" #include "content/public/browser/user_metrics.h" #include "content/public/common/content_switches.h" -#include "ui/base/events/event.h" +#include "ui/events/event.h" #include "ui/events/keycodes/keyboard_codes.h" using base::Time; diff --git a/content/browser/renderer_host/input/immediate_input_router_unittest.cc b/content/browser/renderer_host/input/immediate_input_router_unittest.cc index 4d377ec..0e4767a 100644 --- a/content/browser/renderer_host/input/immediate_input_router_unittest.cc +++ b/content/browser/renderer_host/input/immediate_input_router_unittest.cc @@ -21,7 +21,7 @@ #if defined(OS_WIN) || defined(USE_AURA) #include "content/browser/renderer_host/ui_events_helper.h" -#include "ui/base/events/event.h" +#include "ui/events/event.h" #endif using base::TimeDelta; diff --git a/content/browser/renderer_host/input/input_router_unittest.cc b/content/browser/renderer_host/input/input_router_unittest.cc index aa46f9c..da1ef1e 100644 --- a/content/browser/renderer_host/input/input_router_unittest.cc +++ b/content/browser/renderer_host/input/input_router_unittest.cc @@ -10,7 +10,7 @@ #if defined(OS_WIN) || defined(USE_AURA) #include "content/browser/renderer_host/ui_events_helper.h" -#include "ui/base/events/event.h" +#include "ui/events/event.h" #endif using WebKit::WebGestureEvent; diff --git a/content/browser/renderer_host/native_web_keyboard_event.cc b/content/browser/renderer_host/native_web_keyboard_event.cc index 3cb2af1..646b358 100644 --- a/content/browser/renderer_host/native_web_keyboard_event.cc +++ b/content/browser/renderer_host/native_web_keyboard_event.cc @@ -4,7 +4,7 @@ #include "content/public/browser/native_web_keyboard_event.h" -#include "ui/base/events/event_constants.h" +#include "ui/events/event_constants.h" namespace content { diff --git a/content/browser/renderer_host/native_web_keyboard_event_aura.cc b/content/browser/renderer_host/native_web_keyboard_event_aura.cc index f3113cc..ad3aae3 100644 --- a/content/browser/renderer_host/native_web_keyboard_event_aura.cc +++ b/content/browser/renderer_host/native_web_keyboard_event_aura.cc @@ -6,7 +6,7 @@ #include "base/logging.h" #include "content/browser/renderer_host/web_input_event_aura.h" -#include "ui/base/events/event.h" +#include "ui/events/event.h" namespace { diff --git a/content/browser/renderer_host/render_widget_host_impl.cc b/content/browser/renderer_host/render_widget_host_impl.cc index 8ecb9ef..996ec59 100644 --- a/content/browser/renderer_host/render_widget_host_impl.cc +++ b/content/browser/renderer_host/render_widget_host_impl.cc @@ -53,7 +53,7 @@ #include "skia/ext/image_operations.h" #include "skia/ext/platform_canvas.h" #include "third_party/WebKit/public/web/WebCompositionUnderline.h" -#include "ui/base/events/event.h" +#include "ui/events/event.h" #include "ui/events/keycodes/keyboard_codes.h" #include "ui/gfx/size_conversions.h" #include "ui/gfx/skbitmap_operations.h" diff --git a/content/browser/renderer_host/render_widget_host_unittest.cc b/content/browser/renderer_host/render_widget_host_unittest.cc index 49ab827..21c368a 100644 --- a/content/browser/renderer_host/render_widget_host_unittest.cc +++ b/content/browser/renderer_host/render_widget_host_unittest.cc @@ -41,7 +41,7 @@ #if defined(OS_WIN) || defined(USE_AURA) #include "content/browser/renderer_host/ui_events_helper.h" -#include "ui/base/events/event.h" +#include "ui/events/event.h" #endif using base::TimeDelta; diff --git a/content/browser/renderer_host/render_widget_host_view_aura.cc b/content/browser/renderer_host/render_widget_host_view_aura.cc index 67c1c6c..ed555cc 100644 --- a/content/browser/renderer_host/render_widget_host_view_aura.cc +++ b/content/browser/renderer_host/render_widget_host_view_aura.cc @@ -59,13 +59,13 @@ #include "ui/aura/window_observer.h" #include "ui/aura/window_tracker.h" #include "ui/base/clipboard/scoped_clipboard_writer.h" -#include "ui/base/events/event.h" -#include "ui/base/events/event_utils.h" #include "ui/base/gestures/gesture_recognizer.h" #include "ui/base/hit_test.h" #include "ui/base/ime/input_method.h" #include "ui/base/ui_base_types.h" #include "ui/compositor/layer.h" +#include "ui/events/event.h" +#include "ui/events/event_utils.h" #include "ui/gfx/canvas.h" #include "ui/gfx/display.h" #include "ui/gfx/rect_conversions.h" diff --git a/content/browser/renderer_host/render_widget_host_view_aura_unittest.cc b/content/browser/renderer_host/render_widget_host_view_aura_unittest.cc index 8fb69c7..824db74 100644 --- a/content/browser/renderer_host/render_widget_host_view_aura_unittest.cc +++ b/content/browser/renderer_host/render_widget_host_view_aura_unittest.cc @@ -34,9 +34,9 @@ #include "ui/aura/test/test_window_delegate.h" #include "ui/aura/window.h" #include "ui/aura/window_observer.h" -#include "ui/base/events/event.h" -#include "ui/base/events/event_utils.h" #include "ui/base/ui_base_types.h" +#include "ui/events/event.h" +#include "ui/events/event_utils.h" using testing::_; diff --git a/content/browser/renderer_host/render_widget_host_view_guest.h b/content/browser/renderer_host/render_widget_host_view_guest.h index edd53db..82f2eab 100644 --- a/content/browser/renderer_host/render_widget_host_view_guest.h +++ b/content/browser/renderer_host/render_widget_host_view_guest.h @@ -10,9 +10,9 @@ #include "base/memory/scoped_ptr.h" #include "content/browser/renderer_host/render_widget_host_view_base.h" #include "content/common/content_export.h" -#include "ui/base/events/event.h" #include "ui/base/gestures/gesture_recognizer.h" #include "ui/base/gestures/gesture_types.h" +#include "ui/events/event.h" #include "ui/gfx/native_widget_types.h" #include "ui/gfx/rect.h" #include "ui/gfx/vector2d_f.h" diff --git a/content/browser/renderer_host/render_widget_host_view_win.cc b/content/browser/renderer_host/render_widget_host_view_win.cc index 7c8cf0b..82d0048 100644 --- a/content/browser/renderer_host/render_widget_host_view_win.cc +++ b/content/browser/renderer_host/render_widget_host_view_win.cc @@ -57,8 +57,6 @@ #include "third_party/WebKit/public/web/WebCompositionUnderline.h" #include "third_party/WebKit/public/web/WebInputEvent.h" #include "third_party/skia/include/core/SkRegion.h" -#include "ui/base/events/event.h" -#include "ui/base/events/event_utils.h" #include "ui/base/ime/composition_text.h" #include "ui/base/ime/win/imm32_manager.h" #include "ui/base/ime/win/tsf_input_scope.h" @@ -70,6 +68,8 @@ #include "ui/base/view_prop.h" #include "ui/base/win/mouse_wheel_util.h" #include "ui/base/win/touch_input.h" +#include "ui/events/event.h" +#include "ui/events/event_utils.h" #include "ui/gfx/canvas.h" #include "ui/gfx/rect.h" #include "ui/gfx/rect_conversions.h" diff --git a/content/browser/renderer_host/touch_smooth_scroll_gesture_aura.cc b/content/browser/renderer_host/touch_smooth_scroll_gesture_aura.cc index dd5b401..5df932d 100644 --- a/content/browser/renderer_host/touch_smooth_scroll_gesture_aura.cc +++ b/content/browser/renderer_host/touch_smooth_scroll_gesture_aura.cc @@ -6,8 +6,8 @@ #include "content/browser/renderer_host/render_widget_host_impl.h" #include "ui/aura/root_window.h" -#include "ui/base/events/event.h" -#include "ui/base/events/event_utils.h" +#include "ui/events/event.h" +#include "ui/events/event_utils.h" #include "ui/gfx/transform.h" namespace { diff --git a/content/browser/renderer_host/ui_events_helper.cc b/content/browser/renderer_host/ui_events_helper.cc index afbbf99..ca8253e 100644 --- a/content/browser/renderer_host/ui_events_helper.cc +++ b/content/browser/renderer_host/ui_events_helper.cc @@ -5,8 +5,8 @@ #include "content/browser/renderer_host/ui_events_helper.h" #include "third_party/WebKit/public/web/WebInputEvent.h" -#include "ui/base/events/event.h" -#include "ui/base/events/event_constants.h" +#include "ui/events/event.h" +#include "ui/events/event_constants.h" namespace { diff --git a/content/browser/renderer_host/web_input_event_aura.cc b/content/browser/renderer_host/web_input_event_aura.cc index 6ff9e4f..6bb5e58 100644 --- a/content/browser/renderer_host/web_input_event_aura.cc +++ b/content/browser/renderer_host/web_input_event_aura.cc @@ -6,8 +6,8 @@ #include "content/browser/renderer_host/ui_events_helper.h" #include "ui/aura/window.h" -#include "ui/base/events/event.h" -#include "ui/base/events/event_utils.h" +#include "ui/events/event.h" +#include "ui/events/event_utils.h" namespace content { diff --git a/content/browser/renderer_host/web_input_event_aura_unittest.cc b/content/browser/renderer_host/web_input_event_aura_unittest.cc index 0443c30..47a62be 100644 --- a/content/browser/renderer_host/web_input_event_aura_unittest.cc +++ b/content/browser/renderer_host/web_input_event_aura_unittest.cc @@ -6,7 +6,7 @@ #include "base/basictypes.h" #include "testing/gtest/include/gtest/gtest.h" -#include "ui/base/events/event.h" +#include "ui/events/event.h" #if defined(USE_X11) #include <X11/keysym.h> diff --git a/content/browser/renderer_host/web_input_event_aurax11.cc b/content/browser/renderer_host/web_input_event_aurax11.cc index b8be432..76ae55f 100644 --- a/content/browser/renderer_host/web_input_event_aurax11.cc +++ b/content/browser/renderer_host/web_input_event_aurax11.cc @@ -45,8 +45,8 @@ #include "base/event_types.h" #include "base/logging.h" #include "content/browser/renderer_host/ui_events_helper.h" -#include "ui/base/events/event.h" -#include "ui/base/events/event_constants.h" +#include "ui/events/event.h" +#include "ui/events/event_constants.h" #include "ui/events/keycodes/keyboard_code_conversion_x.h" #include "ui/events/keycodes/keyboard_codes.h" diff --git a/content/browser/web_contents/aura/window_slider.cc b/content/browser/web_contents/aura/window_slider.cc index faa4691..c9c3797 100644 --- a/content/browser/web_contents/aura/window_slider.cc +++ b/content/browser/web_contents/aura/window_slider.cc @@ -11,9 +11,9 @@ #include "content/browser/web_contents/aura/shadow_layer_delegate.h" #include "content/public/browser/overscroll_configuration.h" #include "ui/aura/window.h" -#include "ui/base/events/event.h" #include "ui/compositor/layer_animation_observer.h" #include "ui/compositor/scoped_layer_animation_settings.h" +#include "ui/events/event.h" namespace content { diff --git a/content/browser/web_contents/aura/window_slider.h b/content/browser/web_contents/aura/window_slider.h index cd140ff..7100bf5 100644 --- a/content/browser/web_contents/aura/window_slider.h +++ b/content/browser/web_contents/aura/window_slider.h @@ -10,7 +10,7 @@ #include "base/memory/weak_ptr.h" #include "content/common/content_export.h" #include "ui/aura/window_observer.h" -#include "ui/base/events/event_handler.h" +#include "ui/events/event_handler.h" namespace ui { class Layer; diff --git a/content/browser/web_contents/touch_editable_impl_aura_browsertest.cc b/content/browser/web_contents/touch_editable_impl_aura_browsertest.cc index bf0a359..6c5fa2a 100644 --- a/content/browser/web_contents/touch_editable_impl_aura_browsertest.cc +++ b/content/browser/web_contents/touch_editable_impl_aura_browsertest.cc @@ -22,9 +22,9 @@ #include "ui/aura/root_window.h" #include "ui/aura/test/event_generator.h" #include "ui/aura/window.h" -#include "ui/base/events/event_utils.h" #include "ui/base/ui_base_switches.h" #include "ui/compositor/scoped_animation_duration_scale_mode.h" +#include "ui/events/event_utils.h" namespace content { diff --git a/content/browser/web_contents/web_contents_view_aura.cc b/content/browser/web_contents/web_contents_view_aura.cc index a965eda..f3822f8 100644 --- a/content/browser/web_contents/web_contents_view_aura.cc +++ b/content/browser/web_contents/web_contents_view_aura.cc @@ -49,11 +49,11 @@ #include "ui/base/dragdrop/drag_drop_types.h" #include "ui/base/dragdrop/drag_utils.h" #include "ui/base/dragdrop/os_exchange_data.h" -#include "ui/base/events/event.h" -#include "ui/base/events/event_utils.h" #include "ui/base/hit_test.h" #include "ui/compositor/layer.h" #include "ui/compositor/scoped_layer_animation_settings.h" +#include "ui/events/event.h" +#include "ui/events/event_utils.h" #include "ui/gfx/canvas.h" #include "ui/gfx/image/image.h" #include "ui/gfx/image/image_png_rep.h" diff --git a/content/public/browser/native_web_keyboard_event.h b/content/public/browser/native_web_keyboard_event.h index 18c22b8..6942222 100644 --- a/content/public/browser/native_web_keyboard_event.h +++ b/content/public/browser/native_web_keyboard_event.h @@ -10,7 +10,7 @@ #include "build/build_config.h" #include "content/common/content_export.h" #include "third_party/WebKit/public/web/WebInputEvent.h" -#include "ui/base/events/event_constants.h" +#include "ui/events/event_constants.h" #include "ui/gfx/native_widget_types.h" namespace content { @@ -75,7 +75,7 @@ struct CONTENT_EXPORT NativeWebKeyboardEvent : #endif }; -// Returns a bitmak of values from ui/base/events/event_constants.h. +// Returns a bitmak of values from ui/events/event_constants.h. CONTENT_EXPORT int GetModifiersFromNativeWebKeyboardEvent( const NativeWebKeyboardEvent& event); diff --git a/content/renderer/render_view_browsertest.cc b/content/renderer/render_view_browsertest.cc index f241345..fc13ec0 100644 --- a/content/renderer/render_view_browsertest.cc +++ b/content/renderer/render_view_browsertest.cc @@ -46,13 +46,13 @@ #endif #if defined(USE_AURA) -#include "ui/base/events/event.h" +#include "ui/events/event.h" #endif #if defined(USE_AURA) && defined(USE_X11) #include <X11/Xlib.h> -#include "ui/base/events/event_constants.h" #include "ui/base/x/x11_util.h" +#include "ui/events/event_constants.h" #include "ui/events/keycodes/keyboard_code_conversion.h" #endif diff --git a/content/shell/browser/shell_aura.cc b/content/shell/browser/shell_aura.cc index d2d3c38..da8460e 100644 --- a/content/shell/browser/shell_aura.cc +++ b/content/shell/browser/shell_aura.cc @@ -13,8 +13,8 @@ #include "ui/aura/window.h" #include "ui/base/accessibility/accessibility_types.h" #include "ui/base/clipboard/clipboard.h" -#include "ui/base/events/event.h" #include "ui/base/resource/resource_bundle.h" +#include "ui/events/event.h" #include "ui/gfx/screen.h" #include "ui/views/controls/button/label_button.h" #include "ui/views/controls/textfield/textfield.h" diff --git a/media/base/keyboard_event_counter.h b/media/base/keyboard_event_counter.h index 873448d..accb659 100644 --- a/media/base/keyboard_event_counter.h +++ b/media/base/keyboard_event_counter.h @@ -9,7 +9,7 @@ #include "base/synchronization/lock.h" #include "media/base/media_export.h" -#include "ui/base/events/event_constants.h" +#include "ui/events/event_constants.h" #include "ui/events/keycodes/keyboard_codes.h" namespace media { diff --git a/ui/app_list/views/apps_grid_view.cc b/ui/app_list/views/apps_grid_view.cc index 7cb9446..658ddb1 100644 --- a/ui/app_list/views/apps_grid_view.cc +++ b/ui/app_list/views/apps_grid_view.cc @@ -13,8 +13,8 @@ #include "ui/app_list/views/apps_grid_view_delegate.h" #include "ui/app_list/views/page_switcher.h" #include "ui/app_list/views/pulsing_block_view.h" -#include "ui/base/events/event.h" #include "ui/compositor/scoped_layer_animation_settings.h" +#include "ui/events/event.h" #include "ui/gfx/animation/animation.h" #include "ui/views/border.h" #include "ui/views/view_model_utils.h" diff --git a/ui/app_list/views/contents_view.cc b/ui/app_list/views/contents_view.cc index 7d14d17..9f0602c 100644 --- a/ui/app_list/views/contents_view.cc +++ b/ui/app_list/views/contents_view.cc @@ -12,7 +12,7 @@ #include "ui/app_list/views/app_list_main_view.h" #include "ui/app_list/views/apps_grid_view.h" #include "ui/app_list/views/search_result_list_view.h" -#include "ui/base/events/event.h" +#include "ui/events/event.h" #include "ui/views/animation/bounds_animator.h" #include "ui/views/view_model.h" #include "ui/views/view_model_utils.h" diff --git a/ui/app_list/views/search_box_view.cc b/ui/app_list/views/search_box_view.cc index 0f9158f..9b96d3e 100644 --- a/ui/app_list/views/search_box_view.cc +++ b/ui/app_list/views/search_box_view.cc @@ -11,8 +11,8 @@ #include "ui/app_list/search_box_model.h" #include "ui/app_list/views/app_list_menu_views.h" #include "ui/app_list/views/search_box_view_delegate.h" -#include "ui/base/events/event.h" #include "ui/base/resource/resource_bundle.h" +#include "ui/events/event.h" #include "ui/views/controls/button/menu_button.h" #include "ui/views/controls/image_view.h" #include "ui/views/controls/textfield/textfield.h" diff --git a/ui/app_list/views/search_result_list_view.cc b/ui/app_list/views/search_result_list_view.cc index 9e61432..3387cec 100644 --- a/ui/app_list/views/search_result_list_view.cc +++ b/ui/app_list/views/search_result_list_view.cc @@ -10,7 +10,7 @@ #include "base/message_loop/message_loop.h" #include "ui/app_list/views/search_result_list_view_delegate.h" #include "ui/app_list/views/search_result_view.h" -#include "ui/base/events/event.h" +#include "ui/events/event.h" #include "ui/views/layout/box_layout.h" namespace { diff --git a/ui/aura/demo/demo_main.cc b/ui/aura/demo/demo_main.cc index fb23684..dbf1c80 100644 --- a/ui/aura/demo/demo_main.cc +++ b/ui/aura/demo/demo_main.cc @@ -16,11 +16,11 @@ #include "ui/aura/test/test_screen.h" #include "ui/aura/window.h" #include "ui/aura/window_delegate.h" -#include "ui/base/events/event.h" #include "ui/base/hit_test.h" #include "ui/base/resource/resource_bundle.h" #include "ui/base/ui_base_paths.h" #include "ui/compositor/compositor.h" +#include "ui/events/event.h" #include "ui/gfx/canvas.h" #include "ui/gfx/rect.h" diff --git a/ui/aura/device_list_updater_aurax11.cc b/ui/aura/device_list_updater_aurax11.cc index 0671dfe..8240cb4 100644 --- a/ui/aura/device_list_updater_aurax11.cc +++ b/ui/aura/device_list_updater_aurax11.cc @@ -6,7 +6,7 @@ #include <X11/extensions/XInput2.h> -#include "ui/base/events/event_utils.h" +#include "ui/events/event_utils.h" namespace aura { diff --git a/ui/aura/env.h b/ui/aura/env.h index 7228da7..c52b892 100644 --- a/ui/aura/env.h +++ b/ui/aura/env.h @@ -9,8 +9,8 @@ #include "base/message_loop/message_loop.h" #include "base/observer_list.h" #include "ui/aura/aura_export.h" -#include "ui/base/events/event_handler.h" -#include "ui/base/events/event_target.h" +#include "ui/events/event_handler.h" +#include "ui/events/event_target.h" #include "ui/gfx/point.h" #if defined(USE_X11) diff --git a/ui/aura/gestures/gesture_recognizer_unittest.cc b/ui/aura/gestures/gesture_recognizer_unittest.cc index b68a4b6..f17a320 100644 --- a/ui/aura/gestures/gesture_recognizer_unittest.cc +++ b/ui/aura/gestures/gesture_recognizer_unittest.cc @@ -14,14 +14,14 @@ #include "ui/aura/test/event_generator.h" #include "ui/aura/test/test_window_delegate.h" #include "ui/aura/test/test_windows.h" -#include "ui/base/events/event.h" -#include "ui/base/events/event_utils.h" #include "ui/base/gestures/gesture_configuration.h" #include "ui/base/gestures/gesture_recognizer_impl.h" #include "ui/base/gestures/gesture_sequence.h" #include "ui/base/gestures/gesture_types.h" #include "ui/base/hit_test.h" #include "ui/base/ui_base_switches.h" +#include "ui/events/event.h" +#include "ui/events/event_utils.h" #include "ui/gfx/point.h" #include "ui/gfx/rect.h" diff --git a/ui/aura/remote_root_window_host_win.cc b/ui/aura/remote_root_window_host_win.cc index 871df52..7c8985d 100644 --- a/ui/aura/remote_root_window_host_win.cc +++ b/ui/aura/remote_root_window_host_win.cc @@ -15,7 +15,7 @@ #include "ui/aura/client/cursor_client.h" #include "ui/aura/root_window.h" #include "ui/base/cursor/cursor_loader_win.h" -#include "ui/base/events/event_utils.h" +#include "ui/events/event_utils.h" #include "ui/events/keycodes/keyboard_code_conversion_win.h" #include "ui/base/view_prop.h" #include "ui/gfx/insets.h" diff --git a/ui/aura/remote_root_window_host_win.h b/ui/aura/remote_root_window_host_win.h index 3c9f9cf..5ad54a1 100644 --- a/ui/aura/remote_root_window_host_win.h +++ b/ui/aura/remote_root_window_host_win.h @@ -11,8 +11,8 @@ #include "base/compiler_specific.h" #include "base/strings/string16.h" #include "ui/aura/root_window_host.h" -#include "ui/base/events/event.h" -#include "ui/base/events/event_constants.h" +#include "ui/events/event.h" +#include "ui/events/event_constants.h" #include "ui/gfx/native_widget_types.h" namespace base { diff --git a/ui/aura/root_window.cc b/ui/aura/root_window.cc index 6b17d93..6e6fad4 100644 --- a/ui/aura/root_window.cc +++ b/ui/aura/root_window.cc @@ -24,7 +24,6 @@ #include "ui/aura/window.h" #include "ui/aura/window_delegate.h" #include "ui/aura/window_tracker.h" -#include "ui/base/events/event.h" #include "ui/base/gestures/gesture_recognizer.h" #include "ui/base/gestures/gesture_types.h" #include "ui/base/hit_test.h" @@ -33,6 +32,7 @@ #include "ui/compositor/dip_util.h" #include "ui/compositor/layer.h" #include "ui/compositor/layer_animator.h" +#include "ui/events/event.h" #include "ui/gfx/display.h" #include "ui/gfx/point3_f.h" #include "ui/gfx/point_conversions.h" diff --git a/ui/aura/root_window.h b/ui/aura/root_window.h index 7943802..d403d73 100644 --- a/ui/aura/root_window.h +++ b/ui/aura/root_window.h @@ -18,13 +18,13 @@ #include "ui/aura/root_window_host_delegate.h" #include "ui/aura/window.h" #include "ui/base/cursor/cursor.h" -#include "ui/base/events/event_constants.h" -#include "ui/base/events/event_dispatcher.h" #include "ui/base/gestures/gesture_recognizer.h" #include "ui/base/gestures/gesture_types.h" #include "ui/compositor/compositor.h" #include "ui/compositor/compositor_observer.h" #include "ui/compositor/layer_animation_observer.h" +#include "ui/events/event_constants.h" +#include "ui/events/event_dispatcher.h" #include "ui/gfx/native_widget_types.h" #include "ui/gfx/point.h" #include "ui/gfx/transform.h" diff --git a/ui/aura/root_window_host_win.cc b/ui/aura/root_window_host_win.cc index 723de57..e5658f7 100644 --- a/ui/aura/root_window_host_win.cc +++ b/ui/aura/root_window_host_win.cc @@ -13,7 +13,7 @@ #include "ui/aura/client/cursor_client.h" #include "ui/aura/root_window.h" #include "ui/base/cursor/cursor_loader_win.h" -#include "ui/base/events/event.h" +#include "ui/events/event.h" #include "ui/base/view_prop.h" #include "ui/gfx/display.h" #include "ui/gfx/insets.h" diff --git a/ui/aura/root_window_host_x11.cc b/ui/aura/root_window_host_x11.cc index 34b8038..7de3bf7 100644 --- a/ui/aura/root_window_host_x11.cc +++ b/ui/aura/root_window_host_x11.cc @@ -32,8 +32,6 @@ #include "ui/aura/env.h" #include "ui/aura/root_window.h" #include "ui/base/cursor/cursor.h" -#include "ui/base/events/event.h" -#include "ui/base/events/event_utils.h" #include "ui/base/touch/touch_factory_x11.h" #include "ui/base/ui_base_switches.h" #include "ui/base/view_prop.h" @@ -41,6 +39,8 @@ #include "ui/base/x/x11_util.h" #include "ui/compositor/dip_util.h" #include "ui/compositor/layer.h" +#include "ui/events/event.h" +#include "ui/events/event_utils.h" #include "ui/events/keycodes/keyboard_codes.h" #include "ui/gfx/screen.h" diff --git a/ui/aura/root_window_unittest.cc b/ui/aura/root_window_unittest.cc index 92930af..4cf10bc 100644 --- a/ui/aura/root_window_unittest.cc +++ b/ui/aura/root_window_unittest.cc @@ -17,11 +17,11 @@ #include "ui/aura/test/test_window_delegate.h" #include "ui/aura/test/test_windows.h" #include "ui/aura/window_tracker.h" -#include "ui/base/events/event.h" -#include "ui/base/events/event_handler.h" -#include "ui/base/events/event_utils.h" #include "ui/base/gestures/gesture_configuration.h" #include "ui/base/hit_test.h" +#include "ui/events/event.h" +#include "ui/events/event_handler.h" +#include "ui/events/event_utils.h" #include "ui/events/keycodes/keyboard_codes.h" #include "ui/gfx/point.h" #include "ui/gfx/rect.h" diff --git a/ui/aura/test/event_generator.cc b/ui/aura/test/event_generator.cc index 91bcee7..ba8392d 100644 --- a/ui/aura/test/event_generator.cc +++ b/ui/aura/test/event_generator.cc @@ -9,8 +9,8 @@ #include "base/message_loop/message_loop_proxy.h" #include "ui/aura/client/screen_position_client.h" #include "ui/aura/root_window.h" -#include "ui/base/events/event.h" -#include "ui/base/events/event_utils.h" +#include "ui/events/event.h" +#include "ui/events/event_utils.h" #include "ui/gfx/vector2d_conversions.h" #if defined(USE_X11) diff --git a/ui/aura/test/event_generator.h b/ui/aura/test/event_generator.h index 36ad695..5f93c5c 100644 --- a/ui/aura/test/event_generator.h +++ b/ui/aura/test/event_generator.h @@ -11,7 +11,7 @@ #include "base/basictypes.h" #include "base/callback.h" #include "base/memory/scoped_ptr.h" -#include "ui/base/events/event_constants.h" +#include "ui/events/event_constants.h" #include "ui/events/keycodes/keyboard_codes.h" #include "ui/gfx/point.h" diff --git a/ui/aura/test/test_event_handler.cc b/ui/aura/test/test_event_handler.cc index 90563d7..5611a99 100644 --- a/ui/aura/test/test_event_handler.cc +++ b/ui/aura/test/test_event_handler.cc @@ -4,7 +4,7 @@ #include "ui/aura/test/test_event_handler.h" -#include "ui/base/events/event.h" +#include "ui/events/event.h" namespace aura { namespace test { diff --git a/ui/aura/test/test_event_handler.h b/ui/aura/test/test_event_handler.h index 0bd8ed8..4998630 100644 --- a/ui/aura/test/test_event_handler.h +++ b/ui/aura/test/test_event_handler.h @@ -7,7 +7,7 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" -#include "ui/base/events/event_handler.h" +#include "ui/events/event_handler.h" namespace aura { namespace test { diff --git a/ui/aura/test/test_window_delegate.cc b/ui/aura/test/test_window_delegate.cc index 37d1198..305dd9a 100644 --- a/ui/aura/test/test_window_delegate.cc +++ b/ui/aura/test/test_window_delegate.cc @@ -6,8 +6,8 @@ #include "base/strings/stringprintf.h" #include "ui/aura/window.h" -#include "ui/base/events/event.h" #include "ui/base/hit_test.h" +#include "ui/events/event.h" #include "ui/gfx/canvas.h" #include "ui/gfx/path.h" #include "ui/gfx/skia_util.h" diff --git a/ui/aura/window.h b/ui/aura/window.h index 92dfa90..3ed7ca5 100644 --- a/ui/aura/window.h +++ b/ui/aura/window.h @@ -17,13 +17,13 @@ #include "ui/aura/aura_export.h" #include "ui/aura/client/window_types.h" #include "ui/aura/window_observer.h" -#include "ui/base/events/event_constants.h" -#include "ui/base/events/event_target.h" #include "ui/base/gestures/gesture_types.h" #include "ui/compositor/layer_animator.h" #include "ui/compositor/layer_delegate.h" #include "ui/compositor/layer_owner.h" #include "ui/compositor/layer_type.h" +#include "ui/events/event_constants.h" +#include "ui/events/event_target.h" #include "ui/gfx/insets.h" #include "ui/gfx/native_widget_types.h" #include "ui/gfx/rect.h" diff --git a/ui/aura/window_delegate.h b/ui/aura/window_delegate.h index 6bea65d..ff941ef 100644 --- a/ui/aura/window_delegate.h +++ b/ui/aura/window_delegate.h @@ -8,8 +8,8 @@ #include "base/compiler_specific.h" #include "base/memory/ref_counted.h" #include "ui/aura/aura_export.h" -#include "ui/base/events/event_constants.h" -#include "ui/base/events/event_handler.h" +#include "ui/events/event_constants.h" +#include "ui/events/event_handler.h" #include "ui/gfx/native_widget_types.h" namespace gfx { diff --git a/ui/aura/window_unittest.cc b/ui/aura/window_unittest.cc index 126f358..c37eb83 100644 --- a/ui/aura/window_unittest.cc +++ b/ui/aura/window_unittest.cc @@ -27,14 +27,14 @@ #include "ui/aura/window_delegate.h" #include "ui/aura/window_observer.h" #include "ui/aura/window_property.h" -#include "ui/base/events/event.h" -#include "ui/base/events/event_utils.h" #include "ui/base/gestures/gesture_configuration.h" #include "ui/base/hit_test.h" #include "ui/compositor/layer.h" #include "ui/compositor/scoped_animation_duration_scale_mode.h" #include "ui/compositor/scoped_layer_animation_settings.h" #include "ui/compositor/test/test_layers.h" +#include "ui/events/event.h" +#include "ui/events/event_utils.h" #include "ui/events/keycodes/keyboard_codes.h" #include "ui/gfx/canvas.h" #include "ui/gfx/screen.h" diff --git a/ui/base/accelerators/accelerator.h b/ui/base/accelerators/accelerator.h index c2e2aa6..020c7be 100644 --- a/ui/base/accelerators/accelerator.h +++ b/ui/base/accelerators/accelerator.h @@ -14,8 +14,8 @@ #include "base/memory/scoped_ptr.h" #include "base/strings/string16.h" #include "ui/base/accelerators/platform_accelerator.h" -#include "ui/base/events/event_constants.h" #include "ui/base/ui_export.h" +#include "ui/events/event_constants.h" #include "ui/events/keycodes/keyboard_codes.h" namespace ui { diff --git a/ui/base/accelerators/accelerator_manager.h b/ui/base/accelerators/accelerator_manager.h index 2e6645e..818dc3e 100644 --- a/ui/base/accelerators/accelerator_manager.h +++ b/ui/base/accelerators/accelerator_manager.h @@ -11,8 +11,8 @@ #include "base/basictypes.h" #include "ui/base/accelerators/accelerator.h" -#include "ui/base/events/event_constants.h" #include "ui/base/ui_export.h" +#include "ui/events/event_constants.h" namespace ui { diff --git a/ui/base/accelerators/accelerator_manager_unittest.cc b/ui/base/accelerators/accelerator_manager_unittest.cc index 46e0bc1..b8672ec 100644 --- a/ui/base/accelerators/accelerator_manager_unittest.cc +++ b/ui/base/accelerators/accelerator_manager_unittest.cc @@ -6,7 +6,7 @@ #include "base/compiler_specific.h" #include "testing/gtest/include/gtest/gtest.h" -#include "ui/base/events/event_constants.h" +#include "ui/events/event_constants.h" #include "ui/events/keycodes/keyboard_codes.h" namespace ui { diff --git a/ui/base/accelerators/platform_accelerator_gtk.cc b/ui/base/accelerators/platform_accelerator_gtk.cc index 0e0ad34..d77050c 100644 --- a/ui/base/accelerators/platform_accelerator_gtk.cc +++ b/ui/base/accelerators/platform_accelerator_gtk.cc @@ -4,7 +4,7 @@ #include "ui/base/accelerators/platform_accelerator_gtk.h" -#include "ui/base/events/event_conversion_gtk.h" +#include "ui/events/event_conversion_gtk.h" #include "ui/events/keycodes/keyboard_code_conversion_gtk.h" namespace ui { diff --git a/ui/base/cocoa/cocoa_event_utils.mm b/ui/base/cocoa/cocoa_event_utils.mm index 1920699..a8fd8c3 100644 --- a/ui/base/cocoa/cocoa_event_utils.mm +++ b/ui/base/cocoa/cocoa_event_utils.mm @@ -4,7 +4,7 @@ #import "ui/base/cocoa/cocoa_event_utils.h" -#include "ui/base/events/event_constants.h" +#include "ui/events/event_constants.h" #include "ui/base/window_open_disposition.h" namespace { diff --git a/ui/base/cocoa/cocoa_event_utils_unittest.mm b/ui/base/cocoa/cocoa_event_utils_unittest.mm index cb5f68a..5ec3936 100644 --- a/ui/base/cocoa/cocoa_event_utils_unittest.mm +++ b/ui/base/cocoa/cocoa_event_utils_unittest.mm @@ -7,7 +7,7 @@ #include "testing/gtest/include/gtest/gtest.h" #include "testing/platform_test.h" #include "ui/base/cocoa/cocoa_event_utils.h" -#include "ui/base/events/event_constants.h" +#include "ui/events/event_constants.h" #import "ui/base/test/cocoa_test_event_utils.h" #import "ui/base/test/ui_cocoa_test_helper.h" diff --git a/ui/base/cocoa/events_mac.mm b/ui/base/cocoa/events_mac.mm index 878240d..da08510 100644 --- a/ui/base/cocoa/events_mac.mm +++ b/ui/base/cocoa/events_mac.mm @@ -4,12 +4,12 @@ #include <Cocoa/Cocoa.h> -#include "ui/base/events/event_constants.h" +#include "ui/events/event_constants.h" #include "base/event_types.h" #include "base/logging.h" #include "base/time/time.h" -#include "ui/base/events/event_utils.h" +#include "ui/events/event_utils.h" #import "ui/events/keycodes/keyboard_code_conversion_mac.h" #include "ui/gfx/point.h" diff --git a/ui/base/cocoa/events_mac_unittest.mm b/ui/base/cocoa/events_mac_unittest.mm index cf641c8..63f5319 100644 --- a/ui/base/cocoa/events_mac_unittest.mm +++ b/ui/base/cocoa/events_mac_unittest.mm @@ -5,8 +5,8 @@ #import <Cocoa/Cocoa.h> #include "testing/gtest/include/gtest/gtest.h" -#include "ui/base/events/event_constants.h" -#include "ui/base/events/event_utils.h" +#include "ui/events/event_constants.h" +#include "ui/events/event_utils.h" #include "ui/base/test/cocoa_test_event_utils.h" #import "ui/base/test/ui_cocoa_test_helper.h" #include "ui/gfx/point.h" diff --git a/ui/base/gestures/gesture_point.cc b/ui/base/gestures/gesture_point.cc index 29b382f..2233bf1 100644 --- a/ui/base/gestures/gesture_point.cc +++ b/ui/base/gestures/gesture_point.cc @@ -7,11 +7,11 @@ #include <cmath> #include "base/basictypes.h" -#include "ui/base/events/event.h" -#include "ui/base/events/event_constants.h" #include "ui/base/gestures/gesture_configuration.h" #include "ui/base/gestures/gesture_types.h" #include "ui/base/gestures/gesture_util.h" +#include "ui/events/event.h" +#include "ui/events/event_constants.h" namespace ui { diff --git a/ui/base/gestures/gesture_recognizer.h b/ui/base/gestures/gesture_recognizer.h index 2affc7a..dbb139b 100644 --- a/ui/base/gestures/gesture_recognizer.h +++ b/ui/base/gestures/gesture_recognizer.h @@ -8,9 +8,9 @@ #include <vector> #include "base/memory/scoped_vector.h" -#include "ui/base/events/event_constants.h" #include "ui/base/gestures/gesture_types.h" #include "ui/base/ui_export.h" +#include "ui/events/event_constants.h" namespace ui { // A GestureRecognizer is an abstract base class for conversion of touch events diff --git a/ui/base/gestures/gesture_recognizer_impl.cc b/ui/base/gestures/gesture_recognizer_impl.cc index 0e315a1..51aaa30 100644 --- a/ui/base/gestures/gesture_recognizer_impl.cc +++ b/ui/base/gestures/gesture_recognizer_impl.cc @@ -7,12 +7,12 @@ #include "base/logging.h" #include "base/memory/scoped_ptr.h" #include "base/time/time.h" -#include "ui/base/events/event.h" -#include "ui/base/events/event_constants.h" -#include "ui/base/events/event_utils.h" #include "ui/base/gestures/gesture_configuration.h" #include "ui/base/gestures/gesture_sequence.h" #include "ui/base/gestures/gesture_types.h" +#include "ui/events/event.h" +#include "ui/events/event_constants.h" +#include "ui/events/event_utils.h" namespace ui { diff --git a/ui/base/gestures/gesture_recognizer_impl.h b/ui/base/gestures/gesture_recognizer_impl.h index 812bc05..5f9caf2 100644 --- a/ui/base/gestures/gesture_recognizer_impl.h +++ b/ui/base/gestures/gesture_recognizer_impl.h @@ -10,9 +10,9 @@ #include "base/memory/linked_ptr.h" #include "base/memory/scoped_ptr.h" -#include "ui/base/events/event_constants.h" #include "ui/base/gestures/gesture_recognizer.h" #include "ui/base/ui_export.h" +#include "ui/events/event_constants.h" #include "ui/gfx/point.h" namespace ui { diff --git a/ui/base/gestures/gesture_sequence.cc b/ui/base/gestures/gesture_sequence.cc index ea2aafb..5d3619d 100644 --- a/ui/base/gestures/gesture_sequence.cc +++ b/ui/base/gestures/gesture_sequence.cc @@ -12,11 +12,11 @@ #include "base/memory/scoped_ptr.h" #include "base/strings/string_number_conversions.h" #include "base/time/time.h" -#include "ui/base/events/event.h" -#include "ui/base/events/event_constants.h" #include "ui/base/gestures/gesture_configuration.h" #include "ui/base/gestures/gesture_util.h" #include "ui/base/ui_base_switches.h" +#include "ui/events/event.h" +#include "ui/events/event_constants.h" #include "ui/gfx/rect.h" namespace ui { diff --git a/ui/base/gestures/gesture_sequence.h b/ui/base/gestures/gesture_sequence.h index 41dc009..ddb9083 100644 --- a/ui/base/gestures/gesture_sequence.h +++ b/ui/base/gestures/gesture_sequence.h @@ -6,9 +6,9 @@ #define UI_BASE_GESTURES_GESTURE_SEQUENCE_H_ #include "base/timer/timer.h" -#include "ui/base/events/event_constants.h" #include "ui/base/gestures/gesture_point.h" #include "ui/base/gestures/gesture_recognizer.h" +#include "ui/events/event_constants.h" #include "ui/gfx/rect.h" namespace ui { diff --git a/ui/base/gestures/gesture_types.h b/ui/base/gestures/gesture_types.h index 584ea17..bea1553 100644 --- a/ui/base/gestures/gesture_types.h +++ b/ui/base/gestures/gesture_types.h @@ -6,7 +6,7 @@ #define UI_BASE_GESTURES_GESTURE_TYPES_H_ #include "base/logging.h" -#include "ui/base/events/event_constants.h" +#include "ui/events/event_constants.h" #include "ui/gfx/rect.h" namespace ui { diff --git a/ui/base/ime/character_composer.cc b/ui/base/ime/character_composer.cc index 0402be2..27cdbec 100644 --- a/ui/base/ime/character_composer.cc +++ b/ui/base/ime/character_composer.cc @@ -14,9 +14,9 @@ // Note for Gtk removal: gdkkeysyms.h only contains a set of // '#define GDK_KeyName 0xNNNN' macros and does not #include any Gtk headers. #include "third_party/gtk+/gdk/gdkkeysyms.h" -#include "ui/base/events/event_constants.h" #include "ui/base/glib/glib_integers.h" #include "ui/base/x/x11_util.h" +#include "ui/events/event_constants.h" // Note for Gtk removal: gtkimcontextsimpleseqs.h does not #include any Gtk // headers and only contains one big guint16 array |gtk_compose_seqs_compact| diff --git a/ui/base/ime/character_composer_unittest.cc b/ui/base/ime/character_composer_unittest.cc index 9a79219..0710204 100644 --- a/ui/base/ime/character_composer_unittest.cc +++ b/ui/base/ime/character_composer_unittest.cc @@ -7,8 +7,8 @@ #include "base/strings/utf_string_conversions.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/gtk+/gdk/gdkkeysyms.h" -#include "ui/base/events/event_constants.h" #include "ui/base/glib/glib_integers.h" +#include "ui/events/event_constants.h" namespace ui { diff --git a/ui/base/ime/fake_input_method.cc b/ui/base/ime/fake_input_method.cc index ff3f5e4cf..2173616 100644 --- a/ui/base/ime/fake_input_method.cc +++ b/ui/base/ime/fake_input_method.cc @@ -6,12 +6,12 @@ #include "base/logging.h" #include "base/strings/string16.h" -#include "ui/base/events/event.h" -#include "ui/base/events/event_constants.h" -#include "ui/base/events/event_utils.h" #include "ui/base/glib/glib_integers.h" #include "ui/base/ime/input_method_delegate.h" #include "ui/base/ime/text_input_client.h" +#include "ui/events/event.h" +#include "ui/events/event_constants.h" +#include "ui/events/event_utils.h" #include "ui/events/keycodes/keyboard_code_conversion.h" #if defined(USE_X11) diff --git a/ui/base/ime/input_method_base.h b/ui/base/ime/input_method_base.h index c5dcfd6..665070a 100644 --- a/ui/base/ime/input_method_base.h +++ b/ui/base/ime/input_method_base.h @@ -8,9 +8,9 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" #include "base/observer_list.h" -#include "ui/base/events/event_constants.h" #include "ui/base/ime/input_method.h" #include "ui/base/ui_export.h" +#include "ui/events/event_constants.h" namespace gfx { class Rect; diff --git a/ui/base/ime/input_method_base_unittest.cc b/ui/base/ime/input_method_base_unittest.cc index a0558c2..cc7304c 100644 --- a/ui/base/ime/input_method_base_unittest.cc +++ b/ui/base/ime/input_method_base_unittest.cc @@ -6,9 +6,9 @@ #include "base/scoped_observer.h" #include "testing/gtest/include/gtest/gtest.h" -#include "ui/base/events/event.h" #include "ui/base/ime/dummy_text_input_client.h" #include "ui/base/ime/input_method_observer.h" +#include "ui/events/event.h" namespace ui { namespace { diff --git a/ui/base/ime/input_method_delegate.h b/ui/base/ime/input_method_delegate.h index d7e5ea2..2131943 100644 --- a/ui/base/ime/input_method_delegate.h +++ b/ui/base/ime/input_method_delegate.h @@ -6,8 +6,8 @@ #define UI_BASE_IME_INPUT_METHOD_DELEGATE_H_ #include "base/event_types.h" -#include "ui/base/events/event_constants.h" #include "ui/base/ui_export.h" +#include "ui/events/event_constants.h" #include "ui/events/keycodes/keyboard_codes.h" namespace ui { diff --git a/ui/base/ime/input_method_ibus.cc b/ui/base/ime/input_method_ibus.cc index 0a5d954..5db106e 100644 --- a/ui/base/ime/input_method_ibus.cc +++ b/ui/base/ime/input_method_ibus.cc @@ -26,10 +26,10 @@ #include "chromeos/dbus/ibus/ibus_text.h" #include "chromeos/ime/input_method_descriptor.h" #include "chromeos/ime/input_method_manager.h" -#include "ui/base/events/event.h" -#include "ui/base/events/event_constants.h" -#include "ui/base/events/event_utils.h" #include "ui/base/ime/text_input_client.h" +#include "ui/events/event.h" +#include "ui/events/event_constants.h" +#include "ui/events/event_utils.h" #include "ui/events/keycodes/keyboard_code_conversion.h" #include "ui/events/keycodes/keyboard_code_conversion_x.h" #include "ui/events/keycodes/keyboard_codes.h" @@ -185,7 +185,7 @@ bool InputMethodIBus::DispatchKeyEvent(const base::NativeEvent& native_event) { pending_key_events_.insert(current_keyevent_id_); // Since |native_event| might be treated as XEvent whose size is bigger than - // XKeyEvent e.g. in CopyNativeEvent() in ui/base/events/event.cc, allocating + // XKeyEvent e.g. in CopyNativeEvent() in ui/events/event.cc, allocating // |event| as XKeyEvent and casting it to XEvent is unsafe. crbug.com/151884 XEvent* event = new XEvent; *event = *native_event; diff --git a/ui/base/ime/input_method_win.cc b/ui/base/ime/input_method_win.cc index 343a861..bf679ed 100644 --- a/ui/base/ime/input_method_win.cc +++ b/ui/base/ime/input_method_win.cc @@ -5,10 +5,10 @@ #include "ui/base/ime/input_method_win.h" #include "base/basictypes.h" -#include "ui/base/events/event.h" -#include "ui/base/events/event_constants.h" -#include "ui/base/events/event_utils.h" #include "ui/base/ime/text_input_client.h" +#include "ui/events/event.h" +#include "ui/events/event_constants.h" +#include "ui/events/event_utils.h" #include "ui/events/keycodes/keyboard_codes.h" #include "ui/gfx/win/hwnd_util.h" diff --git a/ui/base/ozone/evdev/key_event_converter_ozone.cc b/ui/base/ozone/evdev/key_event_converter_ozone.cc index 10da4a1..66ec892 100644 --- a/ui/base/ozone/evdev/key_event_converter_ozone.cc +++ b/ui/base/ozone/evdev/key_event_converter_ozone.cc @@ -6,7 +6,7 @@ #include <linux/input.h> -#include "ui/base/events/event.h" +#include "ui/events/event.h" #include "ui/events/keycodes/keyboard_codes.h" namespace { diff --git a/ui/base/ozone/evdev/touch_event_converter_ozone.cc b/ui/base/ozone/evdev/touch_event_converter_ozone.cc index 148ed72..e34adcd 100644 --- a/ui/base/ozone/evdev/touch_event_converter_ozone.cc +++ b/ui/base/ozone/evdev/touch_event_converter_ozone.cc @@ -18,9 +18,9 @@ #include "base/logging.h" #include "base/message_loop/message_loop.h" #include "base/message_loop/message_pump_ozone.h" -#include "ui/base/events/event.h" -#include "ui/base/events/event_constants.h" #include "ui/base/ozone/surface_factory_ozone.h" +#include "ui/events/event.h" +#include "ui/events/event_constants.h" namespace { diff --git a/ui/base/ozone/evdev/touch_event_converter_ozone.h b/ui/base/ozone/evdev/touch_event_converter_ozone.h index 24be78e..62f1bfe 100644 --- a/ui/base/ozone/evdev/touch_event_converter_ozone.h +++ b/ui/base/ozone/evdev/touch_event_converter_ozone.h @@ -8,9 +8,9 @@ #include <bitset> #include "base/compiler_specific.h" -#include "ui/base/events/event_constants.h" #include "ui/base/ozone/event_converter_ozone.h" #include "ui/base/ui_export.h" +#include "ui/events/event_constants.h" namespace ui { diff --git a/ui/base/ozone/evdev/touch_event_converter_ozone_unittest.cc b/ui/base/ozone/evdev/touch_event_converter_ozone_unittest.cc index 61bf54b..b75741d 100644 --- a/ui/base/ozone/evdev/touch_event_converter_ozone_unittest.cc +++ b/ui/base/ozone/evdev/touch_event_converter_ozone_unittest.cc @@ -16,8 +16,8 @@ #include "base/run_loop.h" #include "base/time/time.h" #include "testing/gtest/include/gtest/gtest.h" -#include "ui/base/events/event.h" #include "ui/base/ozone/evdev/touch_event_converter_ozone.h" +#include "ui/events/event.h" namespace { diff --git a/ui/base/ozone/event_converter_ozone.cc b/ui/base/ozone/event_converter_ozone.cc index 485ea22..95d52f8 100644 --- a/ui/base/ozone/event_converter_ozone.cc +++ b/ui/base/ozone/event_converter_ozone.cc @@ -7,7 +7,7 @@ #include "base/bind.h" #include "base/message_loop/message_loop.h" #include "base/message_loop/message_pump_ozone.h" -#include "ui/base/events/event.h" +#include "ui/events/event.h" namespace { diff --git a/ui/base/ozone/events_ozone.cc b/ui/base/ozone/events_ozone.cc index cad17f6..0db40f4 100644 --- a/ui/base/ozone/events_ozone.cc +++ b/ui/base/ozone/events_ozone.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/base/events/event.h" -#include "ui/base/events/event_constants.h" -#include "ui/base/events/event_utils.h" +#include "ui/events/event.h" +#include "ui/events/event_constants.h" +#include "ui/events/event_utils.h" namespace ui { diff --git a/ui/base/ui_base_types.cc b/ui/base/ui_base_types.cc index 2d3f8127..e757edb 100644 --- a/ui/base/ui_base_types.cc +++ b/ui/base/ui_base_types.cc @@ -4,7 +4,7 @@ #include "ui/base/ui_base_types.h" -#include "ui/base/events/event.h" +#include "ui/events/event.h" namespace ui { diff --git a/ui/base/win/events_win.cc b/ui/base/win/events_win.cc index 94faf21..04b9cd0 100644 --- a/ui/base/win/events_win.cc +++ b/ui/base/win/events_win.cc @@ -4,12 +4,12 @@ #include <windowsx.h> -#include "ui/base/events/event_constants.h" +#include "ui/events/event_constants.h" #include "base/logging.h" #include "base/time/time.h" #include "base/win/win_util.h" -#include "ui/base/events/event_utils.h" +#include "ui/events/event_utils.h" #include "ui/events/keycodes/keyboard_code_conversion_win.h" #include "ui/gfx/point.h" #include "ui/gfx/win/dpi.h" diff --git a/ui/base/window_open_disposition.cc b/ui/base/window_open_disposition.cc index 5e27bcc..c0d131f 100644 --- a/ui/base/window_open_disposition.cc +++ b/ui/base/window_open_disposition.cc @@ -5,7 +5,7 @@ #include "ui/base/window_open_disposition.h" #include "build/build_config.h" -#include "ui/base/events/event_constants.h" +#include "ui/events/event_constants.h" namespace ui { diff --git a/ui/base/x/device_data_manager.cc b/ui/base/x/device_data_manager.cc index 91a021b..390abdb 100644 --- a/ui/base/x/device_data_manager.cc +++ b/ui/base/x/device_data_manager.cc @@ -10,11 +10,11 @@ #include "base/logging.h" #include "base/memory/singleton.h" -#include "ui/base/events/event_constants.h" -#include "ui/base/events/event_utils.h" #include "ui/base/touch/touch_factory_x11.h" #include "ui/base/x/device_list_cache_x.h" #include "ui/base/x/x11_util.h" +#include "ui/events/event_constants.h" +#include "ui/events/event_utils.h" // XIScrollClass was introduced in XI 2.1 so we need to define it here // for backward-compatibility with older versions of XInput. diff --git a/ui/base/x/device_data_manager.h b/ui/base/x/device_data_manager.h index 82718ab..f07012f 100644 --- a/ui/base/x/device_data_manager.h +++ b/ui/base/x/device_data_manager.h @@ -13,9 +13,9 @@ #include "base/basictypes.h" #include "base/event_types.h" -#include "ui/base/events/event_constants.h" #include "ui/base/ui_export.h" #include "ui/base/x/x11_atom_cache.h" +#include "ui/events/event_constants.h" template <typename T> struct DefaultSingletonTraits; diff --git a/ui/base/x/events_x.cc b/ui/base/x/events_x.cc index e3b917b..baa3bcf 100644 --- a/ui/base/x/events_x.cc +++ b/ui/base/x/events_x.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/base/events/event_constants.h" +#include "ui/events/event_constants.h" #include <string.h> #include <X11/extensions/XInput.h> @@ -12,12 +12,12 @@ #include "base/logging.h" #include "base/memory/singleton.h" #include "base/message_loop/message_pump_x11.h" -#include "ui/base/events/event_utils.h" #include "ui/base/touch/touch_factory_x11.h" #include "ui/base/x/device_data_manager.h" #include "ui/base/x/device_list_cache_x.h" #include "ui/base/x/x11_atom_cache.h" #include "ui/base/x/x11_util.h" +#include "ui/events/event_utils.h" #include "ui/events/keycodes/keyboard_code_conversion_x.h" #include "ui/gfx/display.h" #include "ui/gfx/point.h" diff --git a/ui/base/x/events_x_unittest.cc b/ui/base/x/events_x_unittest.cc index 232c026..3a85a0a 100644 --- a/ui/base/x/events_x_unittest.cc +++ b/ui/base/x/events_x_unittest.cc @@ -12,11 +12,11 @@ #undef None #include "testing/gtest/include/gtest/gtest.h" -#include "ui/base/events/event.h" -#include "ui/base/events/event_constants.h" -#include "ui/base/events/event_utils.h" #include "ui/base/touch/touch_factory_x11.h" #include "ui/base/x/device_data_manager.h" +#include "ui/events/event.h" +#include "ui/events/event_constants.h" +#include "ui/events/event_utils.h" #include "ui/gfx/point.h" namespace ui { diff --git a/ui/base/x/x11_util.cc b/ui/base/x/x11_util.cc index 122b469..a51e6e5 100644 --- a/ui/base/x/x11_util.cc +++ b/ui/base/x/x11_util.cc @@ -34,11 +34,11 @@ #include "base/threading/thread.h" #include "third_party/skia/include/core/SkBitmap.h" #include "third_party/skia/include/core/SkPostConfig.h" -#include "ui/base/events/event_utils.h" #include "ui/base/touch/touch_factory_x11.h" #include "ui/base/x/device_data_manager.h" #include "ui/base/x/x11_error_tracker.h" #include "ui/base/x/x11_util_internal.h" +#include "ui/events/event_utils.h" #include "ui/events/keycodes/keyboard_code_conversion_x.h" #include "ui/gfx/canvas.h" #include "ui/gfx/image/image_skia.h" diff --git a/ui/base/x/x11_util.h b/ui/base/x/x11_util.h index 5163537..24a4418 100644 --- a/ui/base/x/x11_util.h +++ b/ui/base/x/x11_util.h @@ -17,8 +17,8 @@ #include "base/basictypes.h" #include "base/event_types.h" #include "base/memory/ref_counted_memory.h" -#include "ui/base/events/event_constants.h" #include "ui/base/ui_export.h" +#include "ui/events/event_constants.h" #include "ui/events/keycodes/keyboard_codes.h" #include "ui/gfx/point.h" diff --git a/ui/base/events/OWNERS b/ui/events/OWNERS index b8e32c1..b8e32c1 100644 --- a/ui/base/events/OWNERS +++ b/ui/events/OWNERS diff --git a/ui/base/events/event.cc b/ui/events/event.cc index 9fc80d4..46c31a6 100644 --- a/ui/base/events/event.cc +++ b/ui/events/event.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/base/events/event.h" +#include "ui/events/event.h" #if defined(USE_X11) #include <X11/Xlib.h> @@ -13,7 +13,7 @@ #include "base/metrics/histogram.h" #include "base/strings/stringprintf.h" -#include "ui/base/events/event_utils.h" +#include "ui/events/event_utils.h" #include "ui/events/keycodes/keyboard_code_conversion.h" #include "ui/gfx/point3_f.h" #include "ui/gfx/point_conversions.h" diff --git a/ui/base/events/event.h b/ui/events/event.h index d305574..be2587f 100644 --- a/ui/base/events/event.h +++ b/ui/events/event.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_BASE_EVENTS_EVENT_H_ -#define UI_BASE_EVENTS_EVENT_H_ +#ifndef UI_EVENTS_EVENT_H_ +#define UI_EVENTS_EVENT_H_ #include "base/basictypes.h" #include "base/compiler_specific.h" @@ -11,10 +11,10 @@ #include "base/logging.h" #include "base/time/time.h" #include "ui/base/dragdrop/os_exchange_data.h" -#include "ui/base/events/event_constants.h" #include "ui/base/gestures/gesture_types.h" #include "ui/base/latency_info.h" #include "ui/base/ui_export.h" +#include "ui/events/event_constants.h" #include "ui/events/keycodes/keyboard_codes.h" #include "ui/gfx/point.h" @@ -716,4 +716,4 @@ class UI_EXPORT GestureEvent : public LocatedEvent { } // namespace ui -#endif // UI_BASE_EVENTS_EVENT_H_ +#endif // UI_EVENTS_EVENT_H_ diff --git a/ui/base/events/event_constants.h b/ui/events/event_constants.h index 2c04770..6c0e9f7 100644 --- a/ui/base/events/event_constants.h +++ b/ui/events/event_constants.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_BASE_EVENTS_EVENT_CONSTANTS_H_ -#define UI_BASE_EVENTS_EVENT_CONSTANTS_H_ +#ifndef UI_EVENTS_EVENT_CONSTANTS_H_ +#define UI_EVENTS_EVENT_CONSTANTS_H_ namespace ui { @@ -113,4 +113,4 @@ enum EventPhase { } // namespace ui -#endif // UI_BASE_EVENTS_EVENT_CONSTANTS_H_ +#endif // UI_EVENTS_EVENT_CONSTANTS_H_ diff --git a/ui/base/events/event_conversion_gtk.cc b/ui/events/event_conversion_gtk.cc index bc15dac..c0a5738 100644 --- a/ui/base/events/event_conversion_gtk.cc +++ b/ui/events/event_conversion_gtk.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/base/events/event_conversion_gtk.h" +#include "ui/events/event_conversion_gtk.h" -#include "ui/base/events/event_constants.h" +#include "ui/events/event_constants.h" namespace ui { diff --git a/ui/base/events/event_conversion_gtk.h b/ui/events/event_conversion_gtk.h index a78d092..f1019837 100644 --- a/ui/base/events/event_conversion_gtk.h +++ b/ui/events/event_conversion_gtk.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_BASE_EVENTS_EVENT_CONVERSION_GTK_H_ -#define UI_BASE_EVENTS_EVENT_CONVERSION_GTK_H_ +#ifndef UI_EVENTS_EVENT_CONVERSION_GTK_H_ +#define UI_EVENTS_EVENT_CONVERSION_GTK_H_ #include <gtk/gtk.h> @@ -17,4 +17,4 @@ UI_EXPORT GdkModifierType EventFlagToGdkModifier(int event_flag); } // namespace ui -#endif // UI_BASE_EVENTS_EVENT_CONVERSION_GTK_H_ +#endif // UI_EVENTS_EVENT_CONVERSION_GTK_H_ diff --git a/ui/base/events/event_dispatcher.cc b/ui/events/event_dispatcher.cc index 06c857c..b774b94 100644 --- a/ui/base/events/event_dispatcher.cc +++ b/ui/events/event_dispatcher.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/base/events/event_dispatcher.h" +#include "ui/events/event_dispatcher.h" #include <algorithm> diff --git a/ui/base/events/event_dispatcher.h b/ui/events/event_dispatcher.h index b9fd0dc..caaa514 100644 --- a/ui/base/events/event_dispatcher.h +++ b/ui/events/event_dispatcher.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_BASE_EVENTS_EVENT_DISPATCHER_H_ -#define UI_BASE_EVENTS_EVENT_DISPATCHER_H_ +#ifndef UI_EVENTS_EVENT_DISPATCHER_H_ +#define UI_EVENTS_EVENT_DISPATCHER_H_ #include "base/auto_reset.h" -#include "ui/base/events/event.h" -#include "ui/base/events/event_constants.h" -#include "ui/base/events/event_target.h" #include "ui/base/ui_export.h" +#include "ui/events/event.h" +#include "ui/events/event_constants.h" +#include "ui/events/event_target.h" namespace ui { @@ -77,4 +77,4 @@ class UI_EXPORT EventDispatcher { } // namespace ui -#endif // UI_BASE_EVENTS_EVENT_DISPATCHER_H_ +#endif // UI_EVENTS_EVENT_DISPATCHER_H_ diff --git a/ui/base/events/event_dispatcher_unittest.cc b/ui/events/event_dispatcher_unittest.cc index 41ab048..b0b3b8a 100644 --- a/ui/base/events/event_dispatcher_unittest.cc +++ b/ui/events/event_dispatcher_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/base/events/event_dispatcher.h" +#include "ui/events/event_dispatcher.h" #include "testing/gtest/include/gtest/gtest.h" -#include "ui/base/events/event.h" -#include "ui/base/events/event_utils.h" +#include "ui/events/event.h" +#include "ui/events/event_utils.h" namespace ui { diff --git a/ui/base/events/event_handler.cc b/ui/events/event_handler.cc index 99295b15..243007a 100644 --- a/ui/base/events/event_handler.cc +++ b/ui/events/event_handler.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/base/events/event_dispatcher.h" -#include "ui/base/events/event_handler.h" +#include "ui/events/event_handler.h" -#include "ui/base/events/event.h" +#include "ui/events/event.h" +#include "ui/events/event_dispatcher.h" namespace ui { diff --git a/ui/base/events/event_handler.h b/ui/events/event_handler.h index 6ecc389..bee8690 100644 --- a/ui/base/events/event_handler.h +++ b/ui/events/event_handler.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_BASE_EVENTS_EVENT_HANDLER_H_ -#define UI_BASE_EVENTS_EVENT_HANDLER_H_ +#ifndef UI_EVENTS_EVENT_HANDLER_H_ +#define UI_EVENTS_EVENT_HANDLER_H_ #include <stack> #include <vector> #include "base/basictypes.h" -#include "ui/base/events/event_constants.h" #include "ui/base/ui_export.h" +#include "ui/events/event_constants.h" namespace ui { @@ -63,4 +63,4 @@ typedef std::vector<EventHandler*> EventHandlerList; } // namespace ui -#endif // UI_BASE_EVENTS_EVENT_HANDLER_H_ +#endif // UI_EVENTS_EVENT_HANDLER_H_ diff --git a/ui/base/events/event_target.cc b/ui/events/event_target.cc index 7ef69c8..9aa53902 100644 --- a/ui/base/events/event_target.cc +++ b/ui/events/event_target.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/base/events/event_target.h" +#include "ui/events/event_target.h" #include <algorithm> #include "base/logging.h" -#include "ui/base/events/event.h" +#include "ui/events/event.h" namespace ui { diff --git a/ui/base/events/event_target.h b/ui/events/event_target.h index 6961b73..b37bff1 100644 --- a/ui/base/events/event_target.h +++ b/ui/events/event_target.h @@ -2,13 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef UI_BASE_EVENTS_EVENT_TARGET_H_ -#define UI_BASE_EVENTS_EVENT_TARGET_H_ +#ifndef UI_EVENTS_EVENT_TARGET_H_ +#define UI_EVENTS_EVENT_TARGET_H_ #include "base/basictypes.h" #include "base/compiler_specific.h" -#include "ui/base/events/event_handler.h" #include "ui/base/ui_export.h" +#include "ui/events/event_handler.h" namespace ui { @@ -105,4 +105,4 @@ class UI_EXPORT EventTarget : public EventHandler { } // namespace ui -#endif // UI_BASE_EVENTS_EVENT_TARGET_H_ +#endif // UI_EVENTS_EVENT_TARGET_H_ diff --git a/ui/base/events/event_unittest.cc b/ui/events/event_unittest.cc index d55ac92..418c069 100644 --- a/ui/base/events/event_unittest.cc +++ b/ui/events/event_unittest.cc @@ -3,7 +3,7 @@ // found in the LICENSE file. #include "testing/gtest/include/gtest/gtest.h" -#include "ui/base/events/event.h" +#include "ui/events/event.h" #if defined(USE_X11) #include <X11/Xlib.h> diff --git a/ui/base/events/event_utils.cc b/ui/events/event_utils.cc index ac09854..5504e4c 100644 --- a/ui/base/events/event_utils.cc +++ b/ui/events/event_utils.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/base/events/event_utils.h" +#include "ui/events/event_utils.h" -#include "ui/base/events/event.h" +#include "ui/events/event.h" namespace ui { diff --git a/ui/base/events/event_utils.h b/ui/events/event_utils.h index e544221..ed74eb1 100644 --- a/ui/base/events/event_utils.h +++ b/ui/events/event_utils.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_BASE_EVENTS_EVENT_UTILS_H_ -#define UI_BASE_EVENTS_EVENT_UTILS_H_ +#ifndef UI_EVENTS_EVENT_UTILS_H_ +#define UI_EVENTS_EVENT_UTILS_H_ #include "base/event_types.h" -#include "ui/base/events/event_constants.h" +#include "ui/events/event_constants.h" #include "ui/events/keycodes/keyboard_codes.h" #include "ui/gfx/native_widget_types.h" @@ -150,4 +150,4 @@ UI_EXPORT int RegisterCustomEventType(); } // namespace ui -#endif // UI_BASE_EVENTS_EVENT_UTILS_H_ +#endif // UI_EVENTS_EVENT_UTILS_H_ diff --git a/ui/events/keycodes/keyboard_code_conversion.cc b/ui/events/keycodes/keyboard_code_conversion.cc index 293790b..a812b51 100644 --- a/ui/events/keycodes/keyboard_code_conversion.cc +++ b/ui/events/keycodes/keyboard_code_conversion.cc @@ -4,7 +4,7 @@ #include "ui/events/keycodes/keyboard_code_conversion.h" -#include "ui/base/events/event_constants.h" +#include "ui/events/event_constants.h" namespace ui { diff --git a/ui/message_center/views/message_popup_collection_unittest.cc b/ui/message_center/views/message_popup_collection_unittest.cc index d2b897d..a46a5b6 100644 --- a/ui/message_center/views/message_popup_collection_unittest.cc +++ b/ui/message_center/views/message_popup_collection_unittest.cc @@ -10,8 +10,8 @@ #include "base/strings/string_number_conversions.h" #include "base/strings/utf_string_conversions.h" #include "testing/gtest/include/gtest/gtest.h" -#include "ui/base/events/event.h" -#include "ui/base/events/event_constants.h" +#include "ui/events/event.h" +#include "ui/events/event_constants.h" #include "ui/gfx/display.h" #include "ui/gfx/rect.h" #include "ui/message_center/fake_message_center.h" diff --git a/ui/metro_viewer/metro_viewer_messages.h b/ui/metro_viewer/metro_viewer_messages.h index 7455262..231bead 100644 --- a/ui/metro_viewer/metro_viewer_messages.h +++ b/ui/metro_viewer/metro_viewer_messages.h @@ -8,7 +8,7 @@ #include "base/basictypes.h" #include "ipc/ipc_message_macros.h" -#include "ui/base/events/event_constants.h" +#include "ui/events/event_constants.h" #include "ui/gfx/native_widget_types.h" #define IPC_MESSAGE_START MetroViewerMsgStart @@ -163,19 +163,6 @@ 'base/dragdrop/os_exchange_data_provider_aura.h', 'base/dragdrop/os_exchange_data_provider_win.cc', 'base/dragdrop/os_exchange_data_provider_win.h', - 'base/events/event.cc', - 'base/events/event.h', - 'base/events/event_constants.h', - 'base/events/event_conversion_gtk.cc', - 'base/events/event_conversion_gtk.h', - 'base/events/event_dispatcher.cc', - 'base/events/event_dispatcher.h', - 'base/events/event_handler.cc', - 'base/events/event_handler.h', - 'base/events/event_target.cc', - 'base/events/event_target.h', - 'base/events/event_utils.cc', - 'base/events/event_utils.h', 'base/gestures/gesture_configuration.cc', 'base/gestures/gesture_configuration.h', 'base/gestures/gesture_point.cc', @@ -366,6 +353,19 @@ 'base/x/x11_util.cc', 'base/x/x11_util.h', 'base/x/x11_util_internal.h', + 'events/event.cc', + 'events/event.h', + 'events/event_constants.h', + 'events/event_conversion_gtk.cc', + 'events/event_conversion_gtk.h', + 'events/event_dispatcher.cc', + 'events/event_dispatcher.h', + 'events/event_handler.cc', + 'events/event_handler.h', + 'events/event_target.cc', + 'events/event_target.h', + 'events/event_utils.cc', + 'events/event_utils.h', 'events/keycodes/keyboard_code_conversion.cc', 'events/keycodes/keyboard_code_conversion.h', 'events/keycodes/keyboard_code_conversion_android.cc', @@ -884,15 +884,15 @@ }], ['toolkit_views==0', { 'sources!': [ - 'base/events/event.cc', - 'base/events/event.h', - 'base/events/event_dispatcher.cc', - 'base/events/event_dispatcher.h', - 'base/events/event_handler.cc', - 'base/events/event_handler.h', - 'base/events/event_target.cc', - 'base/events/event_target.h', 'base/x/events_x.cc', + 'events/event.cc', + 'events/event.h', + 'events/event_dispatcher.cc', + 'events/event_dispatcher.h', + 'events/event_handler.cc', + 'events/event_handler.h', + 'events/event_target.cc', + 'events/event_target.h', ], }], ['OS=="android"', { @@ -902,7 +902,7 @@ 'base/default_theme_provider.cc', 'base/dragdrop/drag_utils.cc', 'base/dragdrop/drag_utils.h', - 'base/events/event_utils.cc', + 'events/event_utils.cc', 'events/keycodes/keyboard_code_conversion.cc', 'base/l10n/l10n_font_util.cc', 'base/models/button_menu_item_model.cc', diff --git a/ui/ui_unittests.gypi b/ui/ui_unittests.gypi index 634bc31..3064c3a 100644 --- a/ui/ui_unittests.gypi +++ b/ui/ui_unittests.gypi @@ -153,8 +153,6 @@ 'base/cocoa/nsgraphics_context_additions_unittest.mm', 'base/cocoa/tracking_area_unittest.mm', 'base/dragdrop/os_exchange_data_provider_aurax11_unittest.cc', - 'base/events/event_dispatcher_unittest.cc', - 'base/events/event_unittest.cc', 'base/gtk/gtk_expanded_container_unittest.cc', 'base/gtk/gtk_im_context_util_unittest.cc', 'base/keycodes/usb_keycode_map_unittest.cc', @@ -167,6 +165,8 @@ 'base/test/data/resource.h', 'base/text/bytes_formatting_unittest.cc', 'base/view_prop_unittest.cc', + 'events/event_dispatcher_unittest.cc', + 'events/event_unittest.cc', 'gfx/blit_unittest.cc', 'gfx/break_list_unittest.cc', 'gfx/canvas_unittest.cc', @@ -314,8 +314,8 @@ ], }, { 'sources!': [ - 'base/events/event_dispatcher_unittest.cc', - 'base/events/event_unittest.cc', + 'events/event_dispatcher_unittest.cc', + 'events/event_unittest.cc', ], }], ['use_aura==1', { diff --git a/ui/views/bubble/tray_bubble_view.cc b/ui/views/bubble/tray_bubble_view.cc index 825c6ce..6192e51 100644 --- a/ui/views/bubble/tray_bubble_view.cc +++ b/ui/views/bubble/tray_bubble_view.cc @@ -12,10 +12,10 @@ #include "third_party/skia/include/core/SkPath.h" #include "third_party/skia/include/effects/SkBlurImageFilter.h" #include "ui/base/accessibility/accessible_view_state.h" -#include "ui/base/events/event.h" #include "ui/base/l10n/l10n_util.h" #include "ui/compositor/layer.h" #include "ui/compositor/layer_delegate.h" +#include "ui/events/event.h" #include "ui/gfx/canvas.h" #include "ui/gfx/insets.h" #include "ui/gfx/path.h" diff --git a/ui/views/color_chooser/color_chooser_view.cc b/ui/views/color_chooser/color_chooser_view.cc index da8ae71..c4a136b 100644 --- a/ui/views/color_chooser/color_chooser_view.cc +++ b/ui/views/color_chooser/color_chooser_view.cc @@ -8,7 +8,7 @@ #include "base/strings/string_number_conversions.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" -#include "ui/base/events/event.h" +#include "ui/events/event.h" #include "ui/events/keycodes/keyboard_codes.h" #include "ui/gfx/canvas.h" #include "ui/views/background.h" diff --git a/ui/views/controls/button/custom_button.cc b/ui/views/controls/button/custom_button.cc index 4dd28da..4a15975 100644 --- a/ui/views/controls/button/custom_button.cc +++ b/ui/views/controls/button/custom_button.cc @@ -5,7 +5,7 @@ #include "ui/views/controls/button/custom_button.h" #include "ui/base/accessibility/accessible_view_state.h" -#include "ui/base/events/event.h" +#include "ui/events/event.h" #include "ui/events/keycodes/keyboard_codes.h" #include "ui/gfx/animation/throb_animation.h" #include "ui/gfx/screen.h" diff --git a/ui/views/controls/button/custom_button.h b/ui/views/controls/button/custom_button.h index b818ffd..ecb49f6 100644 --- a/ui/views/controls/button/custom_button.h +++ b/ui/views/controls/button/custom_button.h @@ -6,7 +6,7 @@ #define UI_VIEWS_CONTROLS_BUTTON_CUSTOM_BUTTON_H_ #include "base/memory/scoped_ptr.h" -#include "ui/base/events/event_constants.h" +#include "ui/events/event_constants.h" #include "ui/gfx/animation/animation_delegate.h" #include "ui/views/controls/button/button.h" diff --git a/ui/views/controls/button/menu_button.cc b/ui/views/controls/button/menu_button.cc index c432676..b2e7037 100644 --- a/ui/views/controls/button/menu_button.cc +++ b/ui/views/controls/button/menu_button.cc @@ -9,10 +9,10 @@ #include "grit/ui_strings.h" #include "ui/base/accessibility/accessible_view_state.h" #include "ui/base/dragdrop/drag_drop_types.h" -#include "ui/base/events/event.h" -#include "ui/base/events/event_constants.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" +#include "ui/events/event.h" +#include "ui/events/event_constants.h" #include "ui/gfx/canvas.h" #include "ui/gfx/image/image.h" #include "ui/gfx/screen.h" diff --git a/ui/views/controls/combobox/combobox.cc b/ui/views/controls/combobox/combobox.cc index cc1911d..8ef7b36 100644 --- a/ui/views/controls/combobox/combobox.cc +++ b/ui/views/controls/combobox/combobox.cc @@ -8,9 +8,9 @@ #include "base/strings/utf_string_conversions.h" #include "grit/ui_resources.h" #include "ui/base/accessibility/accessible_view_state.h" -#include "ui/base/events/event.h" #include "ui/base/models/combobox_model.h" #include "ui/base/resource/resource_bundle.h" +#include "ui/events/event.h" #include "ui/events/keycodes/keyboard_codes.h" #include "ui/gfx/canvas.h" #include "ui/native_theme/native_theme.h" diff --git a/ui/views/controls/combobox/combobox_unittest.cc b/ui/views/controls/combobox/combobox_unittest.cc index 82b7b65..ea8d8f5 100644 --- a/ui/views/controls/combobox/combobox_unittest.cc +++ b/ui/views/controls/combobox/combobox_unittest.cc @@ -7,8 +7,8 @@ #include <set> #include "base/strings/utf_string_conversions.h" -#include "ui/base/events/event.h" #include "ui/base/models/combobox_model.h" +#include "ui/events/event.h" #include "ui/events/keycodes/keyboard_codes.h" #include "ui/views/ime/mock_input_method.h" #include "ui/views/test/views_test_base.h" diff --git a/ui/views/controls/link.cc b/ui/views/controls/link.cc index ff78d3b..b2bcc8f 100644 --- a/ui/views/controls/link.cc +++ b/ui/views/controls/link.cc @@ -9,7 +9,7 @@ #include "base/logging.h" #include "base/strings/utf_string_conversions.h" #include "ui/base/accessibility/accessible_view_state.h" -#include "ui/base/events/event.h" +#include "ui/events/event.h" #include "ui/events/keycodes/keyboard_codes.h" #include "ui/gfx/color_utils.h" #include "ui/gfx/font.h" diff --git a/ui/views/controls/menu/menu_controller.cc b/ui/views/controls/menu/menu_controller.cc index ba53e21..68ff328 100644 --- a/ui/views/controls/menu/menu_controller.cc +++ b/ui/views/controls/menu/menu_controller.cc @@ -15,9 +15,9 @@ #include "base/time/time.h" #include "ui/base/dragdrop/drag_utils.h" #include "ui/base/dragdrop/os_exchange_data.h" -#include "ui/base/events/event_constants.h" -#include "ui/base/events/event_utils.h" #include "ui/base/l10n/l10n_util.h" +#include "ui/events/event_constants.h" +#include "ui/events/event_utils.h" #include "ui/events/keycodes/keyboard_codes.h" #include "ui/gfx/canvas.h" #include "ui/gfx/native_widget_types.h" diff --git a/ui/views/controls/menu/menu_controller.h b/ui/views/controls/menu/menu_controller.h index 3037289..1bd571a 100644 --- a/ui/views/controls/menu/menu_controller.h +++ b/ui/views/controls/menu/menu_controller.h @@ -15,7 +15,7 @@ #include "base/memory/scoped_ptr.h" #include "base/message_loop/message_loop.h" #include "base/timer/timer.h" -#include "ui/base/events/event_constants.h" +#include "ui/events/event_constants.h" #include "ui/views/controls/menu/menu_delegate.h" #include "ui/views/controls/menu/menu_item_view.h" #include "ui/views/widget/widget_observer.h" diff --git a/ui/views/controls/menu/submenu_view.cc b/ui/views/controls/menu/submenu_view.cc index fce2983..9184ca9 100644 --- a/ui/views/controls/menu/submenu_view.cc +++ b/ui/views/controls/menu/submenu_view.cc @@ -8,7 +8,7 @@ #include "base/compiler_specific.h" #include "ui/base/accessibility/accessible_view_state.h" -#include "ui/base/events/event.h" +#include "ui/events/event.h" #include "ui/gfx/canvas.h" #include "ui/views/controls/menu/menu_config.h" #include "ui/views/controls/menu/menu_controller.h" diff --git a/ui/views/controls/scroll_view.cc b/ui/views/controls/scroll_view.cc index 11ffc02..d835c1e 100644 --- a/ui/views/controls/scroll_view.cc +++ b/ui/views/controls/scroll_view.cc @@ -5,7 +5,7 @@ #include "ui/views/controls/scroll_view.h" #include "base/logging.h" -#include "ui/base/events/event.h" +#include "ui/events/event.h" #include "ui/native_theme/native_theme.h" #include "ui/views/border.h" #include "ui/views/controls/scrollbar/native_scroll_bar.h" diff --git a/ui/views/controls/scrollbar/base_scroll_bar.cc b/ui/views/controls/scrollbar/base_scroll_bar.cc index 0d0acca..6271c2e 100644 --- a/ui/views/controls/scrollbar/base_scroll_bar.cc +++ b/ui/views/controls/scrollbar/base_scroll_bar.cc @@ -13,8 +13,8 @@ #include "base/strings/utf_string_conversions.h" #include "build/build_config.h" #include "grit/ui_strings.h" -#include "ui/base/events/event.h" #include "ui/base/l10n/l10n_util.h" +#include "ui/events/event.h" #include "ui/events/keycodes/keyboard_codes.h" #include "ui/gfx/canvas.h" #include "ui/views/controls/menu/menu_item_view.h" diff --git a/ui/views/controls/scrollbar/native_scroll_bar.cc b/ui/views/controls/scrollbar/native_scroll_bar.cc index de2ec37..9a91370 100644 --- a/ui/views/controls/scrollbar/native_scroll_bar.cc +++ b/ui/views/controls/scrollbar/native_scroll_bar.cc @@ -8,7 +8,7 @@ #include <string> #include "base/message_loop/message_loop.h" -#include "ui/base/events/event.h" +#include "ui/events/event.h" #include "ui/views/controls/scrollbar/native_scroll_bar_wrapper.h" #include "ui/views/widget/widget.h" diff --git a/ui/views/controls/slider.cc b/ui/views/controls/slider.cc index a715c96..0a5c7f0 100644 --- a/ui/views/controls/slider.cc +++ b/ui/views/controls/slider.cc @@ -13,8 +13,8 @@ #include "third_party/skia/include/core/SkColor.h" #include "third_party/skia/include/core/SkPaint.h" #include "ui/base/accessibility/accessible_view_state.h" -#include "ui/base/events/event.h" #include "ui/base/resource/resource_bundle.h" +#include "ui/events/event.h" #include "ui/gfx/animation/slide_animation.h" #include "ui/gfx/canvas.h" #include "ui/gfx/point.h" diff --git a/ui/views/controls/table/table_view.cc b/ui/views/controls/table/table_view.cc index 48dd4c4..c655eb6 100644 --- a/ui/views/controls/table/table_view.cc +++ b/ui/views/controls/table/table_view.cc @@ -8,7 +8,7 @@ #include "base/auto_reset.h" #include "base/i18n/rtl.h" -#include "ui/base/events/event.h" +#include "ui/events/event.h" #include "ui/gfx/canvas.h" #include "ui/gfx/image/image_skia.h" #include "ui/gfx/rect_conversions.h" diff --git a/ui/views/controls/textfield/native_textfield_views.cc b/ui/views/controls/textfield/native_textfield_views.cc index 71fbeb4..a184014 100644 --- a/ui/views/controls/textfield/native_textfield_views.cc +++ b/ui/views/controls/textfield/native_textfield_views.cc @@ -19,10 +19,10 @@ #include "ui/base/clipboard/clipboard.h" #include "ui/base/dragdrop/drag_drop_types.h" #include "ui/base/dragdrop/drag_utils.h" -#include "ui/base/events/event.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/ui_base_switches_util.h" #include "ui/compositor/layer.h" +#include "ui/events/event.h" #include "ui/gfx/canvas.h" #include "ui/gfx/insets.h" #include "ui/gfx/range/range.h" diff --git a/ui/views/controls/textfield/native_textfield_views.h b/ui/views/controls/textfield/native_textfield_views.h index dbc52b2..6b1c2de 100644 --- a/ui/views/controls/textfield/native_textfield_views.h +++ b/ui/views/controls/textfield/native_textfield_views.h @@ -8,10 +8,10 @@ #include "base/memory/weak_ptr.h" #include "base/strings/string16.h" #include "base/timer/timer.h" -#include "ui/base/events/event_constants.h" #include "ui/base/ime/text_input_client.h" #include "ui/base/models/simple_menu_model.h" #include "ui/base/touch/touch_editing_controller.h" +#include "ui/events/event_constants.h" #include "ui/gfx/font.h" #include "ui/views/border.h" #include "ui/views/context_menu_controller.h" diff --git a/ui/views/controls/textfield/native_textfield_views_unittest.cc b/ui/views/controls/textfield/native_textfield_views_unittest.cc index adfaf8e..54873d9 100644 --- a/ui/views/controls/textfield/native_textfield_views_unittest.cc +++ b/ui/views/controls/textfield/native_textfield_views_unittest.cc @@ -22,10 +22,10 @@ #include "ui/base/clipboard/clipboard.h" #include "ui/base/clipboard/scoped_clipboard_writer.h" #include "ui/base/dragdrop/drag_drop_types.h" -#include "ui/base/events/event.h" #include "ui/base/ime/text_input_client.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/ui_base_switches.h" +#include "ui/events/event.h" #include "ui/events/keycodes/keyboard_codes.h" #include "ui/gfx/render_text.h" #include "ui/views/controls/textfield/textfield.h" diff --git a/ui/views/controls/textfield/native_textfield_win.cc b/ui/views/controls/textfield/native_textfield_win.cc index ccdc312..f98c0ad 100644 --- a/ui/views/controls/textfield/native_textfield_win.cc +++ b/ui/views/controls/textfield/native_textfield_win.cc @@ -17,11 +17,11 @@ #include "ui/base/accessibility/accessible_view_state.h" #include "ui/base/clipboard/clipboard.h" #include "ui/base/clipboard/scoped_clipboard_writer.h" -#include "ui/base/events/event.h" #include "ui/base/ime/win/tsf_bridge.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/l10n/l10n_util_win.h" #include "ui/base/win/mouse_wheel_util.h" +#include "ui/events/event.h" #include "ui/events/keycodes/keyboard_codes.h" #include "ui/gfx/range/range.h" #include "ui/gfx/win/hwnd_util.h" diff --git a/ui/views/controls/textfield/textfield.cc b/ui/views/controls/textfield/textfield.cc index 55352e1..b26aa37 100644 --- a/ui/views/controls/textfield/textfield.cc +++ b/ui/views/controls/textfield/textfield.cc @@ -10,10 +10,10 @@ #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "ui/base/accessibility/accessible_view_state.h" -#include "ui/base/events/event.h" #include "ui/base/ime/text_input_type.h" #include "ui/base/resource/resource_bundle.h" #include "ui/base/ui_base_switches.h" +#include "ui/events/event.h" #include "ui/events/keycodes/keyboard_codes.h" #include "ui/gfx/insets.h" #include "ui/gfx/range/range.h" diff --git a/ui/views/controls/textfield/textfield_controller.cc b/ui/views/controls/textfield/textfield_controller.cc index d9899d2..8f72be8 100644 --- a/ui/views/controls/textfield/textfield_controller.cc +++ b/ui/views/controls/textfield/textfield_controller.cc @@ -5,7 +5,7 @@ #include "ui/views/controls/textfield/textfield_controller.h" #include "ui/base/dragdrop/drag_drop_types.h" -#include "ui/base/events/event.h" +#include "ui/events/event.h" namespace views { diff --git a/ui/views/controls/tree/tree_view.cc b/ui/views/controls/tree/tree_view.cc index 4727b24..78d4693 100644 --- a/ui/views/controls/tree/tree_view.cc +++ b/ui/views/controls/tree/tree_view.cc @@ -10,8 +10,8 @@ #include "base/message_loop/message_loop.h" #include "grit/ui_resources.h" #include "ui/base/accessibility/accessible_view_state.h" -#include "ui/base/events/event.h" #include "ui/base/resource/resource_bundle.h" +#include "ui/events/event.h" #include "ui/events/keycodes/keyboard_codes.h" #include "ui/gfx/canvas.h" #include "ui/gfx/image/image.h" diff --git a/ui/views/controls/webview/unhandled_keyboard_event_handler_aurax11.cc b/ui/views/controls/webview/unhandled_keyboard_event_handler_aurax11.cc index 41c90ff..7e09af9 100644 --- a/ui/views/controls/webview/unhandled_keyboard_event_handler_aurax11.cc +++ b/ui/views/controls/webview/unhandled_keyboard_event_handler_aurax11.cc @@ -6,7 +6,7 @@ #include "base/logging.h" #include "content/public/browser/native_web_keyboard_event.h" -#include "ui/base/events/event.h" +#include "ui/events/event.h" #include "ui/views/focus/focus_manager.h" using content::NativeWebKeyboardEvent; diff --git a/ui/views/controls/webview/unhandled_keyboard_event_handler_win.cc b/ui/views/controls/webview/unhandled_keyboard_event_handler_win.cc index fd82608..b30b557 100644 --- a/ui/views/controls/webview/unhandled_keyboard_event_handler_win.cc +++ b/ui/views/controls/webview/unhandled_keyboard_event_handler_win.cc @@ -6,7 +6,7 @@ #include "base/logging.h" #include "content/public/browser/native_web_keyboard_event.h" -#include "ui/base/events/event.h" +#include "ui/events/event.h" #include "ui/views/focus/focus_manager.h" using content::NativeWebKeyboardEvent; diff --git a/ui/views/controls/webview/web_dialog_view.cc b/ui/views/controls/webview/web_dialog_view.cc index 6d72997..ff9d63b 100644 --- a/ui/views/controls/webview/web_dialog_view.cc +++ b/ui/views/controls/webview/web_dialog_view.cc @@ -23,7 +23,7 @@ #include "ui/web_dialogs/web_dialog_ui.h" #if defined(USE_AURA) -#include "ui/base/events/event.h" +#include "ui/events/event.h" #include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h" #include "ui/views/widget/native_widget_aura.h" #endif diff --git a/ui/views/controls/webview/webview.cc b/ui/views/controls/webview/webview.cc index 15fed84..9169ac0 100644 --- a/ui/views/controls/webview/webview.cc +++ b/ui/views/controls/webview/webview.cc @@ -18,7 +18,7 @@ #include "ipc/ipc_message.h" #include "ui/base/accessibility/accessibility_types.h" #include "ui/base/accessibility/accessible_view_state.h" -#include "ui/base/events/event.h" +#include "ui/events/event.h" #include "ui/views/accessibility/native_view_accessibility.h" #include "ui/views/controls/native/native_view_host.h" #include "ui/views/focus/focus_manager.h" diff --git a/ui/views/corewm/capture_controller_unittest.cc b/ui/views/corewm/capture_controller_unittest.cc index 32a1955..46a8a2e 100644 --- a/ui/views/corewm/capture_controller_unittest.cc +++ b/ui/views/corewm/capture_controller_unittest.cc @@ -11,8 +11,8 @@ #include "ui/aura/test/event_generator.h" #include "ui/aura/test/test_screen.h" #include "ui/aura/test/test_window_delegate.h" -#include "ui/base/events/event.h" -#include "ui/base/events/event_utils.h" +#include "ui/events/event.h" +#include "ui/events/event_utils.h" #include "ui/views/test/views_test_base.h" #include "ui/views/view.h" #include "ui/views/widget/root_view.h" diff --git a/ui/views/corewm/compound_event_filter.cc b/ui/views/corewm/compound_event_filter.cc index f1df8b5..1d4387b 100644 --- a/ui/views/corewm/compound_event_filter.cc +++ b/ui/views/corewm/compound_event_filter.cc @@ -14,8 +14,8 @@ #include "ui/aura/root_window.h" #include "ui/aura/window_delegate.h" #include "ui/aura/window_tracker.h" -#include "ui/base/events/event.h" #include "ui/base/hit_test.h" +#include "ui/events/event.h" namespace views { namespace corewm { diff --git a/ui/views/corewm/compound_event_filter.h b/ui/views/corewm/compound_event_filter.h index e9c927f..15445cd 100644 --- a/ui/views/corewm/compound_event_filter.h +++ b/ui/views/corewm/compound_event_filter.h @@ -7,8 +7,8 @@ #include "base/compiler_specific.h" #include "base/observer_list.h" -#include "ui/base/events/event.h" -#include "ui/base/events/event_handler.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" diff --git a/ui/views/corewm/compound_event_filter_unittest.cc b/ui/views/corewm/compound_event_filter_unittest.cc index 07624c9..a6569e2b 100644 --- a/ui/views/corewm/compound_event_filter_unittest.cc +++ b/ui/views/corewm/compound_event_filter_unittest.cc @@ -13,8 +13,8 @@ #include "ui/aura/test/test_activation_client.h" #include "ui/aura/test/test_cursor_client.h" #include "ui/aura/test/test_windows.h" -#include "ui/base/events/event.h" -#include "ui/base/events/event_utils.h" +#include "ui/events/event.h" +#include "ui/events/event_utils.h" namespace { diff --git a/ui/views/corewm/desktop_capture_controller_unittest.cc b/ui/views/corewm/desktop_capture_controller_unittest.cc index 830466a..db33a8f 100644 --- a/ui/views/corewm/desktop_capture_controller_unittest.cc +++ b/ui/views/corewm/desktop_capture_controller_unittest.cc @@ -8,7 +8,7 @@ #include "ui/aura/env.h" #include "ui/aura/root_window.h" #include "ui/aura/test/test_window_delegate.h" -#include "ui/base/events/event.h" +#include "ui/events/event.h" #include "ui/views/test/views_test_base.h" #include "ui/views/view.h" #include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h" diff --git a/ui/views/corewm/focus_controller.cc b/ui/views/corewm/focus_controller.cc index f985ff4..a5fe9c3 100644 --- a/ui/views/corewm/focus_controller.cc +++ b/ui/views/corewm/focus_controller.cc @@ -10,7 +10,7 @@ #include "ui/aura/client/capture_client.h" #include "ui/aura/client/focus_change_observer.h" #include "ui/aura/env.h" -#include "ui/base/events/event.h" +#include "ui/events/event.h" #include "ui/views/corewm/focus_rules.h" namespace views { diff --git a/ui/views/corewm/focus_controller_unittest.cc b/ui/views/corewm/focus_controller_unittest.cc index 55791be..964fd58 100644 --- a/ui/views/corewm/focus_controller_unittest.cc +++ b/ui/views/corewm/focus_controller_unittest.cc @@ -18,7 +18,7 @@ #include "ui/aura/test/test_windows.h" #include "ui/aura/window.h" #include "ui/aura/window_tracker.h" -#include "ui/base/events/event_handler.h" +#include "ui/events/event_handler.h" #include "ui/views/corewm/base_focus_rules.h" namespace views { diff --git a/ui/views/corewm/input_method_event_filter.cc b/ui/views/corewm/input_method_event_filter.cc index f8e9647..cfdab6b 100644 --- a/ui/views/corewm/input_method_event_filter.cc +++ b/ui/views/corewm/input_method_event_filter.cc @@ -6,9 +6,9 @@ #include "ui/aura/client/aura_constants.h" #include "ui/aura/root_window.h" -#include "ui/base/events/event.h" #include "ui/base/ime/input_method.h" #include "ui/base/ime/input_method_factory.h" +#include "ui/events/event.h" namespace views { namespace corewm { diff --git a/ui/views/corewm/input_method_event_filter.h b/ui/views/corewm/input_method_event_filter.h index 56ef40e..cb1fae4 100644 --- a/ui/views/corewm/input_method_event_filter.h +++ b/ui/views/corewm/input_method_event_filter.h @@ -8,8 +8,8 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" #include "base/memory/scoped_ptr.h" -#include "ui/base/events/event_handler.h" #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" diff --git a/ui/views/corewm/tooltip_controller.cc b/ui/views/corewm/tooltip_controller.cc index 014a92a..2478472 100644 --- a/ui/views/corewm/tooltip_controller.cc +++ b/ui/views/corewm/tooltip_controller.cc @@ -15,8 +15,8 @@ #include "ui/aura/env.h" #include "ui/aura/root_window.h" #include "ui/aura/window.h" -#include "ui/base/events/event.h" #include "ui/base/resource/resource_bundle.h" +#include "ui/events/event.h" #include "ui/gfx/font.h" #include "ui/gfx/point.h" #include "ui/gfx/rect.h" diff --git a/ui/views/corewm/tooltip_controller.h b/ui/views/corewm/tooltip_controller.h index cc641d0..9cd04d3 100644 --- a/ui/views/corewm/tooltip_controller.h +++ b/ui/views/corewm/tooltip_controller.h @@ -12,7 +12,7 @@ #include "base/timer/timer.h" #include "ui/aura/client/tooltip_client.h" #include "ui/aura/window_observer.h" -#include "ui/base/events/event_handler.h" +#include "ui/events/event_handler.h" #include "ui/gfx/point.h" #include "ui/gfx/screen_type_delegate.h" #include "ui/views/views_export.h" diff --git a/ui/views/corewm/window_modality_controller.cc b/ui/views/corewm/window_modality_controller.cc index 6afc7d2..8a3a7ff 100644 --- a/ui/views/corewm/window_modality_controller.cc +++ b/ui/views/corewm/window_modality_controller.cc @@ -12,8 +12,8 @@ #include "ui/aura/root_window.h" #include "ui/aura/window.h" #include "ui/aura/window_property.h" -#include "ui/base/events/event.h" #include "ui/base/ui_base_types.h" +#include "ui/events/event.h" #include "ui/views/corewm/window_animations.h" #include "ui/views/corewm/window_util.h" diff --git a/ui/views/corewm/window_modality_controller.h b/ui/views/corewm/window_modality_controller.h index 4787a97..07fe308 100644 --- a/ui/views/corewm/window_modality_controller.h +++ b/ui/views/corewm/window_modality_controller.h @@ -10,7 +10,7 @@ #include "base/compiler_specific.h" #include "ui/aura/env_observer.h" #include "ui/aura/window_observer.h" -#include "ui/base/events/event_handler.h" +#include "ui/events/event_handler.h" #include "ui/views/views_export.h" namespace ui { diff --git a/ui/views/event_utils_aura.cc b/ui/views/event_utils_aura.cc index 666d47c..455ec1a 100644 --- a/ui/views/event_utils_aura.cc +++ b/ui/views/event_utils_aura.cc @@ -8,7 +8,7 @@ #include "base/memory/scoped_ptr.h" #include "ui/aura/client/screen_position_client.h" #include "ui/aura/root_window.h" -#include "ui/base/events/event.h" +#include "ui/events/event.h" #include "ui/gfx/point.h" using aura::client::ScreenPositionClient; diff --git a/ui/views/event_utils_win.cc b/ui/views/event_utils_win.cc index d9417a2e..38c05c9 100644 --- a/ui/views/event_utils_win.cc +++ b/ui/views/event_utils_win.cc @@ -7,8 +7,8 @@ #include <windowsx.h> #include "base/logging.h" -#include "ui/base/events/event.h" -#include "ui/base/events/event_constants.h" +#include "ui/events/event.h" +#include "ui/events/event_constants.h" #include "ui/gfx/point.h" namespace views { diff --git a/ui/views/examples/multiline_example.cc b/ui/views/examples/multiline_example.cc index 1df08aa..dd8a633 100644 --- a/ui/views/examples/multiline_example.cc +++ b/ui/views/examples/multiline_example.cc @@ -5,7 +5,7 @@ #include "ui/views/examples/multiline_example.h" #include "base/strings/utf_string_conversions.h" -#include "ui/base/events/event.h" +#include "ui/events/event.h" #include "ui/gfx/render_text.h" #include "ui/views/controls/label.h" #include "ui/views/controls/textfield/textfield.h" diff --git a/ui/views/examples/textfield_example.cc b/ui/views/examples/textfield_example.cc index 810e17c..ec18cf7 100644 --- a/ui/views/examples/textfield_example.cc +++ b/ui/views/examples/textfield_example.cc @@ -5,7 +5,7 @@ #include "ui/views/examples/textfield_example.h" #include "base/strings/utf_string_conversions.h" -#include "ui/base/events/event.h" +#include "ui/events/event.h" #include "ui/gfx/range/range.h" #include "ui/gfx/render_text.h" #include "ui/views/controls/button/label_button.h" diff --git a/ui/views/focus/accelerator_handler_win.cc b/ui/views/focus/accelerator_handler_win.cc index 5ce1aff..ea82dae 100644 --- a/ui/views/focus/accelerator_handler_win.cc +++ b/ui/views/focus/accelerator_handler_win.cc @@ -4,7 +4,7 @@ #include "ui/views/focus/accelerator_handler.h" -#include "ui/base/events/event.h" +#include "ui/events/event.h" #include "ui/events/keycodes/keyboard_code_conversion_win.h" #include "ui/events/keycodes/keyboard_codes.h" #include "ui/views/focus/focus_manager.h" diff --git a/ui/views/focus/focus_manager.cc b/ui/views/focus/focus_manager.cc index 1c2adee..429b9ad 100644 --- a/ui/views/focus/focus_manager.cc +++ b/ui/views/focus/focus_manager.cc @@ -11,7 +11,7 @@ #include "base/logging.h" #include "build/build_config.h" #include "ui/base/accelerators/accelerator.h" -#include "ui/base/events/event.h" +#include "ui/events/event.h" #include "ui/events/keycodes/keyboard_codes.h" #include "ui/views/focus/focus_manager_delegate.h" #include "ui/views/focus/focus_search.h" diff --git a/ui/views/focus/focus_manager_unittest_win.cc b/ui/views/focus/focus_manager_unittest_win.cc index 2e7ddc0..1309ed2 100644 --- a/ui/views/focus/focus_manager_unittest_win.cc +++ b/ui/views/focus/focus_manager_unittest_win.cc @@ -7,7 +7,7 @@ #include "base/memory/scoped_ptr.h" #include "base/run_loop.h" #include "base/strings/utf_string_conversions.h" -#include "ui/base/events/event.h" +#include "ui/events/event.h" #include "ui/views/controls/button/label_button.h" #include "ui/views/focus/accelerator_handler.h" #include "ui/views/focus/focus_manager_test.h" diff --git a/ui/views/ime/input_method_base.cc b/ui/views/ime/input_method_base.cc index 4c4298b..784746b 100644 --- a/ui/views/ime/input_method_base.cc +++ b/ui/views/ime/input_method_base.cc @@ -5,8 +5,8 @@ #include "ui/views/ime/input_method_base.h" #include "base/logging.h" -#include "ui/base/events/event.h" #include "ui/base/ime/text_input_client.h" +#include "ui/events/event.h" #include "ui/views/view.h" #include "ui/views/widget/widget.h" diff --git a/ui/views/ime/input_method_bridge.cc b/ui/views/ime/input_method_bridge.cc index 8165a60..f0ce73b 100644 --- a/ui/views/ime/input_method_bridge.cc +++ b/ui/views/ime/input_method_bridge.cc @@ -4,8 +4,8 @@ #include "ui/views/ime/input_method_bridge.h" -#include "ui/base/events/event.h" #include "ui/base/ime/input_method.h" +#include "ui/events/event.h" #include "ui/gfx/rect.h" #include "ui/views/view.h" #include "ui/views/widget/widget.h" diff --git a/ui/views/ime/mock_input_method.cc b/ui/views/ime/mock_input_method.cc index 3bd7168..b04dafb 100644 --- a/ui/views/ime/mock_input_method.cc +++ b/ui/views/ime/mock_input_method.cc @@ -6,8 +6,8 @@ #include "base/basictypes.h" #include "base/logging.h" -#include "ui/base/events/event.h" #include "ui/base/ime/text_input_client.h" +#include "ui/events/event.h" #include "ui/events/keycodes/keyboard_codes.h" #include "ui/views/widget/widget.h" diff --git a/ui/views/mouse_watcher.cc b/ui/views/mouse_watcher.cc index e4f156f..5a2b4bd 100644 --- a/ui/views/mouse_watcher.cc +++ b/ui/views/mouse_watcher.cc @@ -9,8 +9,8 @@ #include "base/event_types.h" #include "base/memory/weak_ptr.h" #include "base/message_loop/message_loop.h" -#include "ui/base/events/event_constants.h" -#include "ui/base/events/event_utils.h" +#include "ui/events/event_constants.h" +#include "ui/events/event_utils.h" #include "ui/gfx/screen.h" namespace views { diff --git a/ui/views/view.h b/ui/views/view.h index 0935c51..b0ed0c0 100644 --- a/ui/views/view.h +++ b/ui/views/view.h @@ -20,11 +20,11 @@ #include "ui/base/accessibility/accessibility_types.h" #include "ui/base/dragdrop/drag_drop_types.h" #include "ui/base/dragdrop/os_exchange_data.h" -#include "ui/base/events/event.h" -#include "ui/base/events/event_target.h" #include "ui/base/ui_base_types.h" #include "ui/compositor/layer_delegate.h" #include "ui/compositor/layer_owner.h" +#include "ui/events/event.h" +#include "ui/events/event_target.h" #include "ui/gfx/native_widget_types.h" #include "ui/gfx/rect.h" #include "ui/gfx/vector2d.h" diff --git a/ui/views/view_unittest.cc b/ui/views/view_unittest.cc index 16e5de6..e0fa07e 100644 --- a/ui/views/view_unittest.cc +++ b/ui/views/view_unittest.cc @@ -12,11 +12,11 @@ #include "testing/gmock/include/gmock/gmock.h" #include "ui/base/accelerators/accelerator.h" #include "ui/base/clipboard/clipboard.h" -#include "ui/base/events/event.h" #include "ui/base/l10n/l10n_util.h" #include "ui/compositor/compositor.h" #include "ui/compositor/layer.h" #include "ui/compositor/layer_animator.h" +#include "ui/events/event.h" #include "ui/events/keycodes/keyboard_codes.h" #include "ui/gfx/canvas.h" #include "ui/gfx/path.h" diff --git a/ui/views/widget/desktop_aura/desktop_drag_drop_client_aurax11.cc b/ui/views/widget/desktop_aura/desktop_drag_drop_client_aurax11.cc index ee36af3..ffe7853 100644 --- a/ui/views/widget/desktop_aura/desktop_drag_drop_client_aurax11.cc +++ b/ui/views/widget/desktop_aura/desktop_drag_drop_client_aurax11.cc @@ -15,9 +15,9 @@ #include "ui/base/dragdrop/drag_drop_types.h" #include "ui/base/dragdrop/os_exchange_data.h" #include "ui/base/dragdrop/os_exchange_data_provider_aurax11.h" -#include "ui/base/events/event.h" #include "ui/base/x/selection_utils.h" #include "ui/base/x/x11_util.h" +#include "ui/events/event.h" #include "ui/views/widget/desktop_aura/desktop_native_cursor_manager.h" using aura::client::DragDropDelegate; diff --git a/ui/views/widget/desktop_aura/desktop_drop_target_win.cc b/ui/views/widget/desktop_aura/desktop_drop_target_win.cc index 7b92420..c9c7540 100644 --- a/ui/views/widget/desktop_aura/desktop_drop_target_win.cc +++ b/ui/views/widget/desktop_aura/desktop_drop_target_win.cc @@ -11,8 +11,8 @@ #include "ui/aura/root_window.h" #include "ui/base/dragdrop/drag_drop_types.h" #include "ui/base/dragdrop/os_exchange_data_provider_win.h" -#include "ui/base/events/event.h" -#include "ui/base/events/event_constants.h" +#include "ui/events/event.h" +#include "ui/events/event_constants.h" using aura::client::DragDropDelegate; using ui::OSExchangeData; diff --git a/ui/views/widget/desktop_aura/desktop_root_window_host_x11.cc b/ui/views/widget/desktop_aura/desktop_root_window_host_x11.cc index cf84168..148b563 100644 --- a/ui/views/widget/desktop_aura/desktop_root_window_host_x11.cc +++ b/ui/views/widget/desktop_aura/desktop_root_window_host_x11.cc @@ -20,9 +20,9 @@ #include "ui/aura/root_window.h" #include "ui/aura/window_property.h" #include "ui/base/dragdrop/os_exchange_data_provider_aurax11.h" -#include "ui/base/events/event_utils.h" #include "ui/base/touch/touch_factory_x11.h" #include "ui/base/x/x11_util.h" +#include "ui/events/event_utils.h" #include "ui/gfx/insets.h" #include "ui/gfx/path_x11.h" #include "ui/native_theme/native_theme.h" diff --git a/ui/views/widget/desktop_aura/x11_desktop_window_move_client.cc b/ui/views/widget/desktop_aura/x11_desktop_window_move_client.cc index 73f2cc2d..273372f 100644 --- a/ui/views/widget/desktop_aura/x11_desktop_window_move_client.cc +++ b/ui/views/widget/desktop_aura/x11_desktop_window_move_client.cc @@ -14,8 +14,8 @@ #include "base/run_loop.h" #include "ui/aura/env.h" #include "ui/aura/root_window.h" -#include "ui/base/events/event.h" #include "ui/base/x/x11_util.h" +#include "ui/events/event.h" #include "ui/gfx/screen.h" namespace views { diff --git a/ui/views/widget/desktop_aura/x11_whole_screen_move_loop.cc b/ui/views/widget/desktop_aura/x11_whole_screen_move_loop.cc index dbc3224..636da43 100644 --- a/ui/views/widget/desktop_aura/x11_whole_screen_move_loop.cc +++ b/ui/views/widget/desktop_aura/x11_whole_screen_move_loop.cc @@ -14,8 +14,8 @@ #include "base/run_loop.h" #include "ui/aura/env.h" #include "ui/aura/root_window.h" -#include "ui/base/events/event.h" #include "ui/base/x/x11_util.h" +#include "ui/events/event.h" #include "ui/gfx/screen.h" namespace views { diff --git a/ui/views/widget/desktop_aura/x11_window_event_filter.cc b/ui/views/widget/desktop_aura/x11_window_event_filter.cc index 8a3e483..af1dad0 100644 --- a/ui/views/widget/desktop_aura/x11_window_event_filter.cc +++ b/ui/views/widget/desktop_aura/x11_window_event_filter.cc @@ -11,10 +11,10 @@ #include "ui/aura/root_window.h" #include "ui/aura/window_delegate.h" -#include "ui/base/events/event.h" -#include "ui/base/events/event_utils.h" #include "ui/base/hit_test.h" #include "ui/base/x/x11_util.h" +#include "ui/events/event.h" +#include "ui/events/event_utils.h" #include "ui/views/widget/native_widget_aura.h" namespace { diff --git a/ui/views/widget/desktop_aura/x11_window_event_filter.h b/ui/views/widget/desktop_aura/x11_window_event_filter.h index 1cf3f9c..a02eab27 100644 --- a/ui/views/widget/desktop_aura/x11_window_event_filter.h +++ b/ui/views/widget/desktop_aura/x11_window_event_filter.h @@ -11,8 +11,8 @@ #include "base/compiler_specific.h" #include "base/message_loop/message_loop.h" -#include "ui/base/events/event_handler.h" #include "ui/base/x/x11_atom_cache.h" +#include "ui/events/event_handler.h" #include "ui/views/views_export.h" namespace aura { diff --git a/ui/views/widget/native_widget_aura.cc b/ui/views/widget/native_widget_aura.cc index f227e7e..5c5136b 100644 --- a/ui/views/widget/native_widget_aura.cc +++ b/ui/views/widget/native_widget_aura.cc @@ -21,9 +21,9 @@ #include "ui/aura/window.h" #include "ui/aura/window_observer.h" #include "ui/base/dragdrop/os_exchange_data.h" -#include "ui/base/events/event.h" #include "ui/base/ui_base_types.h" #include "ui/compositor/layer.h" +#include "ui/events/event.h" #include "ui/gfx/canvas.h" #include "ui/gfx/font.h" #include "ui/gfx/screen.h" diff --git a/ui/views/widget/native_widget_aura.h b/ui/views/widget/native_widget_aura.h index f5c7328..dfd3aaf 100644 --- a/ui/views/widget/native_widget_aura.h +++ b/ui/views/widget/native_widget_aura.h @@ -13,7 +13,7 @@ #include "ui/aura/client/focus_change_observer.h" #include "ui/aura/window_delegate.h" #include "ui/base/cursor/cursor.h" -#include "ui/base/events/event_constants.h" +#include "ui/events/event_constants.h" #include "ui/views/ime/input_method_delegate.h" #include "ui/views/views_export.h" #include "ui/views/widget/native_widget_private.h" diff --git a/ui/views/widget/native_widget_aura_unittest.cc b/ui/views/widget/native_widget_aura_unittest.cc index 612616b..de63a0b 100644 --- a/ui/views/widget/native_widget_aura_unittest.cc +++ b/ui/views/widget/native_widget_aura_unittest.cc @@ -15,7 +15,7 @@ #include "ui/aura/root_window.h" #include "ui/aura/test/aura_test_helper.h" #include "ui/aura/window.h" -#include "ui/base/events/event.h" +#include "ui/events/event.h" #include "ui/gfx/screen.h" #include "ui/views/layout/fill_layout.h" #include "ui/views/widget/root_view.h" diff --git a/ui/views/widget/native_widget_delegate.h b/ui/views/widget/native_widget_delegate.h index bc0d974..914b575 100644 --- a/ui/views/widget/native_widget_delegate.h +++ b/ui/views/widget/native_widget_delegate.h @@ -7,7 +7,7 @@ #include <vector> -#include "ui/base/events/event_constants.h" +#include "ui/events/event_constants.h" #include "ui/views/views_export.h" namespace gfx { diff --git a/ui/views/widget/native_widget_win.cc b/ui/views/widget/native_widget_win.cc index fa7bd91..53aed93 100644 --- a/ui/views/widget/native_widget_win.cc +++ b/ui/views/widget/native_widget_win.cc @@ -18,13 +18,13 @@ #include "ui/base/dragdrop/drag_source_win.h" #include "ui/base/dragdrop/os_exchange_data.h" #include "ui/base/dragdrop/os_exchange_data_provider_win.h" -#include "ui/base/events/event.h" #include "ui/base/ime/input_method_factory.h" #include "ui/base/l10n/l10n_util_win.h" #include "ui/base/theme_provider.h" #include "ui/base/view_prop.h" #include "ui/base/win/mouse_wheel_util.h" #include "ui/base/win/shell.h" +#include "ui/events/event.h" #include "ui/events/keycodes/keyboard_code_conversion_win.h" #include "ui/gfx/canvas.h" #include "ui/gfx/canvas_skia_paint.h" diff --git a/ui/views/widget/root_view.cc b/ui/views/widget/root_view.cc index ed00473..1185c75 100644 --- a/ui/views/widget/root_view.cc +++ b/ui/views/widget/root_view.cc @@ -10,8 +10,8 @@ #include "base/message_loop/message_loop.h" #include "ui/base/accessibility/accessible_view_state.h" #include "ui/base/dragdrop/drag_drop_types.h" -#include "ui/base/events/event.h" #include "ui/compositor/layer.h" +#include "ui/events/event.h" #include "ui/events/keycodes/keyboard_codes.h" #include "ui/gfx/canvas.h" #include "ui/views/focus/view_storage.h" diff --git a/ui/views/widget/root_view.h b/ui/views/widget/root_view.h index 0b674e9..6ab367b 100644 --- a/ui/views/widget/root_view.h +++ b/ui/views/widget/root_view.h @@ -8,7 +8,7 @@ #include <string> #include "base/memory/ref_counted.h" -#include "ui/base/events/event_dispatcher.h" +#include "ui/events/event_dispatcher.h" #include "ui/views/focus/focus_manager.h" #include "ui/views/focus/focus_search.h" #include "ui/views/view.h" diff --git a/ui/views/widget/widget.cc b/ui/views/widget/widget.cc index 35013c6..f485d98 100644 --- a/ui/views/widget/widget.cc +++ b/ui/views/widget/widget.cc @@ -9,12 +9,12 @@ #include "base/message_loop/message_loop.h" #include "base/strings/utf_string_conversions.h" #include "ui/base/default_theme_provider.h" -#include "ui/base/events/event.h" #include "ui/base/hit_test.h" #include "ui/base/l10n/l10n_font_util.h" #include "ui/base/resource/resource_bundle.h" #include "ui/compositor/compositor.h" #include "ui/compositor/layer.h" +#include "ui/events/event.h" #include "ui/gfx/screen.h" #include "ui/views/controls/menu/menu_controller.h" #include "ui/views/focus/focus_manager.h" diff --git a/ui/views/widget/widget_unittest.cc b/ui/views/widget/widget_unittest.cc index fbc9f35..3b8d2ec 100644 --- a/ui/views/widget/widget_unittest.cc +++ b/ui/views/widget/widget_unittest.cc @@ -12,7 +12,7 @@ #include "base/run_loop.h" #include "base/strings/utf_string_conversions.h" #include "testing/gtest/include/gtest/gtest.h" -#include "ui/base/events/event_utils.h" +#include "ui/events/event_utils.h" #include "ui/gfx/native_widget_types.h" #include "ui/gfx/point.h" #include "ui/views/bubble/bubble_delegate.h" diff --git a/ui/views/win/hwnd_message_handler.cc b/ui/views/win/hwnd_message_handler.cc index 11fc6d8..66d61ce 100644 --- a/ui/views/win/hwnd_message_handler.cc +++ b/ui/views/win/hwnd_message_handler.cc @@ -11,13 +11,13 @@ #include "base/debug/trace_event.h" #include "base/win/win_util.h" #include "base/win/windows_version.h" -#include "ui/base/events/event.h" -#include "ui/base/events/event_utils.h" #include "ui/base/gestures/gesture_sequence.h" #include "ui/base/touch/touch_enabled.h" #include "ui/base/win/mouse_wheel_util.h" #include "ui/base/win/shell.h" #include "ui/base/win/touch_input.h" +#include "ui/events/event.h" +#include "ui/events/event_utils.h" #include "ui/events/keycodes/keyboard_code_conversion_win.h" #include "ui/gfx/canvas.h" #include "ui/gfx/canvas_skia_paint.h" diff --git a/ui/views/win/hwnd_message_handler.h b/ui/views/win/hwnd_message_handler.h index 5ff3ffd..0d31f05 100644 --- a/ui/views/win/hwnd_message_handler.h +++ b/ui/views/win/hwnd_message_handler.h @@ -21,7 +21,7 @@ #include "base/strings/string16.h" #include "base/win/win_util.h" #include "ui/base/accessibility/accessibility_types.h" -#include "ui/base/events/event.h" +#include "ui/events/event.h" #include "ui/base/sequential_id_generator.h" #include "ui/base/ui_base_types.h" #include "ui/gfx/rect.h" diff --git a/win8/metro_driver/chrome_app_view_ash.h b/win8/metro_driver/chrome_app_view_ash.h index 62f0476..c1b9533 100644 --- a/win8/metro_driver/chrome_app_view_ash.h +++ b/win8/metro_driver/chrome_app_view_ash.h @@ -13,7 +13,7 @@ #include "base/memory/scoped_ptr.h" #include "base/message_loop/message_loop.h" #include "base/strings/string16.h" -#include "ui/base/events/event_constants.h" +#include "ui/events/event_constants.h" #include "win8/metro_driver/direct3d_helper.h" namespace base { |