diff options
213 files changed, 270 insertions, 270 deletions
diff --git a/ash/accelerators/accelerator_controller.cc b/ash/accelerators/accelerator_controller.cc index 0f72f08..dda4f2d 100644 --- a/ash/accelerators/accelerator_controller.cc +++ b/ash/accelerators/accelerator_controller.cc @@ -12,14 +12,14 @@ #include "ash/ash_switches.h" #include "ash/caps_lock_delegate.h" #include "ash/desktop_background/desktop_background_controller.h" +#include "ash/display/display_controller.h" +#include "ash/display/multi_display_manager.h" #include "ash/focus_cycler.h" #include "ash/ime_control_delegate.h" #include "ash/launcher/launcher.h" #include "ash/launcher/launcher_delegate.h" #include "ash/launcher/launcher_model.h" #include "ash/magnifier/magnification_controller.h" -#include "ash/display/display_controller.h" -#include "ash/display/multi_display_manager.h" #include "ash/root_window_controller.h" #include "ash/rotator/screen_rotation.h" #include "ash/screenshot_delegate.h" @@ -41,7 +41,7 @@ #include "ui/aura/root_window.h" #include "ui/base/accelerators/accelerator.h" #include "ui/base/accelerators/accelerator_manager.h" -#include "ui/base/event.h" +#include "ui/base/events/event.h" #include "ui/base/keycodes/keyboard_codes.h" #include "ui/compositor/debug_utils.h" #include "ui/compositor/layer.h" diff --git a/ash/accelerators/accelerator_controller_unittest.cc b/ash/accelerators/accelerator_controller_unittest.cc index eb1c0b0..6c4062f 100644 --- a/ash/accelerators/accelerator_controller_unittest.cc +++ b/ash/accelerators/accelerator_controller_unittest.cc @@ -20,7 +20,7 @@ #include "ui/aura/test/test_window_delegate.h" #include "ui/aura/test/test_windows.h" #include "ui/aura/window.h" -#include "ui/base/event.h" +#include "ui/base/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 4fd7948..5995f1d 100644 --- a/ash/accelerators/accelerator_dispatcher.cc +++ b/ash/accelerators/accelerator_dispatcher.cc @@ -20,8 +20,8 @@ #include "ui/aura/event_filter.h" #include "ui/aura/root_window.h" #include "ui/base/accelerators/accelerator.h" -#include "ui/base/event.h" -#include "ui/base/events.h" +#include "ui/base/events/event.h" +#include "ui/base/events/event_constants.h" namespace ash { namespace { diff --git a/ash/accelerators/accelerator_filter.cc b/ash/accelerators/accelerator_filter.cc index a9c6825..ec6d8ab 100644 --- a/ash/accelerators/accelerator_filter.cc +++ b/ash/accelerators/accelerator_filter.cc @@ -8,9 +8,9 @@ #include "ash/shell.h" #include "ash/wm/window_util.h" #include "ui/aura/root_window.h" -#include "ui/base/event.h" #include "ui/base/accelerators/accelerator.h" #include "ui/base/accelerators/accelerator_manager.h" +#include "ui/base/events/event.h" namespace ash { namespace { diff --git a/ash/accelerators/accelerator_table.h b/ash/accelerators/accelerator_table.h index 9687acb..155b4f0 100644 --- a/ash/accelerators/accelerator_table.h +++ b/ash/accelerators/accelerator_table.h @@ -6,7 +6,7 @@ #define ASH_ACCELERATORS_ACCELERATOR_TABLE_H_ #include "ash/ash_export.h" -#include "ui/base/events.h" +#include "ui/base/events/event_constants.h" namespace ash { diff --git a/ash/accelerators/nested_dispatcher_controller_unittest.cc b/ash/accelerators/nested_dispatcher_controller_unittest.cc index 03cbcd4..bb0d66d 100644 --- a/ash/accelerators/nested_dispatcher_controller_unittest.cc +++ b/ash/accelerators/nested_dispatcher_controller_unittest.cc @@ -15,7 +15,7 @@ #include "ui/aura/test/test_windows.h" #include "ui/aura/window.h" #include "ui/base/accelerators/accelerator.h" -#include "ui/base/events.h" +#include "ui/base/events/event_constants.h" #if defined(USE_X11) #include <X11/Xlib.h> diff --git a/ash/display/mouse_cursor_event_filter.cc b/ash/display/mouse_cursor_event_filter.cc index 7334346..a811766 100644 --- a/ash/display/mouse_cursor_event_filter.cc +++ b/ash/display/mouse_cursor_event_filter.cc @@ -13,7 +13,7 @@ #include "ui/aura/env.h" #include "ui/aura/root_window.h" #include "ui/aura/window.h" -#include "ui/base/event.h" +#include "ui/base/events/event.h" #include "ui/base/layout.h" #include "ui/compositor/dip_util.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 1563a5c..eb33f3d 100644 --- a/ash/drag_drop/drag_drop_controller.cc +++ b/ash/drag_drop/drag_drop_controller.cc @@ -16,9 +16,9 @@ #include "ui/aura/env.h" #include "ui/aura/root_window.h" #include "ui/aura/window.h" -#include "ui/base/event.h" #include "ui/base/dragdrop/drag_drop_types.h" #include "ui/base/dragdrop/os_exchange_data_provider_aura.h" +#include "ui/base/events/event.h" #include "ui/compositor/layer.h" #include "ui/compositor/layer_animator.h" #include "ui/compositor/scoped_layer_animation_settings.h" diff --git a/ash/drag_drop/drag_drop_controller.h b/ash/drag_drop/drag_drop_controller.h index 79f0720..d138ef6 100644 --- a/ash/drag_drop/drag_drop_controller.h +++ b/ash/drag_drop/drag_drop_controller.h @@ -11,7 +11,7 @@ #include "ui/aura/event_filter.h" #include "ui/aura/window_observer.h" #include "ui/base/dragdrop/os_exchange_data.h" -#include "ui/base/events.h" +#include "ui/base/events/event_constants.h" #include "ui/compositor/layer_animation_observer.h" #include "ui/gfx/point.h" diff --git a/ash/drag_drop/drag_drop_controller_unittest.cc b/ash/drag_drop/drag_drop_controller_unittest.cc index 7740186..044b496 100644 --- a/ash/drag_drop/drag_drop_controller_unittest.cc +++ b/ash/drag_drop/drag_drop_controller_unittest.cc @@ -14,7 +14,7 @@ #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/event.h" +#include "ui/base/events/event.h" #include "ui/views/test/test_views_delegate.h" #include "ui/views/view.h" #include "ui/views/views_delegate.h" diff --git a/ash/drag_drop/drag_drop_tracker.cc b/ash/drag_drop/drag_drop_tracker.cc index 0a04d105..d71c698 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/event.h" +#include "ui/base/events/event.h" #include "ui/gfx/screen.h" namespace { diff --git a/ash/drag_drop/drag_drop_tracker.h b/ash/drag_drop/drag_drop_tracker.h index fa56ed6..220cc12 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/event.h" +#include "ui/base/events/event.h" namespace aura { class RootWindow; diff --git a/ash/keyboard_overlay/keyboard_overlay_view.cc b/ash/keyboard_overlay/keyboard_overlay_view.cc index 170cc28..37d8353 100644 --- a/ash/keyboard_overlay/keyboard_overlay_view.cc +++ b/ash/keyboard_overlay/keyboard_overlay_view.cc @@ -9,7 +9,7 @@ #include "base/utf_string_conversions.h" #include "content/public/browser/browser_context.h" #include "grit/ash_strings.h" -#include "ui/base/event.h" +#include "ui/base/events/event.h" #include "ui/base/l10n/l10n_util.h" #include "ui/gfx/screen.h" #include "ui/views/widget/widget.h" diff --git a/ash/launcher/launcher_button.cc b/ash/launcher/launcher_button.cc index d9a2583..be42504 100644 --- a/ash/launcher/launcher_button.cc +++ b/ash/launcher/launcher_button.cc @@ -12,7 +12,7 @@ #include "ui/base/accessibility/accessible_view_state.h" #include "ui/base/animation/animation_delegate.h" #include "ui/base/animation/throb_animation.h" -#include "ui/base/events.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" diff --git a/ash/launcher/launcher_tooltip_manager.cc b/ash/launcher/launcher_tooltip_manager.cc index 0ebe961..d7c07a6 100644 --- a/ash/launcher/launcher_tooltip_manager.cc +++ b/ash/launcher/launcher_tooltip_manager.cc @@ -14,12 +14,12 @@ #include "base/timer.h" #include "ui/aura/root_window.h" #include "ui/aura/window.h" -#include "ui/base/event.h" -#include "ui/base/events.h" +#include "ui/base/events/event.h" +#include "ui/base/events/event_constants.h" #include "ui/gfx/insets.h" +#include "ui/views/bubble/bubble_border_2.h" #include "ui/views/bubble/bubble_delegate.h" #include "ui/views/bubble/bubble_frame_view.h" -#include "ui/views/bubble/bubble_border_2.h" #include "ui/views/controls/label.h" #include "ui/views/layout/fill_layout.h" #include "ui/views/widget/widget.h" diff --git a/ash/launcher/launcher_tooltip_manager_unittest.cc b/ash/launcher/launcher_tooltip_manager_unittest.cc index 3de9ce8..17f72da 100644 --- a/ash/launcher/launcher_tooltip_manager_unittest.cc +++ b/ash/launcher/launcher_tooltip_manager_unittest.cc @@ -11,8 +11,8 @@ #include "base/time.h" #include "ui/aura/event_filter.h" #include "ui/aura/root_window.h" -#include "ui/base/event.h" -#include "ui/base/events.h" +#include "ui/base/events/event.h" +#include "ui/base/events/event_constants.h" #include "ui/base/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 5a43c33..74f72a9 100644 --- a/ash/launcher/launcher_view_unittest.cc +++ b/ash/launcher/launcher_view_unittest.cc @@ -22,8 +22,8 @@ #include "grit/ui_resources.h" #include "ui/aura/test/aura_test_base.h" #include "ui/aura/window.h" -#include "ui/base/event.h" -#include "ui/base/events.h" +#include "ui/base/events/event.h" +#include "ui/base/events/event_constants.h" #include "ui/compositor/layer.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 af31704..091f6da 100644 --- a/ash/magnifier/magnification_controller.cc +++ b/ash/magnifier/magnification_controller.cc @@ -10,13 +10,13 @@ #include "ui/aura/shared/compound_event_filter.h" #include "ui/aura/window.h" #include "ui/aura/window_property.h" -#include "ui/base/event.h" -#include "ui/gfx/point3.h" -#include "ui/gfx/screen.h" +#include "ui/base/events/event.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/gfx/point3.h" +#include "ui/gfx/screen.h" namespace { diff --git a/ash/system/tray/system_tray.cc b/ash/system/tray/system_tray.cc index c1fe09a..53c982c 100644 --- a/ash/system/tray/system_tray.cc +++ b/ash/system/tray/system_tray.cc @@ -35,7 +35,7 @@ #include "base/utf_string_conversions.h" #include "grit/ash_strings.h" #include "ui/aura/root_window.h" -#include "ui/base/events.h" +#include "ui/base/events/event_constants.h" #include "ui/base/l10n/l10n_util.h" #include "ui/compositor/layer.h" #include "ui/gfx/canvas.h" diff --git a/ash/system/tray/tray_bubble_view.cc b/ash/system/tray/tray_bubble_view.cc index e1b5d82..931db9f 100644 --- a/ash/system/tray/tray_bubble_view.cc +++ b/ash/system/tray/tray_bubble_view.cc @@ -19,7 +19,7 @@ #include "third_party/skia/include/effects/SkBlurImageFilter.h" #include "ui/aura/window.h" #include "ui/base/accessibility/accessible_view_state.h" -#include "ui/base/event.h" +#include "ui/base/events/event.h" #include "ui/base/l10n/l10n_util.h" #include "ui/gfx/canvas.h" #include "ui/gfx/insets.h" diff --git a/ash/system/tray/tray_views.cc b/ash/system/tray/tray_views.cc index 26924b0..1517fdd 100644 --- a/ash/system/tray/tray_views.cc +++ b/ash/system/tray/tray_views.cc @@ -9,7 +9,7 @@ #include "grit/ash_strings.h" #include "grit/ui_resources.h" #include "ui/base/accessibility/accessible_view_state.h" -#include "ui/base/event.h" +#include "ui/base/events/event.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/canvas.h" #include "ui/gfx/image/image.h" diff --git a/ash/test/test_activation_delegate.cc b/ash/test/test_activation_delegate.cc index 7907cd3..53eb6eb 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/event.h" +#include "ui/base/events/event.h" namespace ash { namespace test { diff --git a/ash/tooltips/tooltip_controller.cc b/ash/tooltips/tooltip_controller.cc index 4651d88..fd70c0d 100644 --- a/ash/tooltips/tooltip_controller.cc +++ b/ash/tooltips/tooltip_controller.cc @@ -17,7 +17,7 @@ #include "ui/aura/env.h" #include "ui/aura/root_window.h" #include "ui/aura/window.h" -#include "ui/base/event.h" +#include "ui/base/events/event.h" #include "ui/base/resource/resource_bundle.h" #include "ui/base/text/text_elider.h" #include "ui/gfx/font.h" diff --git a/ash/touch/touch_observer_hud.cc b/ash/touch/touch_observer_hud.cc index 1c77753..fb0aec2 100644 --- a/ash/touch/touch_observer_hud.cc +++ b/ash/touch/touch_observer_hud.cc @@ -9,7 +9,7 @@ #include "base/utf_string_conversions.h" #include "third_party/skia/include/core/SkPath.h" #include "third_party/skia/include/core/SkXfermode.h" -#include "ui/base/event.h" +#include "ui/base/events/event.h" #include "ui/gfx/canvas.h" #include "ui/gfx/display.h" #include "ui/gfx/rect.h" diff --git a/ash/touch/touch_uma.cc b/ash/touch/touch_uma.cc index e929828..a6a536f 100644 --- a/ash/touch/touch_uma.cc +++ b/ash/touch/touch_uma.cc @@ -10,7 +10,7 @@ #include "ui/aura/root_window.h" #include "ui/aura/window.h" #include "ui/aura/window_property.h" -#include "ui/base/event.h" +#include "ui/base/events/event.h" #if defined(USE_XI2_MT) #include <X11/extensions/XInput2.h> diff --git a/ash/wm/app_list_controller.cc b/ash/wm/app_list_controller.cc index a38d9cb..0ae37aa 100644 --- a/ash/wm/app_list_controller.cc +++ b/ash/wm/app_list_controller.cc @@ -17,7 +17,7 @@ #include "ui/aura/focus_manager.h" #include "ui/aura/root_window.h" #include "ui/aura/window.h" -#include "ui/base/event.h" +#include "ui/base/events/event.h" #include "ui/compositor/layer.h" #include "ui/compositor/scoped_layer_animation_settings.h" #include "ui/gfx/transform_util.h" diff --git a/ash/wm/event_rewriter_event_filter.cc b/ash/wm/event_rewriter_event_filter.cc index a9755f3..2d9724f 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/event.h" +#include "ui/base/events/event.h" namespace ash { namespace internal { diff --git a/ash/wm/gestures/bezel_gesture_handler.cc b/ash/wm/gestures/bezel_gesture_handler.cc index fd1329f..3534e77 100644 --- a/ash/wm/gestures/bezel_gesture_handler.cc +++ b/ash/wm/gestures/bezel_gesture_handler.cc @@ -16,7 +16,7 @@ #include "ash/volume_control_delegate.h" #include "base/command_line.h" #include "ui/aura/root_window.h" -#include "ui/base/event.h" +#include "ui/base/events/event.h" #include "ui/base/ui_base_switches.h" #include "ui/gfx/screen.h" diff --git a/ash/wm/gestures/system_pinch_handler.cc b/ash/wm/gestures/system_pinch_handler.cc index c7f10eb..b0ee683 100644 --- a/ash/wm/gestures/system_pinch_handler.cc +++ b/ash/wm/gestures/system_pinch_handler.cc @@ -11,7 +11,7 @@ #include "ash/wm/window_util.h" #include "ash/wm/workspace/snap_sizer.h" #include "ui/aura/window.h" -#include "ui/base/events.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/gfx/rect.h" diff --git a/ash/wm/gestures/two_finger_drag_handler.cc b/ash/wm/gestures/two_finger_drag_handler.cc index 59195dc..0e65409 100644 --- a/ash/wm/gestures/two_finger_drag_handler.cc +++ b/ash/wm/gestures/two_finger_drag_handler.cc @@ -10,8 +10,8 @@ #include "ash/wm/workspace/snap_sizer.h" #include "ui/aura/client/window_types.h" #include "ui/aura/window.h" -#include "ui/base/event.h" -#include "ui/base/events.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" diff --git a/ash/wm/overlay_event_filter.cc b/ash/wm/overlay_event_filter.cc index 39f1930..a2685e8 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/event.h" +#include "ui/base/events/event.h" #include "ui/views/widget/widget.h" namespace ash { diff --git a/ash/wm/panel_window_event_filter.cc b/ash/wm/panel_window_event_filter.cc index c14861d..38b58f3 100644 --- a/ash/wm/panel_window_event_filter.cc +++ b/ash/wm/panel_window_event_filter.cc @@ -11,7 +11,7 @@ #include "ui/aura/window.h" #include "ui/aura/window_delegate.h" #include "ui/base/cursor/cursor.h" -#include "ui/base/event.h" +#include "ui/base/events/event.h" #include "ui/base/hit_test.h" #include "ui/base/ui_base_types.h" #include "ui/compositor/scoped_layer_animation_settings.h" diff --git a/ash/wm/partial_screenshot_view.cc b/ash/wm/partial_screenshot_view.cc index 5e9c145..2c3e09d 100644 --- a/ash/wm/partial_screenshot_view.cc +++ b/ash/wm/partial_screenshot_view.cc @@ -10,7 +10,7 @@ #include "ash/wm/overlay_event_filter.h" #include "ui/aura/root_window.h" #include "ui/base/cursor/cursor.h" -#include "ui/base/event.h" +#include "ui/base/events/event.h" #include "ui/gfx/canvas.h" #include "ui/gfx/rect.h" #include "ui/views/view.h" diff --git a/ash/wm/shelf_layout_manager.cc b/ash/wm/shelf_layout_manager.cc index a447c16..5bad6bb 100644 --- a/ash/wm/shelf_layout_manager.cc +++ b/ash/wm/shelf_layout_manager.cc @@ -18,7 +18,7 @@ #include "ui/aura/client/activation_client.h" #include "ui/aura/event_filter.h" #include "ui/aura/root_window.h" -#include "ui/base/event.h" +#include "ui/base/events/event.h" #include "ui/compositor/layer.h" #include "ui/compositor/layer_animation_observer.h" #include "ui/compositor/layer_animator.h" diff --git a/ash/wm/system_gesture_event_filter.cc b/ash/wm/system_gesture_event_filter.cc index 6b72be2b..ccb2879 100644 --- a/ash/wm/system_gesture_event_filter.cc +++ b/ash/wm/system_gesture_event_filter.cc @@ -19,7 +19,7 @@ #include "ash/wm/window_util.h" #include "base/command_line.h" #include "ui/aura/root_window.h" -#include "ui/base/event.h" +#include "ui/base/events/event.h" #include "ui/base/ui_base_switches.h" #if defined(OS_CHROMEOS) diff --git a/ash/wm/system_gesture_event_filter_unittest.cc b/ash/wm/system_gesture_event_filter_unittest.cc index 0e37894..5c6a2bc 100644 --- a/ash/wm/system_gesture_event_filter_unittest.cc +++ b/ash/wm/system_gesture_event_filter_unittest.cc @@ -22,7 +22,7 @@ #include "ui/aura/root_window.h" #include "ui/aura/test/event_generator.h" #include "ui/aura/test/test_windows.h" -#include "ui/base/event.h" +#include "ui/base/events/event.h" #include "ui/base/ui_base_switches.h" #include "ui/gfx/screen.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 fb7f3e6..6e74af0 100644 --- a/ash/wm/system_modal_container_event_filter.cc +++ b/ash/wm/system_modal_container_event_filter.cc @@ -5,7 +5,7 @@ #include "ash/wm/system_modal_container_event_filter.h" #include "ash/wm/system_modal_container_event_filter_delegate.h" -#include "ui/base/event.h" +#include "ui/base/events/event.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 bd788a2..b292fcd 100644 --- a/ash/wm/system_modal_container_layout_manager.cc +++ b/ash/wm/system_modal_container_layout_manager.cc @@ -16,7 +16,7 @@ #include "ui/aura/client/capture_client.h" #include "ui/aura/root_window.h" #include "ui/aura/window.h" -#include "ui/base/event.h" +#include "ui/base/events/event.h" #include "ui/compositor/layer.h" #include "ui/compositor/layer_animator.h" #include "ui/compositor/scoped_layer_animation_settings.h" diff --git a/ash/wm/toplevel_window_event_filter.cc b/ash/wm/toplevel_window_event_filter.cc index 737fe5f..146a908 100644 --- a/ash/wm/toplevel_window_event_filter.cc +++ b/ash/wm/toplevel_window_event_filter.cc @@ -19,7 +19,7 @@ #include "ui/aura/window.h" #include "ui/aura/window_delegate.h" #include "ui/base/cursor/cursor.h" -#include "ui/base/event.h" +#include "ui/base/events/event.h" #include "ui/base/gestures/gesture_recognizer.h" #include "ui/base/hit_test.h" #include "ui/base/ui_base_types.h" diff --git a/ash/wm/toplevel_window_event_filter_unittest.cc b/ash/wm/toplevel_window_event_filter_unittest.cc index d8573d7..0974b63 100644 --- a/ash/wm/toplevel_window_event_filter_unittest.cc +++ b/ash/wm/toplevel_window_event_filter_unittest.cc @@ -17,7 +17,7 @@ #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/event.h" +#include "ui/base/events/event.h" #include "ui/base/hit_test.h" #include "ui/gfx/screen.h" diff --git a/ash/wm/user_activity_detector.cc b/ash/wm/user_activity_detector.cc index db01b8d..8632b95 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/event.h" +#include "ui/base/events/event.h" namespace ash { diff --git a/ash/wm/user_activity_detector_unittest.cc b/ash/wm/user_activity_detector_unittest.cc index bddd727..abbc55f 100644 --- a/ash/wm/user_activity_detector_unittest.cc +++ b/ash/wm/user_activity_detector_unittest.cc @@ -12,8 +12,8 @@ #include "base/time.h" #include "ui/aura/test/test_windows.h" #include "ui/aura/window.h" -#include "ui/base/event.h" -#include "ui/base/events.h" +#include "ui/base/events/event.h" +#include "ui/base/events/event_constants.h" #include "ui/base/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 aabf939..ac171b5 100644 --- a/ash/wm/window_cycle_controller.cc +++ b/ash/wm/window_cycle_controller.cc @@ -14,7 +14,7 @@ #include "ash/wm/workspace_controller.h" #include "ui/aura/event_filter.h" #include "ui/aura/root_window.h" -#include "ui/base/event.h" +#include "ui/base/events/event.h" namespace ash { diff --git a/ash/wm/window_manager_unittest.cc b/ash/wm/window_manager_unittest.cc index 644f562..b56356c 100644 --- a/ash/wm/window_manager_unittest.cc +++ b/ash/wm/window_manager_unittest.cc @@ -22,7 +22,7 @@ #include "ui/aura/test/test_window_delegate.h" #include "ui/aura/test/test_windows.h" #include "ui/base/cursor/cursor.h" -#include "ui/base/event.h" +#include "ui/base/events/event.h" #include "ui/base/hit_test.h" #include "ui/gfx/screen.h" diff --git a/ash/wm/window_modality_controller.cc b/ash/wm/window_modality_controller.cc index 902612be..711ec99 100644 --- a/ash/wm/window_modality_controller.cc +++ b/ash/wm/window_modality_controller.cc @@ -12,7 +12,7 @@ #include "ui/aura/env.h" #include "ui/aura/root_window.h" #include "ui/aura/window.h" -#include "ui/base/event.h" +#include "ui/base/events/event.h" #include "ui/base/ui_base_types.h" namespace ash { diff --git a/ash/wm/workspace/frame_maximize_button.cc b/ash/wm/workspace/frame_maximize_button.cc index 2d08e92..cf63df1 100644 --- a/ash/wm/workspace/frame_maximize_button.cc +++ b/ash/wm/workspace/frame_maximize_button.cc @@ -7,15 +7,15 @@ #include "ash/launcher/launcher.h" #include "ash/screen_ash.h" #include "ash/shell.h" -#include "ash/wm/property_util.h" #include "ash/wm/maximize_bubble_controller.h" +#include "ash/wm/property_util.h" #include "ash/wm/workspace/phantom_window_controller.h" #include "ash/wm/workspace/snap_sizer.h" #include "grit/ash_strings.h" #include "grit/ui_resources.h" #include "ui/aura/event_filter.h" #include "ui/aura/window.h" -#include "ui/base/event.h" +#include "ui/base/events/event.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/image/image.h" diff --git a/ash/wm/workspace/workspace_event_filter.cc b/ash/wm/workspace/workspace_event_filter.cc index 9d4ddb2..f01b82f 100644 --- a/ash/wm/workspace/workspace_event_filter.cc +++ b/ash/wm/workspace/workspace_event_filter.cc @@ -11,7 +11,7 @@ #include "ui/aura/client/aura_constants.h" #include "ui/aura/window.h" #include "ui/aura/window_delegate.h" -#include "ui/base/event.h" +#include "ui/base/events/event.h" #include "ui/base/hit_test.h" #include "ui/compositor/scoped_layer_animation_settings.h" #include "ui/gfx/screen.h" diff --git a/ash/wm/workspace/workspace_layout_manager.cc b/ash/wm/workspace/workspace_layout_manager.cc index d0bcc6dd..2cf5e6e 100644 --- a/ash/wm/workspace/workspace_layout_manager.cc +++ b/ash/wm/workspace/workspace_layout_manager.cc @@ -5,15 +5,15 @@ #include "ash/wm/workspace/workspace_layout_manager.h" #include "ash/screen_ash.h" -#include "ash/wm/window_util.h" #include "ash/wm/window_properties.h" +#include "ash/wm/window_util.h" #include "ash/wm/workspace/workspace.h" #include "ash/wm/workspace/workspace_manager.h" #include "ui/aura/client/aura_constants.h" #include "ui/aura/root_window.h" #include "ui/aura/window.h" #include "ui/aura/window_observer.h" -#include "ui/base/event.h" +#include "ui/base/events/event.h" #include "ui/base/ui_base_types.h" #include "ui/gfx/rect.h" diff --git a/ash/wm/workspace/workspace_layout_manager2.cc b/ash/wm/workspace/workspace_layout_manager2.cc index fc4a71a..b19041c 100644 --- a/ash/wm/workspace/workspace_layout_manager2.cc +++ b/ash/wm/workspace/workspace_layout_manager2.cc @@ -5,12 +5,12 @@ #include "ash/wm/workspace/workspace_layout_manager2.h" #include "ash/ash_switches.h" -#include "ash/shell.h" #include "ash/screen_ash.h" +#include "ash/shell.h" #include "ash/wm/always_on_top_controller.h" #include "ash/wm/window_animations.h" -#include "ash/wm/window_util.h" #include "ash/wm/window_properties.h" +#include "ash/wm/window_util.h" #include "ash/wm/workspace/workspace2.h" #include "ash/wm/workspace/workspace_manager2.h" #include "base/auto_reset.h" @@ -19,7 +19,7 @@ #include "ui/aura/root_window.h" #include "ui/aura/window.h" #include "ui/aura/window_observer.h" -#include "ui/base/event.h" +#include "ui/base/events/event.h" #include "ui/base/ui_base_types.h" using aura::Window; diff --git a/chrome/browser/automation/testing_automation_provider.cc b/chrome/browser/automation/testing_automation_provider.cc index 4a56a616..53d8f1f 100644 --- a/chrome/browser/automation/testing_automation_provider.cc +++ b/chrome/browser/automation/testing_automation_provider.cc @@ -149,7 +149,7 @@ #include "content/public/common/ssl_status.h" #include "net/cookies/cookie_store.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h" -#include "ui/base/events.h" +#include "ui/base/events/event_constants.h" #include "ui/base/keycodes/keyboard_codes.h" #include "ui/base/ui_base_types.h" #include "ui/ui_controls/ui_controls.h" diff --git a/chrome/browser/bookmarks/bookmark_drop_info.cc b/chrome/browser/bookmarks/bookmark_drop_info.cc index 19eb4d7..6fea128 100644 --- a/chrome/browser/bookmarks/bookmark_drop_info.cc +++ b/chrome/browser/bookmarks/bookmark_drop_info.cc @@ -9,7 +9,7 @@ #endif #include "base/basictypes.h" -#include "ui/base/event.h" +#include "ui/base/events/event.h" #include "ui/views/view_constants.h" BookmarkDropInfo::BookmarkDropInfo(gfx::NativeWindow wnd, int top_margin) diff --git a/chrome/browser/bookmarks/bookmark_utils.cc b/chrome/browser/bookmarks/bookmark_utils.cc index f35c409..a97bba2 100644 --- a/chrome/browser/bookmarks/bookmark_utils.cc +++ b/chrome/browser/bookmarks/bookmark_utils.cc @@ -40,7 +40,7 @@ #if defined(TOOLKIT_VIEWS) #include "ui/base/dragdrop/os_exchange_data.h" -#include "ui/base/event.h" +#include "ui/base/events/event.h" #include "ui/views/drag_utils.h" #include "ui/views/widget/native_widget.h" #include "ui/views/widget/widget.h" diff --git a/chrome/browser/chromeos/login/password_changed_view.cc b/chrome/browser/chromeos/login/password_changed_view.cc index 2d0df3d..5c0df3f 100644 --- a/chrome/browser/chromeos/login/password_changed_view.cc +++ b/chrome/browser/chromeos/login/password_changed_view.cc @@ -9,7 +9,7 @@ #include "chrome/browser/chromeos/login/textfield_with_margin.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" -#include "ui/base/event.h" +#include "ui/base/events/event.h" #include "ui/base/keycodes/keyboard_codes.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" diff --git a/chrome/browser/chromeos/login/textfield_with_margin.cc b/chrome/browser/chromeos/login/textfield_with_margin.cc index 5f0353a..ea3fc9c 100644 --- a/chrome/browser/chromeos/login/textfield_with_margin.cc +++ b/chrome/browser/chromeos/login/textfield_with_margin.cc @@ -5,7 +5,7 @@ #include "chrome/browser/chromeos/login/textfield_with_margin.h" #include "chrome/browser/chromeos/login/helper.h" -#include "ui/base/event.h" +#include "ui/base/events/event.h" #include "ui/base/keycodes/keyboard_codes.h" namespace { diff --git a/chrome/browser/chromeos/options/vpn_config_view.cc b/chrome/browser/chromeos/options/vpn_config_view.cc index af4a151..6a95150 100644 --- a/chrome/browser/chromeos/options/vpn_config_view.cc +++ b/chrome/browser/chromeos/options/vpn_config_view.cc @@ -18,7 +18,7 @@ #include "grit/theme_resources.h" #include "net/base/cert_database.h" #include "net/base/x509_certificate.h" -#include "ui/base/event.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" diff --git a/chrome/browser/chromeos/options/wifi_config_view.cc b/chrome/browser/chromeos/options/wifi_config_view.cc index dfbb467..1385c84 100644 --- a/chrome/browser/chromeos/options/wifi_config_view.cc +++ b/chrome/browser/chromeos/options/wifi_config_view.cc @@ -17,7 +17,7 @@ #include "grit/generated_resources.h" #include "grit/locale_settings.h" #include "grit/theme_resources.h" -#include "ui/base/event.h" +#include "ui/base/events/event.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" #include "ui/views/controls/button/checkbox.h" diff --git a/chrome/browser/chromeos/options/wimax_config_view.cc b/chrome/browser/chromeos/options/wimax_config_view.cc index ceecff9..25e7846 100644 --- a/chrome/browser/chromeos/options/wimax_config_view.cc +++ b/chrome/browser/chromeos/options/wimax_config_view.cc @@ -18,7 +18,7 @@ #include "grit/generated_resources.h" #include "grit/locale_settings.h" #include "grit/theme_resources.h" -#include "ui/base/event.h" +#include "ui/base/events/event.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" #include "ui/views/controls/button/checkbox.h" diff --git a/chrome/browser/chromeos/preferences.cc b/chrome/browser/chromeos/preferences.cc index 92b09bed..33a9a8ff 100644 --- a/chrome/browser/chromeos/preferences.cc +++ b/chrome/browser/chromeos/preferences.cc @@ -32,7 +32,7 @@ #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_source.h" #include "googleurl/src/gurl.h" -#include "ui/base/events.h" +#include "ui/base/events/event_constants.h" #include "unicode/timezone.h" namespace chromeos { diff --git a/chrome/browser/event_disposition.cc b/chrome/browser/event_disposition.cc index 73bb74e9..64d979d 100644 --- a/chrome/browser/event_disposition.cc +++ b/chrome/browser/event_disposition.cc @@ -5,7 +5,7 @@ #include "chrome/browser/event_disposition.h" #include "chrome/browser/disposition_utils.h" -#include "ui/base/events.h" +#include "ui/base/events/event_constants.h" namespace chrome { diff --git a/chrome/browser/extensions/extension_input_api.cc b/chrome/browser/extensions/extension_input_api.cc index 8672566..67c5cd5 100644 --- a/chrome/browser/extensions/extension_input_api.cc +++ b/chrome/browser/extensions/extension_input_api.cc @@ -14,7 +14,7 @@ #include "chrome/browser/ui/browser_window.h" #include "chrome/browser/ui/views/frame/browser_view.h" #include "chrome/common/chrome_notification_types.h" -#include "ui/base/event.h" +#include "ui/base/events/event.h" #include "ui/views/ime/input_method.h" #include "ui/views/views_delegate.h" #include "ui/views/widget/widget.h" diff --git a/chrome/browser/extensions/key_identifier_conversion_views.cc b/chrome/browser/extensions/key_identifier_conversion_views.cc index e5e925d..da9931b 100644 --- a/chrome/browser/extensions/key_identifier_conversion_views.cc +++ b/chrome/browser/extensions/key_identifier_conversion_views.cc @@ -12,7 +12,7 @@ #include "base/hash_tables.h" #include "base/logging.h" #include "content/public/browser/browser_thread.h" -#include "ui/base/event.h" +#include "ui/base/events/event.h" #include "ui/base/keycodes/keyboard_codes.h" using content::BrowserThread; diff --git a/chrome/browser/extensions/key_identifier_conversion_views_unittest.cc b/chrome/browser/extensions/key_identifier_conversion_views_unittest.cc index 1a2ffa2..006d96e 100644 --- a/chrome/browser/extensions/key_identifier_conversion_views_unittest.cc +++ b/chrome/browser/extensions/key_identifier_conversion_views_unittest.cc @@ -9,7 +9,7 @@ #include "base/message_loop.h" #include "content/public/test/test_browser_thread.h" #include "testing/gtest/include/gtest/gtest.h" -#include "ui/base/event.h" +#include "ui/base/events/event.h" #include "ui/base/keycodes/keyboard_codes.h" using content::BrowserThread; diff --git a/chrome/browser/history/redirect_browsertest.cc b/chrome/browser/history/redirect_browsertest.cc index ddbca26..022c067 100644 --- a/chrome/browser/history/redirect_browsertest.cc +++ b/chrome/browser/history/redirect_browsertest.cc @@ -12,8 +12,8 @@ #include "base/memory/scoped_ptr.h" #include "base/scoped_temp_dir.h" #include "base/string16.h" -#include "base/stringprintf.h" #include "base/string_util.h" +#include "base/stringprintf.h" #include "base/test/test_timeouts.h" #include "base/threading/platform_thread.h" #include "base/utf_string_conversions.h" @@ -30,7 +30,7 @@ #include "content/public/test/test_navigation_observer.h" #include "net/base/net_util.h" #include "net/test/test_server.h" -#include "ui/base/events.h" +#include "ui/base/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 6a28b2f..207480c30 100644 --- a/chrome/browser/ui/ash/event_rewriter.cc +++ b/chrome/browser/ui/ash/event_rewriter.cc @@ -12,7 +12,7 @@ #include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile_manager.h" #include "ui/aura/root_window.h" -#include "ui/base/event.h" +#include "ui/base/events/event.h" #include "ui/base/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 af8fdac..0a7c7a0 100644 --- a/chrome/browser/ui/ash/event_rewriter_unittest.cc +++ b/chrome/browser/ui/ash/event_rewriter_unittest.cc @@ -10,7 +10,7 @@ #include "chrome/common/pref_names.h" #include "chrome/test/base/testing_pref_service.h" #include "testing/gtest/include/gtest/gtest.h" -#include "ui/base/event.h" +#include "ui/base/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 bdf2ac2..5cfd10e 100644 --- a/chrome/browser/ui/ash/ime_controller_chromeos_unittest.cc +++ b/chrome/browser/ui/ash/ime_controller_chromeos_unittest.cc @@ -8,7 +8,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.h" +#include "ui/base/events/event_constants.h" #include "ui/base/keycodes/keyboard_codes.h" class ImeControllerTest : public testing::Test { diff --git a/chrome/browser/ui/ash/launcher/browser_launcher_item_controller_unittest.cc b/chrome/browser/ui/ash/launcher/browser_launcher_item_controller_unittest.cc index db0824a..b86860c 100644 --- a/chrome/browser/ui/ash/launcher/browser_launcher_item_controller_unittest.cc +++ b/chrome/browser/ui/ash/launcher/browser_launcher_item_controller_unittest.cc @@ -25,7 +25,7 @@ #include "ui/aura/test/test_window_delegate.h" #include "ui/aura/window.h" #include "ui/aura/window_delegate.h" -#include "ui/base/event.h" +#include "ui/base/events/event.h" // TODO(avi): Kill this when TabContents goes away. class BrowserLauncherItemControllerContentsCreator { diff --git a/chrome/browser/ui/cocoa/event_utils.mm b/chrome/browser/ui/cocoa/event_utils.mm index 59e136d..0eb6c6a 100644 --- a/chrome/browser/ui/cocoa/event_utils.mm +++ b/chrome/browser/ui/cocoa/event_utils.mm @@ -5,7 +5,7 @@ #import "chrome/browser/ui/cocoa/event_utils.h" #include "chrome/browser/event_disposition.h" -#include "ui/base/events.h" +#include "ui/base/events/event_constants.h" namespace { diff --git a/chrome/browser/ui/cocoa/event_utils_unittest.mm b/chrome/browser/ui/cocoa/event_utils_unittest.mm index db2b7ac..e38390c 100644 --- a/chrome/browser/ui/cocoa/event_utils_unittest.mm +++ b/chrome/browser/ui/cocoa/event_utils_unittest.mm @@ -8,7 +8,7 @@ #include "chrome/browser/ui/cocoa/event_utils.h" #include "testing/gtest/include/gtest/gtest.h" #include "testing/platform_test.h" -#include "ui/base/events.h" +#include "ui/base/events/event_constants.h" #include "ui/base/test/cocoa_test_event_utils.h" // We provide a donor class with a specially modified |modifierFlags| diff --git a/chrome/browser/ui/gtk/event_utils.cc b/chrome/browser/ui/gtk/event_utils.cc index f2ad7f8..b45bbc0 100644 --- a/chrome/browser/ui/gtk/event_utils.cc +++ b/chrome/browser/ui/gtk/event_utils.cc @@ -6,7 +6,7 @@ #include "base/logging.h" #include "chrome/browser/event_disposition.h" -#include "ui/base/events.h" +#include "ui/base/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 bcc94f9..e26dc87 100644 --- a/chrome/browser/ui/gtk/event_utils_unittest.cc +++ b/chrome/browser/ui/gtk/event_utils_unittest.cc @@ -5,8 +5,8 @@ #include "chrome/browser/ui/gtk/event_utils.h" #include "base/stringprintf.h" -#include "ui/base/events.h" #include "testing/gtest/include/gtest/gtest.h" +#include "ui/base/events/event_constants.h" namespace event_utils { diff --git a/chrome/browser/ui/omnibox/omnibox_view_browsertest.cc b/chrome/browser/ui/omnibox/omnibox_view_browsertest.cc index 8b09410..b866b3f 100644 --- a/chrome/browser/ui/omnibox/omnibox_view_browsertest.cc +++ b/chrome/browser/ui/omnibox/omnibox_view_browsertest.cc @@ -36,7 +36,7 @@ #include "content/public/browser/notification_service.h" #include "content/public/browser/web_contents.h" #include "net/base/mock_host_resolver.h" -#include "ui/base/events.h" +#include "ui/base/events/event_constants.h" #include "ui/base/keycodes/keyboard_codes.h" #include "ui/gfx/point.h" diff --git a/chrome/browser/ui/views/accelerator_table.cc b/chrome/browser/ui/views/accelerator_table.cc index 3c5b056..e00bdbf 100644 --- a/chrome/browser/ui/views/accelerator_table.cc +++ b/chrome/browser/ui/views/accelerator_table.cc @@ -6,7 +6,7 @@ #include "base/basictypes.h" #include "chrome/app/chrome_command_ids.h" -#include "ui/base/events.h" +#include "ui/base/events/event_constants.h" namespace chrome { diff --git a/chrome/browser/ui/views/accelerator_table_unittest.cc b/chrome/browser/ui/views/accelerator_table_unittest.cc index 58bc5ae..00a9632 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.h" +#include "ui/base/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 696fac44..e560ff6 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/event.h" +#include "ui/base/events/event.h" #include "ui/base/win/hwnd_util.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 83b8f44..8715fe8 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_editor_view.cc +++ b/chrome/browser/ui/views/bookmarks/bookmark_editor_view.cc @@ -23,7 +23,7 @@ #include "grit/generated_resources.h" #include "grit/locale_settings.h" #include "net/base/net_util.h" -#include "ui/base/event.h" +#include "ui/base/events/event.h" #include "ui/base/l10n/l10n_util.h" #include "ui/views/background.h" #include "ui/views/controls/button/text_button.h" diff --git a/chrome/browser/ui/views/browser_action_view.cc b/chrome/browser/ui/views/browser_action_view.cc index 8a4fe58..66204655 100644 --- a/chrome/browser/ui/views/browser_action_view.cc +++ b/chrome/browser/ui/views/browser_action_view.cc @@ -17,7 +17,7 @@ #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "ui/base/accessibility/accessible_view_state.h" -#include "ui/base/event.h" +#include "ui/base/events/event.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/image/image_skia.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 efbcfde..bfb4f636 100644 --- a/chrome/browser/ui/views/crypto_module_password_dialog_view.cc +++ b/chrome/browser/ui/views/crypto_module_password_dialog_view.cc @@ -6,7 +6,7 @@ #include "base/utf_string_conversions.h" #include "grit/generated_resources.h" -#include "ui/base/event.h" +#include "ui/base/events/event.h" #include "ui/base/l10n/l10n_util.h" #include "ui/views/controls/button/text_button.h" #include "ui/views/controls/label.h" diff --git a/chrome/browser/ui/views/download/download_item_view.cc b/chrome/browser/ui/views/download/download_item_view.cc index 376d13b..ed75988 100644 --- a/chrome/browser/ui/views/download/download_item_view.cc +++ b/chrome/browser/ui/views/download/download_item_view.cc @@ -28,7 +28,7 @@ #include "grit/theme_resources.h" #include "ui/base/accessibility/accessible_view_state.h" #include "ui/base/animation/slide_animation.h" -#include "ui/base/event.h" +#include "ui/base/events/event.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" #include "ui/base/text/text_elider.h" diff --git a/chrome/browser/ui/views/dropdown_bar_host_aura.cc b/chrome/browser/ui/views/dropdown_bar_host_aura.cc index e94030b..2259fb6 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/event.h" +#include "ui/base/events/event.h" #include "ui/views/widget/widget.h" using content::NativeWebKeyboardEvent; diff --git a/chrome/browser/ui/views/dropdown_bar_host_win.cc b/chrome/browser/ui/views/dropdown_bar_host_win.cc index 1e83a62..f636a78 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/event.h" +#include "ui/base/events/event.h" #include "ui/base/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 9de2b41..b1c7452 100644 --- a/chrome/browser/ui/views/edit_search_engine_dialog.cc +++ b/chrome/browser/ui/views/edit_search_engine_dialog.cc @@ -13,7 +13,7 @@ #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "grit/ui_resources.h" -#include "ui/base/event.h" +#include "ui/base/events/event.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" #include "ui/views/controls/image_view.h" diff --git a/chrome/browser/ui/views/event_utils.cc b/chrome/browser/ui/views/event_utils.cc index 4a275cb..abfee6c 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/event.h" +#include "ui/base/events/event.h" namespace event_utils { diff --git a/chrome/browser/ui/views/extensions/extension_view.cc b/chrome/browser/ui/views/extensions/extension_view.cc index 23a496e..20318c3 100644 --- a/chrome/browser/ui/views/extensions/extension_view.cc +++ b/chrome/browser/ui/views/extensions/extension_view.cc @@ -12,7 +12,7 @@ #include "content/public/browser/render_widget_host_view.h" #include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents_view.h" -#include "ui/base/event.h" +#include "ui/base/events/event.h" #include "ui/views/widget/widget.h" ExtensionView::ExtensionView(extensions::ExtensionHost* host, Browser* browser) diff --git a/chrome/browser/ui/views/find_bar_host.cc b/chrome/browser/ui/views/find_bar_host.cc index 18b454a..bed8857 100644 --- a/chrome/browser/ui/views/find_bar_host.cc +++ b/chrome/browser/ui/views/find_bar_host.cc @@ -15,7 +15,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/event.h" +#include "ui/base/events/event.h" #include "ui/base/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 a089f70..9331c92 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/event.h" +#include "ui/base/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 ac81e11..e65f878 100644 --- a/chrome/browser/ui/views/find_bar_host_win.cc +++ b/chrome/browser/ui/views/find_bar_host_win.cc @@ -9,7 +9,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/event.h" +#include "ui/base/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 d351235..cbe7487 100644 --- a/chrome/browser/ui/views/find_bar_view.cc +++ b/chrome/browser/ui/views/find_bar_view.cc @@ -24,7 +24,7 @@ #include "grit/theme_resources.h" #include "grit/ui_resources.h" #include "third_party/skia/include/effects/SkGradientShader.h" -#include "ui/base/event.h" +#include "ui/base/events/event.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/canvas.h" diff --git a/chrome/browser/ui/views/keyboard_access_browsertest.cc b/chrome/browser/ui/views/keyboard_access_browsertest.cc index 7243d49..ac8dbf7 100644 --- a/chrome/browser/ui/views/keyboard_access_browsertest.cc +++ b/chrome/browser/ui/views/keyboard_access_browsertest.cc @@ -15,7 +15,7 @@ #include "chrome/common/chrome_notification_types.h" #include "chrome/test/base/in_process_browser_test.h" #include "chrome/test/base/ui_test_utils.h" -#include "ui/base/events.h" +#include "ui/base/events/event_constants.h" #include "ui/base/keycodes/keyboard_codes.h" #include "ui/ui_controls/ui_controls.h" #include "ui/views/controls/menu/menu_listener.h" diff --git a/chrome/browser/ui/views/location_bar/location_bar_container.cc b/chrome/browser/ui/views/location_bar/location_bar_container.cc index e9b8921..f66f464 100644 --- a/chrome/browser/ui/views/location_bar/location_bar_container.cc +++ b/chrome/browser/ui/views/location_bar/location_bar_container.cc @@ -6,7 +6,7 @@ #include "chrome/browser/ui/views/location_bar/location_bar_view.h" #include "chrome/browser/ui/webui/instant_ui.h" -#include "ui/base/event.h" +#include "ui/base/events/event.h" #include "ui/views/background.h" #include "ui/views/layout/fill_layout.h" 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 d801e1a..4e706ad 100644 --- a/chrome/browser/ui/views/location_bar/location_bar_view.cc +++ b/chrome/browser/ui/views/location_bar/location_bar_view.cc @@ -62,7 +62,7 @@ #include "grit/theme_resources.h" #include "ui/base/accessibility/accessible_view_state.h" #include "ui/base/dragdrop/drag_drop_types.h" -#include "ui/base/event.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" 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 b98d0d3..3b5278f 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 @@ -28,7 +28,7 @@ #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_source.h" #include "ui/base/accessibility/accessible_view_state.h" -#include "ui/base/event.h" +#include "ui/base/events/event.h" #include "ui/views/controls/menu/menu_item_view.h" #include "ui/views/controls/menu/menu_model_adapter.h" #include "ui/views/controls/menu/menu_runner.h" diff --git a/chrome/browser/ui/views/location_bar/star_view.cc b/chrome/browser/ui/views/location_bar/star_view.cc index e94f2fad..b2978e0 100644 --- a/chrome/browser/ui/views/location_bar/star_view.cc +++ b/chrome/browser/ui/views/location_bar/star_view.cc @@ -12,7 +12,7 @@ #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "ui/base/accessibility/accessible_view_state.h" -#include "ui/base/event.h" +#include "ui/base/events/event.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" diff --git a/chrome/browser/ui/views/location_bar/zoom_view.cc b/chrome/browser/ui/views/location_bar/zoom_view.cc index 29ba75d..13cbc95 100644 --- a/chrome/browser/ui/views/location_bar/zoom_view.cc +++ b/chrome/browser/ui/views/location_bar/zoom_view.cc @@ -11,7 +11,7 @@ #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "ui/base/accessibility/accessible_view_state.h" -#include "ui/base/event.h" +#include "ui/base/events/event.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/size.h" diff --git a/chrome/browser/ui/views/notifications/balloon_collection_views.cc b/chrome/browser/ui/views/notifications/balloon_collection_views.cc index 495d80d..2e9c885 100644 --- a/chrome/browser/ui/views/notifications/balloon_collection_views.cc +++ b/chrome/browser/ui/views/notifications/balloon_collection_views.cc @@ -6,7 +6,7 @@ #include "chrome/browser/notifications/balloon.h" #include "chrome/browser/ui/views/notifications/balloon_view_views.h" -#include "ui/base/events.h" +#include "ui/base/events/event_constants.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 0207bf1..de46181 100644 --- a/chrome/browser/ui/views/omnibox/omnibox_view_views.cc +++ b/chrome/browser/ui/views/omnibox/omnibox_view_views.cc @@ -34,7 +34,7 @@ #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/event.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" diff --git a/chrome/browser/ui/views/omnibox/omnibox_view_win.cc b/chrome/browser/ui/views/omnibox/omnibox_view_win.cc index fb5646f..d620d9e 100644 --- a/chrome/browser/ui/views/omnibox/omnibox_view_win.cc +++ b/chrome/browser/ui/views/omnibox/omnibox_view_win.cc @@ -51,8 +51,8 @@ #include "ui/base/dragdrop/drop_target.h" #include "ui/base/dragdrop/os_exchange_data.h" #include "ui/base/dragdrop/os_exchange_data_provider_win.h" -#include "ui/base/event.h" -#include "ui/base/events.h" +#include "ui/base/events/event.h" +#include "ui/base/events/event_constants.h" #include "ui/base/keycodes/keyboard_codes.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/l10n/l10n_util_win.h" diff --git a/chrome/browser/ui/views/tabs/tab_drag_controller.cc b/chrome/browser/ui/views/tabs/tab_drag_controller.cc index 70d2f4f..2fcdb38 100644 --- a/chrome/browser/ui/views/tabs/tab_drag_controller.cc +++ b/chrome/browser/ui/views/tabs/tab_drag_controller.cc @@ -35,7 +35,7 @@ #include "ui/base/animation/animation.h" #include "ui/base/animation/animation_delegate.h" #include "ui/base/animation/slide_animation.h" -#include "ui/base/events.h" +#include "ui/base/events/event_constants.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/canvas.h" #include "ui/gfx/image/image_skia.h" diff --git a/chrome/browser/ui/views/unhandled_keyboard_event_handler_aurax11.cc b/chrome/browser/ui/views/unhandled_keyboard_event_handler_aurax11.cc index e22d332..eac8e5e 100644 --- a/chrome/browser/ui/views/unhandled_keyboard_event_handler_aurax11.cc +++ b/chrome/browser/ui/views/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/event.h" +#include "ui/base/events/event.h" #include "ui/views/focus/focus_manager.h" using content::NativeWebKeyboardEvent; diff --git a/chrome/test/reliability/automated_ui_test_base.cc b/chrome/test/reliability/automated_ui_test_base.cc index ec8a704..617b386 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.h" +#include "ui/base/events/event_constants.h" #include "ui/gfx/point.h" #include "ui/gfx/rect.h" diff --git a/content/browser/renderer_host/native_web_keyboard_event.cc b/content/browser/renderer_host/native_web_keyboard_event.cc index 2ad30a6..3cb2af1 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.h" +#include "ui/base/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 8387d0a..37251dc 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/event.h" +#include "ui/base/events/event.h" namespace { 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 47aa13f..97d9ce5 100644 --- a/content/browser/renderer_host/render_widget_host_view_aura.cc +++ b/content/browser/renderer_host/render_widget_host_view_aura.cc @@ -36,7 +36,7 @@ #include "ui/aura/root_window.h" #include "ui/aura/window.h" #include "ui/aura/window_observer.h" -#include "ui/base/event.h" +#include "ui/base/events/event.h" #include "ui/base/gestures/gesture_recognizer.h" #include "ui/base/hit_test.h" #include "ui/base/ime/input_method.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 599a0ce..d47ae47 100644 --- a/content/browser/renderer_host/render_widget_host_view_win.cc +++ b/content/browser/renderer_host/render_widget_host_view_win.cc @@ -51,7 +51,7 @@ #include "third_party/WebKit/Source/WebKit/chromium/public/WebCompositionUnderline.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h" #include "third_party/WebKit/Source/WebKit/chromium/public/win/WebInputEventFactory.h" -#include "ui/base/event.h" +#include "ui/base/events/event.h" #include "ui/base/ime/composition_text.h" #include "ui/base/l10n/l10n_util_win.h" #include "ui/base/text/text_elider.h" diff --git a/content/browser/renderer_host/web_input_event_aura.cc b/content/browser/renderer_host/web_input_event_aura.cc index 0846911..aa9fd81 100644 --- a/content/browser/renderer_host/web_input_event_aura.cc +++ b/content/browser/renderer_host/web_input_event_aura.cc @@ -5,7 +5,7 @@ #include "content/browser/renderer_host/web_input_event_aura.h" #include "ui/aura/window.h" -#include "ui/base/event.h" +#include "ui/base/events/event.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 a3879e5..397ef6fb 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/event.h" +#include "ui/base/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 ccd8021..34af6a9a 100644 --- a/content/browser/renderer_host/web_input_event_aurax11.cc +++ b/content/browser/renderer_host/web_input_event_aurax11.cc @@ -37,17 +37,17 @@ #include "content/browser/renderer_host/web_input_event_aura.h" -#include <cstdlib> #include <X11/keysym.h> #include <X11/Xlib.h> #include <X11/Xutil.h> +#include <cstdlib> #include "base/event_types.h" #include "base/logging.h" -#include "ui/base/event.h" -#include "ui/base/events.h" -#include "ui/base/keycodes/keyboard_codes.h" +#include "ui/base/events/event.h" +#include "ui/base/events/event_constants.h" #include "ui/base/keycodes/keyboard_code_conversion_x.h" +#include "ui/base/keycodes/keyboard_codes.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 9fb1d74..52a6268 100644 --- a/content/browser/web_contents/web_contents_view_aura.cc +++ b/content/browser/web_contents/web_contents_view_aura.cc @@ -24,7 +24,7 @@ #include "ui/base/dragdrop/drag_drop_types.h" #include "ui/base/dragdrop/os_exchange_data.h" #include "ui/base/dragdrop/os_exchange_data_provider_aura.h" -#include "ui/base/event.h" +#include "ui/base/events/event.h" #include "ui/base/hit_test.h" #include "ui/compositor/layer.h" #include "ui/gfx/screen.h" diff --git a/content/public/browser/native_web_keyboard_event.h b/content/public/browser/native_web_keyboard_event.h index 9af8e73..eff2b6c 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/Source/WebKit/chromium/public/WebInputEvent.h" -#include "ui/base/events.h" +#include "ui/base/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.h. +// Returns a bitmak of values from ui/base/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 2e44dac..39b5833 100644 --- a/content/renderer/render_view_browsertest.cc +++ b/content/renderer/render_view_browsertest.cc @@ -15,8 +15,8 @@ #include "content/public/common/url_constants.h" #include "content/public/test/render_view_test.h" #include "content/renderer/render_view_impl.h" -#include "content/shell/shell_content_client.h" #include "content/shell/shell_content_browser_client.h" +#include "content/shell/shell_content_client.h" #include "content/shell/shell_main_delegate.h" #include "content/test/mock_keyboard.h" #include "net/base/net_errors.h" @@ -40,12 +40,12 @@ #endif #if defined(USE_AURA) -#include "ui/base/event.h" +#include "ui/base/events/event.h" #endif #if defined(USE_AURA) && defined(USE_X11) #include <X11/Xlib.h> -#include "ui/base/events.h" +#include "ui/base/events/event_constants.h" #include "ui/base/keycodes/keyboard_code_conversion.h" #include "ui/base/x/x11_util.h" #endif diff --git a/content/shell/shell_aura.cc b/content/shell/shell_aura.cc index 9a0cf9f..b956aec 100644 --- a/content/shell/shell_aura.cc +++ b/content/shell/shell_aura.cc @@ -10,11 +10,11 @@ #include "ui/aura/display_manager.h" #include "ui/aura/env.h" #include "ui/aura/root_window.h" -#include "ui/aura/window.h" #include "ui/aura/single_display_manager.h" +#include "ui/aura/window.h" #include "ui/base/accessibility/accessibility_types.h" #include "ui/base/clipboard/clipboard.h" -#include "ui/base/event.h" +#include "ui/base/events/event.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/screen.h" #include "ui/views/controls/button/text_button.h" diff --git a/ui/app_list/app_list_view.cc b/ui/app_list/app_list_view.cc index cd49805..769c459 100644 --- a/ui/app_list/app_list_view.cc +++ b/ui/app_list/app_list_view.cc @@ -13,7 +13,7 @@ #include "ui/app_list/pagination_model.h" #include "ui/app_list/search_box_model.h" #include "ui/app_list/search_box_view.h" -#include "ui/base/event.h" +#include "ui/base/events/event.h" #include "ui/gfx/insets.h" #include "ui/views/bubble/bubble_frame_view.h" #include "ui/views/controls/textfield/textfield.h" diff --git a/ui/app_list/apps_grid_view.cc b/ui/app_list/apps_grid_view.cc index 4cdcf23..dec5a53 100644 --- a/ui/app_list/apps_grid_view.cc +++ b/ui/app_list/apps_grid_view.cc @@ -8,7 +8,7 @@ #include "ui/app_list/app_list_item_view.h" #include "ui/app_list/pagination_model.h" -#include "ui/base/event.h" +#include "ui/base/events/event.h" #include "ui/views/border.h" namespace { diff --git a/ui/app_list/contents_view.cc b/ui/app_list/contents_view.cc index c254de5..ac3ee40 100644 --- a/ui/app_list/contents_view.cc +++ b/ui/app_list/contents_view.cc @@ -11,7 +11,7 @@ #include "ui/app_list/page_switcher.h" #include "ui/app_list/pagination_model.h" #include "ui/app_list/search_result_list_view.h" -#include "ui/base/event.h" +#include "ui/base/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/search_box_view.cc b/ui/app_list/search_box_view.cc index 4bf9c2d..145570d 100644 --- a/ui/app_list/search_box_view.cc +++ b/ui/app_list/search_box_view.cc @@ -8,7 +8,7 @@ #include "ui/app_list/search_box_model.h" #include "ui/app_list/search_box_view_delegate.h" -#include "ui/base/event.h" +#include "ui/base/events/event.h" #include "ui/base/resource/resource_bundle.h" #include "ui/views/controls/image_view.h" #include "ui/views/controls/textfield/textfield.h" diff --git a/ui/app_list/search_result_list_view.cc b/ui/app_list/search_result_list_view.cc index d5d9647..ea1766b 100644 --- a/ui/app_list/search_result_list_view.cc +++ b/ui/app_list/search_result_list_view.cc @@ -8,9 +8,9 @@ #include "base/bind.h" #include "base/message_loop.h" -#include "ui/app_list/search_result_view.h" #include "ui/app_list/search_result_list_view_delegate.h" -#include "ui/base/event.h" +#include "ui/app_list/search_result_view.h" +#include "ui/base/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 e0112d1..a03585f 100644 --- a/ui/aura/demo/demo_main.cc +++ b/ui/aura/demo/demo_main.cc @@ -11,11 +11,11 @@ #include "ui/aura/client/stacking_client.h" #include "ui/aura/env.h" #include "ui/aura/root_window.h" -#include "ui/aura/single_display_manager.h" #include "ui/aura/shared/root_window_capture_client.h" +#include "ui/aura/single_display_manager.h" #include "ui/aura/window.h" #include "ui/aura/window_delegate.h" -#include "ui/base/event.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" diff --git a/ui/aura/device_list_updater_aurax11.cc b/ui/aura/device_list_updater_aurax11.cc index 7d0b9471..804723e 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.h" +#include "ui/base/events/event_constants.h" namespace aura { diff --git a/ui/aura/event_filter.h b/ui/aura/event_filter.h index 8ff0923..e692140 100644 --- a/ui/aura/event_filter.h +++ b/ui/aura/event_filter.h @@ -8,8 +8,8 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" #include "ui/aura/aura_export.h" +#include "ui/base/events/event_constants.h" #include "ui/base/events/event_handler.h" -#include "ui/base/events.h" namespace ui { class GestureEvent; diff --git a/ui/aura/event_filter_unittest.cc b/ui/aura/event_filter_unittest.cc index d23d1e5..6302486 100644 --- a/ui/aura/event_filter_unittest.cc +++ b/ui/aura/event_filter_unittest.cc @@ -12,7 +12,7 @@ #include "ui/aura/test/event_generator.h" #include "ui/aura/test/test_event_filter.h" #include "ui/aura/test/test_window_delegate.h" -#include "ui/base/event.h" +#include "ui/base/events/event.h" #if defined(OS_WIN) // Windows headers define macros for these function names which screw with us. diff --git a/ui/aura/gestures/gesture_recognizer_unittest.cc b/ui/aura/gestures/gesture_recognizer_unittest.cc index 79d9536..6c18f6c 100644 --- a/ui/aura/gestures/gesture_recognizer_unittest.cc +++ b/ui/aura/gestures/gesture_recognizer_unittest.cc @@ -11,7 +11,7 @@ #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/event.h" +#include "ui/base/events/event.h" #include "ui/base/gestures/gesture_configuration.h" #include "ui/base/gestures/gesture_recognizer_impl.h" #include "ui/base/gestures/gesture_sequence.h" diff --git a/ui/aura/root_window.cc b/ui/aura/root_window.cc index 7d14d52..9c9bdde 100644 --- a/ui/aura/root_window.cc +++ b/ui/aura/root_window.cc @@ -18,16 +18,16 @@ #include "ui/aura/client/drag_drop_client.h" #include "ui/aura/client/event_client.h" #include "ui/aura/client/screen_position_client.h" +#include "ui/aura/display_manager.h" #include "ui/aura/env.h" #include "ui/aura/event_filter.h" #include "ui/aura/focus_manager.h" -#include "ui/aura/display_manager.h" #include "ui/aura/root_window_host.h" #include "ui/aura/root_window_observer.h" #include "ui/aura/window.h" #include "ui/aura/window_delegate.h" #include "ui/aura/window_tracker.h" -#include "ui/base/event.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" diff --git a/ui/aura/root_window.h b/ui/aura/root_window.h index 4aca5ad..9db3aa4 100644 --- a/ui/aura/root_window.h +++ b/ui/aura/root_window.h @@ -17,8 +17,8 @@ #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/events.h" #include "ui/base/gestures/gesture_recognizer.h" #include "ui/base/gestures/gesture_types.h" #include "ui/compositor/compositor.h" diff --git a/ui/aura/root_window_host_linux.cc b/ui/aura/root_window_host_linux.cc index 6968a9d..03d9ecc 100644 --- a/ui/aura/root_window_host_linux.cc +++ b/ui/aura/root_window_host_linux.cc @@ -4,13 +4,13 @@ #include "ui/aura/root_window_host_linux.h" -#include <X11/Xatom.h> -#include <X11/Xcursor/Xcursor.h> -#include <X11/Xlib.h> #include <X11/cursorfont.h> -#include <X11/extensions/XInput2.h> #include <X11/extensions/Xfixes.h> +#include <X11/extensions/XInput2.h> #include <X11/extensions/Xrandr.h> +#include <X11/Xatom.h> +#include <X11/Xcursor/Xcursor.h> +#include <X11/Xlib.h> #include <algorithm> #include "base/command_line.h" @@ -24,7 +24,7 @@ #include "ui/aura/env.h" #include "ui/aura/root_window.h" #include "ui/base/cursor/cursor.h" -#include "ui/base/event.h" +#include "ui/base/events/event.h" #include "ui/base/keycodes/keyboard_codes.h" #include "ui/base/resource/resource_bundle.h" #include "ui/base/touch/touch_factory.h" diff --git a/ui/aura/root_window_host_win.cc b/ui/aura/root_window_host_win.cc index db7209c..aa36202 100644 --- a/ui/aura/root_window_host_win.cc +++ b/ui/aura/root_window_host_win.cc @@ -12,7 +12,7 @@ #include "ui/aura/client/capture_client.h" #include "ui/aura/env.h" #include "ui/aura/root_window.h" -#include "ui/base/event.h" +#include "ui/base/events/event.h" #include "ui/base/view_prop.h" using std::max; diff --git a/ui/aura/root_window_unittest.cc b/ui/aura/root_window_unittest.cc index cd8e52c..a2fb633 100644 --- a/ui/aura/root_window_unittest.cc +++ b/ui/aura/root_window_unittest.cc @@ -16,7 +16,7 @@ #include "ui/aura/test/test_window_delegate.h" #include "ui/aura/test/test_windows.h" #include "ui/aura/window_tracker.h" -#include "ui/base/event.h" +#include "ui/base/events/event.h" #include "ui/base/gestures/gesture_configuration.h" #include "ui/base/hit_test.h" #include "ui/base/keycodes/keyboard_codes.h" diff --git a/ui/aura/shared/compound_event_filter.cc b/ui/aura/shared/compound_event_filter.cc index 9657345..b9f0716 100644 --- a/ui/aura/shared/compound_event_filter.cc +++ b/ui/aura/shared/compound_event_filter.cc @@ -11,7 +11,7 @@ #include "ui/aura/root_window.h" #include "ui/aura/window_delegate.h" #include "ui/aura/window_tracker.h" -#include "ui/base/event.h" +#include "ui/base/events/event.h" #include "ui/base/hit_test.h" namespace aura { diff --git a/ui/aura/shared/compound_event_filter_unittest.cc b/ui/aura/shared/compound_event_filter_unittest.cc index 478ef2e..57e0114 100644 --- a/ui/aura/shared/compound_event_filter_unittest.cc +++ b/ui/aura/shared/compound_event_filter_unittest.cc @@ -13,7 +13,7 @@ #include "ui/aura/test/event_generator.h" #include "ui/aura/test/test_activation_client.h" #include "ui/aura/test/test_windows.h" -#include "ui/base/event.h" +#include "ui/base/events/event.h" namespace { diff --git a/ui/aura/shared/input_method_event_filter.cc b/ui/aura/shared/input_method_event_filter.cc index 9cefcaa..d41dacc 100644 --- a/ui/aura/shared/input_method_event_filter.cc +++ b/ui/aura/shared/input_method_event_filter.cc @@ -6,7 +6,7 @@ #include "ui/aura/client/aura_constants.h" #include "ui/aura/root_window.h" -#include "ui/base/event.h" +#include "ui/base/events/event.h" #include "ui/base/ime/input_method.h" #include "ui/base/ime/input_method_factory.h" diff --git a/ui/aura/test/event_generator.cc b/ui/aura/test/event_generator.cc index b589099..ebad4f3 100644 --- a/ui/aura/test/event_generator.cc +++ b/ui/aura/test/event_generator.cc @@ -6,7 +6,7 @@ #include "base/memory/scoped_ptr.h" #include "ui/aura/root_window.h" -#include "ui/base/event.h" +#include "ui/base/events/event.h" #if defined(USE_X11) #include <X11/Xlib.h> diff --git a/ui/aura/test/test_window_delegate.cc b/ui/aura/test/test_window_delegate.cc index 20ab7bc..0c11ba4 100644 --- a/ui/aura/test/test_window_delegate.cc +++ b/ui/aura/test/test_window_delegate.cc @@ -6,7 +6,7 @@ #include "base/stringprintf.h" #include "ui/aura/window.h" -#include "ui/base/event.h" +#include "ui/base/events/event.h" #include "ui/base/hit_test.h" #include "ui/gfx/canvas.h" #include "ui/gfx/path.h" diff --git a/ui/aura/window.h b/ui/aura/window.h index 0463ff5..09039d3 100644 --- a/ui/aura/window.h +++ b/ui/aura/window.h @@ -16,8 +16,8 @@ #include "base/string16.h" #include "ui/aura/aura_export.h" #include "ui/aura/client/window_types.h" +#include "ui/base/events/event_constants.h" #include "ui/base/events/event_target.h" -#include "ui/base/events.h" #include "ui/base/gestures/gesture_types.h" #include "ui/compositor/layer_animator.h" #include "ui/compositor/layer_delegate.h" diff --git a/ui/aura/window_delegate.h b/ui/aura/window_delegate.h index d8abbfb..7ebd2cc 100644 --- a/ui/aura/window_delegate.h +++ b/ui/aura/window_delegate.h @@ -7,7 +7,7 @@ #include "base/compiler_specific.h" #include "ui/aura/aura_export.h" -#include "ui/base/events.h" +#include "ui/base/events/event_constants.h" #include "ui/base/events/event_handler.h" #include "ui/gfx/native_widget_types.h" diff --git a/ui/aura/window_unittest.cc b/ui/aura/window_unittest.cc index b48b723..79feb47 100644 --- a/ui/aura/window_unittest.cc +++ b/ui/aura/window_unittest.cc @@ -25,7 +25,7 @@ #include "ui/aura/window_delegate.h" #include "ui/aura/window_observer.h" #include "ui/aura/window_property.h" -#include "ui/base/event.h" +#include "ui/base/events/event.h" #include "ui/base/gestures/gesture_configuration.h" #include "ui/base/hit_test.h" #include "ui/base/keycodes/keyboard_codes.h" diff --git a/ui/base/accelerators/accelerator.h b/ui/base/accelerators/accelerator.h index 5e1a488..3b92729 100644 --- a/ui/base/accelerators/accelerator.h +++ b/ui/base/accelerators/accelerator.h @@ -12,8 +12,8 @@ #define UI_BASE_ACCELERATORS_ACCELERATOR_H_ #include "base/string16.h" +#include "ui/base/events/event_constants.h" #include "ui/base/keycodes/keyboard_codes.h" -#include "ui/base/events.h" #include "ui/base/ui_export.h" namespace ui { diff --git a/ui/base/accelerators/accelerator_manager.h b/ui/base/accelerators/accelerator_manager.h index 3310db7..70f4a71 100644 --- a/ui/base/accelerators/accelerator_manager.h +++ b/ui/base/accelerators/accelerator_manager.h @@ -11,7 +11,7 @@ #include "base/basictypes.h" #include "ui/base/accelerators/accelerator.h" -#include "ui/base/events.h" +#include "ui/base/events/event_constants.h" #include "ui/base/ui_export.h" namespace ui { diff --git a/ui/base/accelerators/accelerator_manager_unittest.cc b/ui/base/accelerators/accelerator_manager_unittest.cc index fddd914..69bfc46 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.h" +#include "ui/base/events/event_constants.h" #include "ui/base/keycodes/keyboard_codes.h" namespace ui { diff --git a/ui/base/cocoa/events_mac.mm b/ui/base/cocoa/events_mac.mm index 4471882..7d880a4 100644 --- a/ui/base/cocoa/events_mac.mm +++ b/ui/base/cocoa/events_mac.mm @@ -4,7 +4,7 @@ #include <Cocoa/Cocoa.h> -#include "ui/base/events.h" +#include "ui/base/events/event_constants.h" #include "base/logging.h" #include "base/time.h" diff --git a/ui/base/cocoa/events_mac_unittest.mm b/ui/base/cocoa/events_mac_unittest.mm index eb4e159..b9bb4ff 100644 --- a/ui/base/cocoa/events_mac_unittest.mm +++ b/ui/base/cocoa/events_mac_unittest.mm @@ -5,7 +5,7 @@ #import <Cocoa/Cocoa.h> #include "testing/gtest/include/gtest/gtest.h" -#include "ui/base/events.h" +#include "ui/base/events/event_constants.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/event.cc b/ui/base/event.cc index bb4af75..69d1325 100644 --- a/ui/base/event.cc +++ b/ui/base/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/event.h" +#include "ui/base/events/event.h" #if defined(USE_X11) #include <X11/Xlib.h> @@ -11,8 +11,8 @@ #include <cstring> #include "ui/base/keycodes/keyboard_code_conversion.h" -#include "ui/gfx/point3.h" #include "ui/gfx/interpolated_transform.h" +#include "ui/gfx/point3.h" #include "ui/gfx/transform.h" #if defined(USE_X11) diff --git a/ui/base/event_unittest.cc b/ui/base/event_unittest.cc index fde2b76..4bdd830 100644 --- a/ui/base/event_unittest.cc +++ b/ui/base/event_unittest.cc @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ui/base/event.h" #include "testing/gtest/include/gtest/gtest.h" +#include "ui/base/events/event.h" #if defined(USE_X11) #include <X11/Xlib.h> diff --git a/ui/base/event.h b/ui/base/events/event.h index d572f15..1b66582 100644 --- a/ui/base/event.h +++ b/ui/base/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_EVENT_H_ -#define UI_BASE_EVENT_H_ +#ifndef UI_BASE_EVENTS_EVENT_CONSTANTS_EVENT_H_ +#define UI_BASE_EVENTS_EVENT_CONSTANTS_EVENT_H_ #include "base/basictypes.h" #include "base/compiler_specific.h" @@ -11,7 +11,7 @@ #include "base/logging.h" #include "base/time.h" #include "ui/base/dragdrop/os_exchange_data.h" -#include "ui/base/events.h" +#include "ui/base/events/event_constants.h" #include "ui/base/gestures/gesture_types.h" #include "ui/base/keycodes/keyboard_codes.h" #include "ui/base/ui_export.h" @@ -601,4 +601,4 @@ class UI_EXPORT GestureEvent : public LocatedEvent { } // namespace ui -#endif // UI_BASE_EVENT_H_ +#endif // UI_BASE_EVENTS_EVENT_CONSTANTS_EVENT_H_ diff --git a/ui/base/events.h b/ui/base/events/event_constants.h index 891fc32..e213bf8 100644 --- a/ui/base/events.h +++ b/ui/base/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_H_ -#define UI_BASE_EVENTS_H_ +#ifndef UI_BASE_EVENTS_EVENT_CONSTANTS_EVENTS_H_ +#define UI_BASE_EVENTS_EVENT_CONSTANTS_EVENTS_H_ #include "base/event_types.h" #include "ui/base/keycodes/keyboard_codes.h" @@ -228,4 +228,4 @@ UI_EXPORT bool IsMouseEventFromTouch(UINT message); } // namespace ui -#endif // UI_BASE_EVENTS_H_ +#endif // UI_BASE_EVENTS_EVENT_CONSTANTS_EVENTS_H_ diff --git a/ui/base/events/event_dispatcher.h b/ui/base/events/event_dispatcher.h index d449365..67b5a4e 100644 --- a/ui/base/events/event_dispatcher.h +++ b/ui/base/events/event_dispatcher.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_DISPATCHER_H_ -#define UI_BASE_EVENTS_EVENT_DISPATCHER_H_ +#ifndef UI_BASE_EVENTS_EVENT_CONSTANTS_EVENTS_EVENT_DISPATCHER_H_ +#define UI_BASE_EVENTS_EVENT_CONSTANTS_EVENTS_EVENT_DISPATCHER_H_ -#include "ui/base/event.h" -#include "ui/base/events.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" @@ -115,4 +115,4 @@ class UI_EXPORT EventDispatcher { } // namespace ui -#endif // UI_BASE_EVENTS_EVENT_DISPATCHER_H_ +#endif // UI_BASE_EVENTS_EVENT_CONSTANTS_EVENTS_EVENT_DISPATCHER_H_ diff --git a/ui/base/events/event_handler.h b/ui/base/events/event_handler.h index 7411536..e331bdc 100644 --- a/ui/base/events/event_handler.h +++ b/ui/base/events/event_handler.h @@ -2,12 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef UI_BASE_EVENTS_EVENT_HANDLER_H_ -#define UI_BASE_EVENTS_EVENT_HANDLER_H_ +#ifndef UI_BASE_EVENTS_EVENT_CONSTANTS_EVENTS_EVENT_HANDLER_H_ +#define UI_BASE_EVENTS_EVENT_CONSTANTS_EVENTS_EVENT_HANDLER_H_ #include <vector> -#include "ui/base/events.h" +#include "ui/base/events/event_constants.h" #include "ui/base/ui_export.h" namespace ui { @@ -46,4 +46,4 @@ typedef std::vector<EventHandler*> EventHandlerList; } // namespace ui -#endif // UI_BASE_EVENTS_EVENT_HANDLER_H_ +#endif // UI_BASE_EVENTS_EVENT_CONSTANTS_EVENTS_EVENT_HANDLER_H_ diff --git a/ui/base/events/event_target.h b/ui/base/events/event_target.h index 86bb98f..daf7694 100644 --- a/ui/base/events/event_target.h +++ b/ui/base/events/event_target.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_TARGET_H_ -#define UI_BASE_EVENTS_EVENT_TARGET_H_ +#ifndef UI_BASE_EVENTS_EVENT_CONSTANTS_EVENTS_EVENT_TARGET_H_ +#define UI_BASE_EVENTS_EVENT_CONSTANTS_EVENTS_EVENT_TARGET_H_ #include "base/compiler_specific.h" #include "ui/base/events/event_handler.h" @@ -77,4 +77,4 @@ class UI_EXPORT EventTarget : public EventHandler { } // namespace ui -#endif // UI_BASE_EVENTS_EVENT_TARGET_H_ +#endif // UI_BASE_EVENTS_EVENT_CONSTANTS_EVENTS_EVENT_TARGET_H_ diff --git a/ui/base/gestures/gesture_point.cc b/ui/base/gestures/gesture_point.cc index 89ec955..1447a43 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/event.h" -#include "ui/base/events.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/gestures/gesture_types.h" +#include "ui/base/gestures/gesture_util.h" namespace ui { diff --git a/ui/base/gestures/gesture_recognizer.h b/ui/base/gestures/gesture_recognizer.h index d8a7663..af3af54 100644 --- a/ui/base/gestures/gesture_recognizer.h +++ b/ui/base/gestures/gesture_recognizer.h @@ -8,7 +8,7 @@ #include <vector> #include "base/memory/scoped_vector.h" -#include "ui/base/events.h" +#include "ui/base/events/event_constants.h" #include "ui/base/gestures/gesture_types.h" #include "ui/base/ui_export.h" diff --git a/ui/base/gestures/gesture_recognizer_impl.cc b/ui/base/gestures/gesture_recognizer_impl.cc index 718f044..bb3038c 100644 --- a/ui/base/gestures/gesture_recognizer_impl.cc +++ b/ui/base/gestures/gesture_recognizer_impl.cc @@ -7,8 +7,8 @@ #include "base/logging.h" #include "base/memory/scoped_ptr.h" #include "base/time.h" -#include "ui/base/event.h" -#include "ui/base/events.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_sequence.h" #include "ui/base/gestures/gesture_types.h" diff --git a/ui/base/gestures/gesture_recognizer_impl.h b/ui/base/gestures/gesture_recognizer_impl.h index b591531..0af2a6c 100644 --- a/ui/base/gestures/gesture_recognizer_impl.h +++ b/ui/base/gestures/gesture_recognizer_impl.h @@ -11,7 +11,7 @@ #include "base/memory/linked_ptr.h" #include "base/memory/scoped_ptr.h" -#include "ui/base/events.h" +#include "ui/base/events/event_constants.h" #include "ui/base/gestures/gesture_recognizer.h" #include "ui/base/ui_export.h" #include "ui/gfx/point.h" diff --git a/ui/base/gestures/gesture_sequence.cc b/ui/base/gestures/gesture_sequence.cc index 80d595e..d668a1e 100644 --- a/ui/base/gestures/gesture_sequence.cc +++ b/ui/base/gestures/gesture_sequence.cc @@ -9,8 +9,8 @@ #include "base/logging.h" #include "base/memory/scoped_ptr.h" #include "base/time.h" -#include "ui/base/event.h" -#include "ui/base/events.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/gfx/rect.h" diff --git a/ui/base/gestures/gesture_sequence.h b/ui/base/gestures/gesture_sequence.h index 9827eb3..e6988e5 100644 --- a/ui/base/gestures/gesture_sequence.h +++ b/ui/base/gestures/gesture_sequence.h @@ -6,7 +6,7 @@ #define UI_BASE_GESTURES_GESTURE_SEQUENCE_H_ #include "base/timer.h" -#include "ui/base/events.h" +#include "ui/base/events/event_constants.h" #include "ui/base/gestures/gesture_point.h" #include "ui/base/gestures/gesture_recognizer.h" #include "ui/gfx/rect.h" diff --git a/ui/base/gestures/gesture_types.h b/ui/base/gestures/gesture_types.h index 14b73cd..d44de87 100644 --- a/ui/base/gestures/gesture_types.h +++ b/ui/base/gestures/gesture_types.h @@ -7,7 +7,7 @@ #include "base/logging.h" #include "base/time.h" -#include "ui/base/events.h" +#include "ui/base/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 3bcda38..7268445 100644 --- a/ui/base/ime/character_composer.cc +++ b/ui/base/ime/character_composer.cc @@ -12,7 +12,7 @@ // 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.h" +#include "ui/base/events/event_constants.h" #include "ui/base/glib/glib_integers.h" namespace { diff --git a/ui/base/ime/character_composer_unittest.cc b/ui/base/ime/character_composer_unittest.cc index 0e304c6..8f93da2 100644 --- a/ui/base/ime/character_composer_unittest.cc +++ b/ui/base/ime/character_composer_unittest.cc @@ -7,7 +7,7 @@ #include "base/utf_string_conversions.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/gtk+/gdk/gdkkeysyms.h" -#include "ui/base/events.h" +#include "ui/base/events/event_constants.h" #include "ui/base/glib/glib_integers.h" namespace ui { diff --git a/ui/base/ime/input_method_base.h b/ui/base/ime/input_method_base.h index 61511d0..f23b37c 100644 --- a/ui/base/ime/input_method_base.h +++ b/ui/base/ime/input_method_base.h @@ -7,7 +7,7 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" -#include "ui/base/events.h" +#include "ui/base/events/event_constants.h" #include "ui/base/ime/input_method.h" #include "ui/base/ui_export.h" diff --git a/ui/base/ime/input_method_delegate.h b/ui/base/ime/input_method_delegate.h index c398e27..3202d90 100644 --- a/ui/base/ime/input_method_delegate.h +++ b/ui/base/ime/input_method_delegate.h @@ -6,7 +6,7 @@ #define UI_BASE_IME_INPUT_METHOD_DELEGATE_H_ #include "base/event_types.h" -#include "ui/base/events.h" +#include "ui/base/events/event_constants.h" #include "ui/base/ui_export.h" namespace ui { diff --git a/ui/base/ime/input_method_ibus.cc b/ui/base/ime/input_method_ibus.cc index d3d81a4..3a06d132 100644 --- a/ui/base/ime/input_method_ibus.cc +++ b/ui/base/ime/input_method_ibus.cc @@ -26,7 +26,7 @@ #include "chromeos/dbus/ibus/ibus_client.h" #include "chromeos/dbus/ibus/ibus_input_context_client.h" #include "chromeos/dbus/ibus/ibus_text.h" -#include "ui/base/events.h" +#include "ui/base/events/event_constants.h" #include "ui/base/ime/ibus_client.h" #include "ui/base/ime/text_input_client.h" #include "ui/base/keycodes/keyboard_code_conversion.h" diff --git a/ui/base/ime/mock_input_method.cc b/ui/base/ime/mock_input_method.cc index 9f6e032..2c22606 100644 --- a/ui/base/ime/mock_input_method.cc +++ b/ui/base/ime/mock_input_method.cc @@ -6,7 +6,7 @@ #include "base/logging.h" #include "base/string16.h" -#include "ui/base/events.h" +#include "ui/base/events/event_constants.h" #include "ui/base/glib/glib_integers.h" #include "ui/base/ime/input_method_delegate.h" #include "ui/base/ime/text_input_client.h" diff --git a/ui/base/keycodes/keyboard_code_conversion.cc b/ui/base/keycodes/keyboard_code_conversion.cc index 26ddd87..1a4d92a 100644 --- a/ui/base/keycodes/keyboard_code_conversion.cc +++ b/ui/base/keycodes/keyboard_code_conversion.cc @@ -4,7 +4,7 @@ #include "ui/base/keycodes/keyboard_code_conversion.h" -#include "ui/base/events.h" +#include "ui/base/events/event_constants.h" namespace ui { diff --git a/ui/base/win/events_win.cc b/ui/base/win/events_win.cc index 3b2569c..80b4eaf 100644 --- a/ui/base/win/events_win.cc +++ b/ui/base/win/events_win.cc @@ -4,7 +4,7 @@ #include <windowsx.h> -#include "ui/base/events.h" +#include "ui/base/events/event_constants.h" #include "base/logging.h" #include "base/time.h" diff --git a/ui/base/x/events_x.cc b/ui/base/x/events_x.cc index 8c2dff2..960dda4 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.h" +#include "ui/base/events/event_constants.h" #include <string.h> #include <X11/extensions/XInput.h> diff --git a/ui/base/x/events_x_unittest.cc b/ui/base/x/events_x_unittest.cc index 18010a3..422e669 100644 --- a/ui/base/x/events_x_unittest.cc +++ b/ui/base/x/events_x_unittest.cc @@ -11,7 +11,7 @@ #undef None #include "testing/gtest/include/gtest/gtest.h" -#include "ui/base/events.h" +#include "ui/base/events/event_constants.h" #include "ui/gfx/point.h" namespace ui { diff --git a/ui/base/x/x11_util.h b/ui/base/x/x11_util.h index c8b4e25..d60b4d2 100644 --- a/ui/base/x/x11_util.h +++ b/ui/base/x/x11_util.h @@ -15,7 +15,7 @@ #include <vector> #include "base/basictypes.h" -#include "ui/base/events.h" +#include "ui/base/events/event_constants.h" #include "ui/base/ui_export.h" #include "ui/gfx/point.h" @@ -184,8 +184,8 @@ 'base/dragdrop/os_exchange_data_provider_win.cc', 'base/dragdrop/os_exchange_data_provider_win.h', 'base/event.cc', - 'base/event.h', - 'base/events.h', + 'base/events/event.h', + 'base/events/event_constants.h', 'base/events/event_dispatcher.h', 'base/events/event_handler.h', 'base/events/event_target.cc', @@ -742,7 +742,7 @@ ['toolkit_views==0', { 'sources!': [ 'base/event.cc', - 'base/event.h', + 'base/events/event.h', 'base/x/events_x.cc', ], }], diff --git a/ui/views/color_chooser/color_chooser_view.cc b/ui/views/color_chooser/color_chooser_view.cc index dc35ff1..f6e16d3 100644 --- a/ui/views/color_chooser/color_chooser_view.cc +++ b/ui/views/color_chooser/color_chooser_view.cc @@ -8,9 +8,9 @@ #include "base/string_number_conversions.h" #include "base/stringprintf.h" #include "base/utf_string_conversions.h" -#include "ui/gfx/canvas.h" -#include "ui/base/event.h" +#include "ui/base/events/event.h" #include "ui/base/keycodes/keyboard_codes.h" +#include "ui/gfx/canvas.h" #include "ui/views/background.h" #include "ui/views/border.h" #include "ui/views/color_chooser/color_chooser_listener.h" diff --git a/ui/views/controls/button/custom_button.cc b/ui/views/controls/button/custom_button.cc index 1224141..28d570c 100644 --- a/ui/views/controls/button/custom_button.cc +++ b/ui/views/controls/button/custom_button.cc @@ -6,7 +6,7 @@ #include "ui/base/accessibility/accessible_view_state.h" #include "ui/base/animation/throb_animation.h" -#include "ui/base/event.h" +#include "ui/base/events/event.h" #include "ui/base/keycodes/keyboard_codes.h" #include "ui/gfx/screen.h" #include "ui/views/widget/widget.h" diff --git a/ui/views/controls/button/custom_button.h b/ui/views/controls/button/custom_button.h index 03f9f33..6c15816 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 "ui/base/animation/animation_delegate.h" -#include "ui/base/events.h" +#include "ui/base/events/event_constants.h" #include "ui/views/controls/button/button.h" namespace ui { diff --git a/ui/views/controls/button/menu_button.cc b/ui/views/controls/button/menu_button.cc index 0e06515..a61a74e 100644 --- a/ui/views/controls/button/menu_button.cc +++ b/ui/views/controls/button/menu_button.cc @@ -9,8 +9,8 @@ #include "grit/ui_strings.h" #include "ui/base/accessibility/accessible_view_state.h" #include "ui/base/dragdrop/drag_drop_types.h" -#include "ui/base/event.h" -#include "ui/base/events.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/gfx/canvas.h" diff --git a/ui/views/controls/combobox/combobox.cc b/ui/views/controls/combobox/combobox.cc index 0b5cc3a..8b21c97 100644 --- a/ui/views/controls/combobox/combobox.cc +++ b/ui/views/controls/combobox/combobox.cc @@ -7,7 +7,7 @@ #include "base/logging.h" #include "base/utf_string_conversions.h" #include "ui/base/accessibility/accessible_view_state.h" -#include "ui/base/event.h" +#include "ui/base/events/event.h" #include "ui/base/keycodes/keyboard_codes.h" #include "ui/base/models/combobox_model.h" #include "ui/base/resource/resource_bundle.h" diff --git a/ui/views/controls/combobox/native_combobox_views.cc b/ui/views/controls/combobox/native_combobox_views.cc index 50f18da..67c49ed 100644 --- a/ui/views/controls/combobox/native_combobox_views.cc +++ b/ui/views/controls/combobox/native_combobox_views.cc @@ -7,8 +7,8 @@ #include <algorithm> #include "grit/ui_resources.h" +#include "ui/base/events/event.h" #include "ui/base/keycodes/keyboard_codes.h" -#include "ui/base/event.h" #include "ui/base/models/combobox_model.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/canvas.h" diff --git a/ui/views/controls/combobox/native_combobox_views_unittest.cc b/ui/views/controls/combobox/native_combobox_views_unittest.cc index 497c2dd..f283307 100644 --- a/ui/views/controls/combobox/native_combobox_views_unittest.cc +++ b/ui/views/controls/combobox/native_combobox_views_unittest.cc @@ -3,7 +3,7 @@ // found in the LICENSE file. #include "base/utf_string_conversions.h" -#include "ui/base/event.h" +#include "ui/base/events/event.h" #include "ui/base/keycodes/keyboard_codes.h" #include "ui/base/models/combobox_model.h" #include "ui/views/controls/combobox/combobox.h" diff --git a/ui/views/controls/combobox/native_combobox_win.cc b/ui/views/controls/combobox/native_combobox_win.cc index 150f1f9..3bca066 100644 --- a/ui/views/controls/combobox/native_combobox_win.cc +++ b/ui/views/controls/combobox/native_combobox_win.cc @@ -6,7 +6,7 @@ #include "base/i18n/rtl.h" #include "base/utf_string_conversions.h" -#include "ui/base/event.h" +#include "ui/base/events/event.h" #include "ui/base/models/combobox_model.h" #include "ui/base/native_theme/native_theme_win.h" #include "ui/base/resource/resource_bundle.h" diff --git a/ui/views/controls/link.cc b/ui/views/controls/link.cc index 62e3ac4..d116aa3 100644 --- a/ui/views/controls/link.cc +++ b/ui/views/controls/link.cc @@ -9,7 +9,7 @@ #include "base/logging.h" #include "base/utf_string_conversions.h" #include "ui/base/accessibility/accessible_view_state.h" -#include "ui/base/event.h" +#include "ui/base/events/event.h" #include "ui/base/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 d4adac9..c8e966d 100644 --- a/ui/views/controls/menu/menu_controller.cc +++ b/ui/views/controls/menu/menu_controller.cc @@ -11,7 +11,7 @@ #include "base/utf_string_conversions.h" #include "ui/base/dragdrop/drag_utils.h" #include "ui/base/dragdrop/os_exchange_data.h" -#include "ui/base/events.h" +#include "ui/base/events/event_constants.h" #include "ui/base/keycodes/keyboard_codes.h" #include "ui/base/l10n/l10n_util.h" #include "ui/gfx/canvas.h" diff --git a/ui/views/controls/menu/menu_controller.h b/ui/views/controls/menu/menu_controller.h index 9604d18..e29b1a1 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.h" #include "base/timer.h" -#include "ui/base/events.h" +#include "ui/base/events/event_constants.h" #include "ui/views/controls/menu/menu_delegate.h" #include "ui/views/controls/menu/menu_item_view.h" diff --git a/ui/views/controls/menu/submenu_view.cc b/ui/views/controls/menu/submenu_view.cc index cf8a27e..a84b3ec 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/event.h" +#include "ui/base/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 013e585..0d8823e 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/event.h" +#include "ui/base/events/event.h" #include "ui/views/controls/scrollbar/native_scroll_bar.h" #include "ui/views/widget/root_view.h" diff --git a/ui/views/controls/scrollbar/base_scroll_bar.cc b/ui/views/controls/scrollbar/base_scroll_bar.cc index bbf5e3a..dd293af 100644 --- a/ui/views/controls/scrollbar/base_scroll_bar.cc +++ b/ui/views/controls/scrollbar/base_scroll_bar.cc @@ -13,7 +13,7 @@ #include "base/utf_string_conversions.h" #include "build/build_config.h" #include "grit/ui_strings.h" -#include "ui/base/event.h" +#include "ui/base/events/event.h" #include "ui/base/keycodes/keyboard_codes.h" #include "ui/base/l10n/l10n_util.h" #include "ui/gfx/canvas.h" diff --git a/ui/views/controls/scrollbar/native_scroll_bar.cc b/ui/views/controls/scrollbar/native_scroll_bar.cc index 0ed04d7..e19e117 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.h" -#include "ui/base/event.h" +#include "ui/base/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/scrollbar/native_scroll_bar_win.cc b/ui/views/controls/scrollbar/native_scroll_bar_win.cc index 38ca36f..ce98bd2 100644 --- a/ui/views/controls/scrollbar/native_scroll_bar_win.cc +++ b/ui/views/controls/scrollbar/native_scroll_bar_win.cc @@ -8,7 +8,7 @@ #include <string> #include "base/message_loop.h" -#include "ui/base/event.h" +#include "ui/base/events/event.h" #include "ui/base/keycodes/keyboard_codes.h" #include "ui/base/win/hwnd_util.h" #include "ui/base/win/window_impl.h" diff --git a/ui/views/controls/slider.cc b/ui/views/controls/slider.cc index 890a28f..46c1c11 100644 --- a/ui/views/controls/slider.cc +++ b/ui/views/controls/slider.cc @@ -14,7 +14,7 @@ #include "third_party/skia/include/core/SkPaint.h" #include "ui/base/accessibility/accessible_view_state.h" #include "ui/base/animation/slide_animation.h" -#include "ui/base/event.h" +#include "ui/base/events/event.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/canvas.h" #include "ui/gfx/point.h" diff --git a/ui/views/controls/table/table_view_views.cc b/ui/views/controls/table/table_view_views.cc index 58f7323..cbb5257 100644 --- a/ui/views/controls/table/table_view_views.cc +++ b/ui/views/controls/table/table_view_views.cc @@ -5,7 +5,7 @@ #include "ui/views/controls/table/table_view_views.h" #include "base/i18n/rtl.h" -#include "ui/base/event.h" +#include "ui/base/events/event.h" #include "ui/base/models/table_model.h" #include "ui/base/native_theme/native_theme.h" #include "ui/gfx/canvas.h" diff --git a/ui/views/controls/textfield/native_textfield_views.cc b/ui/views/controls/textfield/native_textfield_views.cc index 058293f..f1cdf26 100644 --- a/ui/views/controls/textfield/native_textfield_views.cc +++ b/ui/views/controls/textfield/native_textfield_views.cc @@ -18,7 +18,7 @@ #include "third_party/skia/include/core/SkColor.h" #include "ui/base/clipboard/clipboard.h" #include "ui/base/dragdrop/drag_drop_types.h" -#include "ui/base/event.h" +#include "ui/base/events/event.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/range/range.h" #include "ui/compositor/layer.h" diff --git a/ui/views/controls/textfield/native_textfield_views.h b/ui/views/controls/textfield/native_textfield_views.h index b48b0e0..3a58d54 100644 --- a/ui/views/controls/textfield/native_textfield_views.h +++ b/ui/views/controls/textfield/native_textfield_views.h @@ -7,7 +7,7 @@ #include "base/memory/weak_ptr.h" #include "base/string16.h" -#include "ui/base/events.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/gfx/font.h" diff --git a/ui/views/controls/textfield/native_textfield_views_unittest.cc b/ui/views/controls/textfield/native_textfield_views_unittest.cc index 0813115..c78bbf8 100644 --- a/ui/views/controls/textfield/native_textfield_views_unittest.cc +++ b/ui/views/controls/textfield/native_textfield_views_unittest.cc @@ -20,7 +20,7 @@ #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/event.h" +#include "ui/base/events/event.h" #include "ui/base/ime/text_input_client.h" #include "ui/base/keycodes/keyboard_codes.h" #include "ui/base/l10n/l10n_util.h" diff --git a/ui/views/controls/textfield/native_textfield_win.cc b/ui/views/controls/textfield/native_textfield_win.cc index 73cbf1e..c356451 100644 --- a/ui/views/controls/textfield/native_textfield_win.cc +++ b/ui/views/controls/textfield/native_textfield_win.cc @@ -17,7 +17,7 @@ #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/event.h" +#include "ui/base/events/event.h" #include "ui/base/keycodes/keyboard_codes.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/l10n/l10n_util_win.h" diff --git a/ui/views/controls/textfield/textfield.cc b/ui/views/controls/textfield/textfield.cc index d4e9f60..5ea98f4 100644 --- a/ui/views/controls/textfield/textfield.cc +++ b/ui/views/controls/textfield/textfield.cc @@ -10,7 +10,7 @@ #include "base/string_util.h" #include "base/utf_string_conversions.h" #include "ui/base/accessibility/accessible_view_state.h" -#include "ui/base/event.h" +#include "ui/base/events/event.h" #include "ui/base/ime/text_input_type.h" #include "ui/base/keycodes/keyboard_codes.h" #include "ui/base/range/range.h" diff --git a/ui/views/controls/tree/tree_view_views.cc b/ui/views/controls/tree/tree_view_views.cc index d54ceb3..8659180 100644 --- a/ui/views/controls/tree/tree_view_views.cc +++ b/ui/views/controls/tree/tree_view_views.cc @@ -10,7 +10,7 @@ #include "base/message_loop.h" #include "grit/ui_resources.h" #include "ui/base/accessibility/accessible_view_state.h" -#include "ui/base/event.h" +#include "ui/base/events/event.h" #include "ui/base/keycodes/keyboard_codes.h" #include "ui/base/native_theme/native_theme.h" #include "ui/base/resource/resource_bundle.h" diff --git a/ui/views/controls/tree/tree_view_win.cc b/ui/views/controls/tree/tree_view_win.cc index 1688e6c..c73aa68 100644 --- a/ui/views/controls/tree/tree_view_win.cc +++ b/ui/views/controls/tree/tree_view_win.cc @@ -13,7 +13,7 @@ #include "grit/ui_resources.h" #include "ui/base/accelerators/accelerator.h" #include "ui/base/accessibility/accessible_view_state.h" -#include "ui/base/events.h" +#include "ui/base/events/event_constants.h" #include "ui/base/keycodes/keyboard_code_conversion_win.h" #include "ui/base/keycodes/keyboard_codes.h" #include "ui/base/l10n/l10n_util_win.h" diff --git a/ui/views/controls/webview/web_dialog_view.cc b/ui/views/controls/webview/web_dialog_view.cc index c3ba403..917eeb4 100644 --- a/ui/views/controls/webview/web_dialog_view.cc +++ b/ui/views/controls/webview/web_dialog_view.cc @@ -22,7 +22,7 @@ #include "ui/web_dialogs/web_dialog_ui.h" #if defined(USE_AURA) -#include "ui/base/event.h" +#include "ui/base/events/event.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 189c9ef..74d24f4 100644 --- a/ui/views/controls/webview/webview.cc +++ b/ui/views/controls/webview/webview.cc @@ -15,7 +15,7 @@ #include "ipc/ipc_message.h" #include "ui/base/accessibility/accessibility_types.h" #include "ui/base/accessibility/accessible_view_state.h" -#include "ui/base/event.h" +#include "ui/base/events/event.h" #include "ui/views/controls/native/native_view_host.h" #include "ui/views/focus/focus_manager.h" #include "ui/views/views_delegate.h" diff --git a/ui/views/examples/textfield_example.cc b/ui/views/examples/textfield_example.cc index 57b7e87..275df00 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/utf_string_conversions.h" -#include "ui/base/event.h" +#include "ui/base/events/event.h" #include "ui/base/range/range.h" #include "ui/gfx/render_text.h" #include "ui/views/controls/label.h" diff --git a/ui/views/focus/accelerator_handler_win.cc b/ui/views/focus/accelerator_handler_win.cc index ffbd373..7d11c97 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/event.h" +#include "ui/base/events/event.h" #include "ui/base/keycodes/keyboard_code_conversion_win.h" #include "ui/base/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 f89d6e50..7594754 100644 --- a/ui/views/focus/focus_manager.cc +++ b/ui/views/focus/focus_manager.cc @@ -10,7 +10,7 @@ #include "base/logging.h" #include "build/build_config.h" #include "ui/base/accelerators/accelerator.h" -#include "ui/base/event.h" +#include "ui/base/events/event.h" #include "ui/base/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 9848c6c..2ff7153 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/utf_string_conversions.h" -#include "ui/base/event.h" +#include "ui/base/events/event.h" #include "ui/views/controls/button/text_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 1150f54..c64ea2d 100644 --- a/ui/views/ime/input_method_base.cc +++ b/ui/views/ime/input_method_base.cc @@ -4,7 +4,7 @@ #include "ui/views/ime/input_method_base.h" -#include "ui/base/event.h" +#include "ui/base/events/event.h" #include "ui/base/ime/text_input_client.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 994056a..ef7d544 100644 --- a/ui/views/ime/input_method_bridge.cc +++ b/ui/views/ime/input_method_bridge.cc @@ -4,7 +4,7 @@ #include "ui/views/ime/input_method_bridge.h" -#include "ui/base/event.h" +#include "ui/base/events/event.h" #include "ui/base/ime/input_method.h" #include "ui/gfx/rect.h" #include "ui/views/view.h" diff --git a/ui/views/ime/input_method_win.cc b/ui/views/ime/input_method_win.cc index 5c311e2..2562534 100644 --- a/ui/views/ime/input_method_win.cc +++ b/ui/views/ime/input_method_win.cc @@ -7,8 +7,8 @@ #include "base/basictypes.h" #include "base/logging.h" #include "base/string_util.h" -#include "ui/base/event.h" -#include "ui/base/events.h" +#include "ui/base/events/event.h" +#include "ui/base/events/event_constants.h" #include "ui/base/ime/composition_text.h" #include "ui/base/ime/text_input_client.h" #include "ui/base/keycodes/keyboard_codes.h" diff --git a/ui/views/ime/mock_input_method.cc b/ui/views/ime/mock_input_method.cc index 9e6d70e..054eb01 100644 --- a/ui/views/ime/mock_input_method.cc +++ b/ui/views/ime/mock_input_method.cc @@ -6,7 +6,7 @@ #include "base/basictypes.h" #include "base/logging.h" -#include "ui/base/event.h" +#include "ui/base/events/event.h" #include "ui/base/ime/text_input_client.h" #include "ui/base/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 6e0a8c0..54db660 100644 --- a/ui/views/mouse_watcher.cc +++ b/ui/views/mouse_watcher.cc @@ -9,7 +9,7 @@ #include "base/event_types.h" #include "base/memory/weak_ptr.h" #include "base/message_loop.h" -#include "ui/base/events.h" +#include "ui/base/events/event_constants.h" #include "ui/gfx/screen.h" namespace views { diff --git a/ui/views/view.h b/ui/views/view.h index 6ac619c..2d028ef 100644 --- a/ui/views/view.h +++ b/ui/views/view.h @@ -16,9 +16,9 @@ #include "base/logging.h" #include "base/memory/scoped_ptr.h" #include "build/build_config.h" -#include "ui/base/event.h" #include "ui/base/accelerators/accelerator.h" #include "ui/base/dragdrop/os_exchange_data.h" +#include "ui/base/events/event.h" #include "ui/compositor/layer_delegate.h" #include "ui/compositor/layer_owner.h" #include "ui/gfx/native_widget_types.h" diff --git a/ui/views/view_unittest.cc b/ui/views/view_unittest.cc index f34d9fc..45d83b5 100644 --- a/ui/views/view_unittest.cc +++ b/ui/views/view_unittest.cc @@ -11,7 +11,7 @@ #include "testing/gmock/include/gmock/gmock.h" #include "ui/base/accelerators/accelerator.h" #include "ui/base/clipboard/clipboard.h" -#include "ui/base/event.h" +#include "ui/base/events/event.h" #include "ui/base/keycodes/keyboard_codes.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/models/simple_menu_model.h" diff --git a/ui/views/widget/native_widget_aura.cc b/ui/views/widget/native_widget_aura.cc index 8252eaf..64d5619 100644 --- a/ui/views/widget/native_widget_aura.cc +++ b/ui/views/widget/native_widget_aura.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/event.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/gfx/canvas.h" diff --git a/ui/views/widget/native_widget_aura.h b/ui/views/widget/native_widget_aura.h index 3349ffe..e683fc7 100644 --- a/ui/views/widget/native_widget_aura.h +++ b/ui/views/widget/native_widget_aura.h @@ -10,7 +10,7 @@ #include "ui/aura/client/activation_delegate.h" #include "ui/aura/client/drag_drop_delegate.h" #include "ui/aura/window_delegate.h" -#include "ui/base/events.h" +#include "ui/base/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 b61fa3e..0dec3d71 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/event.h" +#include "ui/base/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 50cf9a1..604f328 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.h" +#include "ui/base/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 fbb62fa..79bd866 100644 --- a/ui/views/widget/native_widget_win.cc +++ b/ui/views/widget/native_widget_win.cc @@ -18,7 +18,7 @@ #include "ui/base/dragdrop/drag_source.h" #include "ui/base/dragdrop/os_exchange_data.h" #include "ui/base/dragdrop/os_exchange_data_provider_win.h" -#include "ui/base/event.h" +#include "ui/base/events/event.h" #include "ui/base/keycodes/keyboard_code_conversion_win.h" #include "ui/base/l10n/l10n_util_win.h" #include "ui/base/theme_provider.h" diff --git a/ui/views/widget/root_view.cc b/ui/views/widget/root_view.cc index ed6a276..2dd5446 100644 --- a/ui/views/widget/root_view.cc +++ b/ui/views/widget/root_view.cc @@ -10,7 +10,7 @@ #include "base/message_loop.h" #include "ui/base/accessibility/accessible_view_state.h" #include "ui/base/dragdrop/drag_drop_types.h" -#include "ui/base/event.h" +#include "ui/base/events/event.h" #include "ui/base/keycodes/keyboard_codes.h" #include "ui/compositor/layer.h" #include "ui/gfx/canvas.h" diff --git a/ui/views/widget/widget.cc b/ui/views/widget/widget.cc index ed30d7e..06f5084 100644 --- a/ui/views/widget/widget.cc +++ b/ui/views/widget/widget.cc @@ -7,7 +7,7 @@ #include "base/logging.h" #include "base/message_loop.h" #include "base/utf_string_conversions.h" -#include "ui/base/event.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" diff --git a/ui/views/widget/x11_desktop_window_move_client.cc b/ui/views/widget/x11_desktop_window_move_client.cc index 07f7041..329a656 100644 --- a/ui/views/widget/x11_desktop_window_move_client.cc +++ b/ui/views/widget/x11_desktop_window_move_client.cc @@ -13,7 +13,7 @@ #include "base/run_loop.h" #include "ui/aura/env.h" #include "ui/aura/root_window.h" -#include "ui/base/event.h" +#include "ui/base/events/event.h" #include "ui/base/x/x11_util.h" #include "ui/gfx/screen.h" diff --git a/ui/views/widget/x11_window_event_filter.cc b/ui/views/widget/x11_window_event_filter.cc index 192c6ff..e386590 100644 --- a/ui/views/widget/x11_window_event_filter.cc +++ b/ui/views/widget/x11_window_event_filter.cc @@ -4,16 +4,16 @@ #include "ui/views/widget/x11_window_event_filter.h" -#include <X11/Xatom.h> -#include <X11/Xlib.h> #include <X11/extensions/XInput.h> #include <X11/extensions/XInput2.h> +#include <X11/Xatom.h> +#include <X11/Xlib.h> #include "base/message_pump_aurax11.h" #include "ui/aura/desktop/desktop_activation_client.h" #include "ui/aura/root_window.h" #include "ui/aura/window_delegate.h" -#include "ui/base/event.h" +#include "ui/base/events/event.h" #include "ui/base/hit_test.h" #include "ui/views/widget/native_widget_aura.h" diff --git a/ui/views/win/hwnd_message_handler.cc b/ui/views/win/hwnd_message_handler.cc index 33e2329..d71dd91 100644 --- a/ui/views/win/hwnd_message_handler.cc +++ b/ui/views/win/hwnd_message_handler.cc @@ -10,7 +10,7 @@ #include "base/bind.h" #include "base/system_monitor/system_monitor.h" #include "base/win/windows_version.h" -#include "ui/base/event.h" +#include "ui/base/events/event.h" #include "ui/base/keycodes/keyboard_code_conversion_win.h" #include "ui/base/native_theme/native_theme_win.h" #include "ui/base/win/hwnd_util.h" |