diff options
Diffstat (limited to 'chrome/browser/ui/views')
36 files changed, 40 insertions, 40 deletions
diff --git a/chrome/browser/ui/views/accelerator_table.cc b/chrome/browser/ui/views/accelerator_table.cc index 5b84d1e..b799cbc 100644 --- a/chrome/browser/ui/views/accelerator_table.cc +++ b/chrome/browser/ui/views/accelerator_table.cc @@ -7,7 +7,7 @@ #include "base/basictypes.h" #include "chrome/app/chrome_command_ids.h" #include "ui/base/accelerators/accelerator.h" -#include "ui/base/events/event_constants.h" +#include "ui/events/event_constants.h" #if defined(USE_ASH) #include "ash/accelerators/accelerator_table.h" diff --git a/chrome/browser/ui/views/accelerator_table_unittest.cc b/chrome/browser/ui/views/accelerator_table_unittest.cc index 9cdf7af..f97303d 100644 --- a/chrome/browser/ui/views/accelerator_table_unittest.cc +++ b/chrome/browser/ui/views/accelerator_table_unittest.cc @@ -7,7 +7,7 @@ #include "base/basictypes.h" #include "chrome/browser/ui/views/accelerator_table.h" #include "testing/gtest/include/gtest/gtest.h" -#include "ui/base/events/event_constants.h" +#include "ui/events/event_constants.h" #if defined(USE_ASH) #include "ash/accelerators/accelerator_table.h" diff --git a/chrome/browser/ui/views/app_menu_button_win.cc b/chrome/browser/ui/views/app_menu_button_win.cc index 3e63d81..f2eadf0 100644 --- a/chrome/browser/ui/views/app_menu_button_win.cc +++ b/chrome/browser/ui/views/app_menu_button_win.cc @@ -4,7 +4,7 @@ #include "chrome/browser/ui/views/app_menu_button_win.h" -#include "ui/base/events/event.h" +#include "ui/events/event.h" #include "ui/gfx/win/hwnd_util.h" #include "ui/views/widget/widget.h" diff --git a/chrome/browser/ui/views/ash/tab_scrubber.cc b/chrome/browser/ui/views/ash/tab_scrubber.cc index 5b106d2..8cf7d97 100644 --- a/chrome/browser/ui/views/ash/tab_scrubber.cc +++ b/chrome/browser/ui/views/ash/tab_scrubber.cc @@ -18,9 +18,9 @@ #include "content/public/browser/notification_service.h" #include "content/public/browser/notification_source.h" #include "ui/aura/window.h" -#include "ui/base/events/event.h" -#include "ui/base/events/event_utils.h" #include "ui/base/gestures/gesture_configuration.h" +#include "ui/events/event.h" +#include "ui/events/event_utils.h" #include "ui/views/controls/glow_hover_controller.h" namespace { diff --git a/chrome/browser/ui/views/ash/tab_scrubber.h b/chrome/browser/ui/views/ash/tab_scrubber.h index 04436ca..29d7d2d 100644 --- a/chrome/browser/ui/views/ash/tab_scrubber.h +++ b/chrome/browser/ui/views/ash/tab_scrubber.h @@ -10,7 +10,7 @@ #include "chrome/browser/ui/views/tabs/tab_strip_observer.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" -#include "ui/base/events/event_handler.h" +#include "ui/events/event_handler.h" class Browser; class TabStrip; diff --git a/chrome/browser/ui/views/ash/tab_scrubber_browsertest.cc b/chrome/browser/ui/views/ash/tab_scrubber_browsertest.cc index 37a9b41..32fabba 100644 --- a/chrome/browser/ui/views/ash/tab_scrubber_browsertest.cc +++ b/chrome/browser/ui/views/ash/tab_scrubber_browsertest.cc @@ -25,7 +25,7 @@ #include "content/public/test/test_utils.h" #include "ui/aura/test/event_generator.h" #include "ui/aura/window.h" -#include "ui/base/events/event_utils.h" +#include "ui/events/event_utils.h" #if defined(OS_CHROMEOS) #include "chromeos/chromeos_switches.h" diff --git a/chrome/browser/ui/views/avatar_label.cc b/chrome/browser/ui/views/avatar_label.cc index fa51b5f..e854be1 100644 --- a/chrome/browser/ui/views/avatar_label.cc +++ b/chrome/browser/ui/views/avatar_label.cc @@ -10,10 +10,10 @@ #include "chrome/browser/ui/views/frame/browser_view.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" -#include "ui/base/events/event.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" #include "ui/base/theme_provider.h" +#include "ui/events/event.h" #include "ui/gfx/canvas.h" #include "ui/gfx/color_utils.h" #include "ui/views/painter.h" diff --git a/chrome/browser/ui/views/bookmarks/bookmark_drag_drop_views.cc b/chrome/browser/ui/views/bookmarks/bookmark_drag_drop_views.cc index 8a3d2b2..0c2de57 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_drag_drop_views.cc +++ b/chrome/browser/ui/views/bookmarks/bookmark_drag_drop_views.cc @@ -13,7 +13,7 @@ #include "components/user_prefs/user_prefs.h" #include "ui/base/dragdrop/drag_drop_types.h" #include "ui/base/dragdrop/os_exchange_data.h" -#include "ui/base/events/event.h" +#include "ui/events/event.h" #include "ui/views/drag_utils.h" #include "ui/views/widget/widget.h" diff --git a/chrome/browser/ui/views/bookmarks/bookmark_editor_view.cc b/chrome/browser/ui/views/bookmarks/bookmark_editor_view.cc index f987e04..750169a 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_editor_view.cc +++ b/chrome/browser/ui/views/bookmarks/bookmark_editor_view.cc @@ -23,8 +23,8 @@ #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" -#include "ui/base/events/event.h" #include "ui/base/l10n/l10n_util.h" +#include "ui/events/event.h" #include "ui/views/background.h" #include "ui/views/controls/button/label_button.h" #include "ui/views/controls/label.h" diff --git a/chrome/browser/ui/views/bookmarks/bookmark_sync_promo_view_unittest.cc b/chrome/browser/ui/views/bookmarks/bookmark_sync_promo_view_unittest.cc index 02459bf..008c32c 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_sync_promo_view_unittest.cc +++ b/chrome/browser/ui/views/bookmarks/bookmark_sync_promo_view_unittest.cc @@ -9,7 +9,7 @@ #include "base/memory/scoped_ptr.h" #include "chrome/browser/ui/bookmarks/bookmark_bubble_delegate.h" #include "testing/gtest/include/gtest/gtest.h" -#include "ui/base/events/event_constants.h" +#include "ui/events/event_constants.h" #include "ui/gfx/range/range.h" class BookmarkSyncPromoViewTest : public BookmarkBubbleDelegate, diff --git a/chrome/browser/ui/views/browser_action_view.cc b/chrome/browser/ui/views/browser_action_view.cc index db1b228..75705c7 100644 --- a/chrome/browser/ui/views/browser_action_view.cc +++ b/chrome/browser/ui/views/browser_action_view.cc @@ -21,9 +21,9 @@ #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "ui/base/accessibility/accessible_view_state.h" -#include "ui/base/events/event.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" +#include "ui/events/event.h" #include "ui/gfx/image/image_skia.h" #include "ui/gfx/image/image_skia_operations.h" #include "ui/gfx/image/image_skia_source.h" diff --git a/chrome/browser/ui/views/crypto_module_password_dialog_view.cc b/chrome/browser/ui/views/crypto_module_password_dialog_view.cc index fd6ed47..086e6f6 100644 --- a/chrome/browser/ui/views/crypto_module_password_dialog_view.cc +++ b/chrome/browser/ui/views/crypto_module_password_dialog_view.cc @@ -6,8 +6,8 @@ #include "base/strings/utf_string_conversions.h" #include "grit/generated_resources.h" -#include "ui/base/events/event.h" #include "ui/base/l10n/l10n_util.h" +#include "ui/events/event.h" #include "ui/views/controls/button/text_button.h" #include "ui/views/controls/label.h" #include "ui/views/controls/textfield/textfield.h" diff --git a/chrome/browser/ui/views/download/download_item_view.cc b/chrome/browser/ui/views/download/download_item_view.cc index 0c04e52..a9d7832 100644 --- a/chrome/browser/ui/views/download/download_item_view.cc +++ b/chrome/browser/ui/views/download/download_item_view.cc @@ -32,10 +32,10 @@ #include "grit/theme_resources.h" #include "third_party/icu/source/common/unicode/uchar.h" #include "ui/base/accessibility/accessible_view_state.h" -#include "ui/base/events/event.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" #include "ui/base/theme_provider.h" +#include "ui/events/event.h" #include "ui/gfx/animation/slide_animation.h" #include "ui/gfx/canvas.h" #include "ui/gfx/color_utils.h" diff --git a/chrome/browser/ui/views/dropdown_bar_host_aura.cc b/chrome/browser/ui/views/dropdown_bar_host_aura.cc index 93ea611..3cd73d2 100644 --- a/chrome/browser/ui/views/dropdown_bar_host_aura.cc +++ b/chrome/browser/ui/views/dropdown_bar_host_aura.cc @@ -6,7 +6,7 @@ #include "base/logging.h" #include "ui/aura/window.h" -#include "ui/base/events/event.h" +#include "ui/events/event.h" #include "ui/views/view_constants_aura.h" #include "ui/views/widget/widget.h" diff --git a/chrome/browser/ui/views/dropdown_bar_host_win.cc b/chrome/browser/ui/views/dropdown_bar_host_win.cc index 76a2b1b..c7de7b2 100644 --- a/chrome/browser/ui/views/dropdown_bar_host_win.cc +++ b/chrome/browser/ui/views/dropdown_bar_host_win.cc @@ -9,7 +9,7 @@ #include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents_view.h" -#include "ui/base/events/event.h" +#include "ui/events/event.h" #include "ui/events/keycodes/keyboard_code_conversion_win.h" #include "ui/views/controls/scrollbar/native_scroll_bar.h" diff --git a/chrome/browser/ui/views/edit_search_engine_dialog.cc b/chrome/browser/ui/views/edit_search_engine_dialog.cc index 93cb343..67da85e 100644 --- a/chrome/browser/ui/views/edit_search_engine_dialog.cc +++ b/chrome/browser/ui/views/edit_search_engine_dialog.cc @@ -13,9 +13,9 @@ #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "grit/ui_resources.h" -#include "ui/base/events/event.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" +#include "ui/events/event.h" #include "ui/views/controls/image_view.h" #include "ui/views/controls/label.h" #include "ui/views/controls/textfield/textfield.h" diff --git a/chrome/browser/ui/views/event_utils.cc b/chrome/browser/ui/views/event_utils.cc index abfee6c..961f3f8 100644 --- a/chrome/browser/ui/views/event_utils.cc +++ b/chrome/browser/ui/views/event_utils.cc @@ -4,7 +4,7 @@ #include "chrome/browser/ui/views/event_utils.h" -#include "ui/base/events/event.h" +#include "ui/events/event.h" namespace event_utils { diff --git a/chrome/browser/ui/views/extensions/extension_view_views.cc b/chrome/browser/ui/views/extensions/extension_view_views.cc index b987bf5..62fe5ff 100644 --- a/chrome/browser/ui/views/extensions/extension_view_views.cc +++ b/chrome/browser/ui/views/extensions/extension_view_views.cc @@ -12,7 +12,7 @@ #include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents_view.h" #include "extensions/common/view_type.h" -#include "ui/base/events/event.h" +#include "ui/events/event.h" #include "ui/views/widget/widget.h" #if defined(USE_AURA) diff --git a/chrome/browser/ui/views/external_tab_container_win.cc b/chrome/browser/ui/views/external_tab_container_win.cc index 88c0474..5fc81f0 100644 --- a/chrome/browser/ui/views/external_tab_container_win.cc +++ b/chrome/browser/ui/views/external_tab_container_win.cc @@ -66,10 +66,10 @@ #include "grit/generated_resources.h" #include "grit/locale_settings.h" #include "third_party/WebKit/public/platform/WebReferrerPolicy.h" -#include "ui/base/events/event_utils.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/models/menu_model.h" #include "ui/base/view_prop.h" +#include "ui/events/event_utils.h" #include "ui/views/controls/webview/webview.h" #include "ui/views/layout/grid_layout.h" #include "ui/views/widget/widget.h" diff --git a/chrome/browser/ui/views/find_bar_host.cc b/chrome/browser/ui/views/find_bar_host.cc index 4207123..93342bf 100644 --- a/chrome/browser/ui/views/find_bar_host.cc +++ b/chrome/browser/ui/views/find_bar_host.cc @@ -14,7 +14,7 @@ #include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents_view.h" -#include "ui/base/events/event.h" +#include "ui/events/event.h" #include "ui/events/keycodes/keyboard_codes.h" #include "ui/views/focus/external_focus_tracker.h" #include "ui/views/focus/view_storage.h" diff --git a/chrome/browser/ui/views/find_bar_host_aura.cc b/chrome/browser/ui/views/find_bar_host_aura.cc index c3d37bd..9b92984 100644 --- a/chrome/browser/ui/views/find_bar_host_aura.cc +++ b/chrome/browser/ui/views/find_bar_host_aura.cc @@ -5,7 +5,7 @@ #include "chrome/browser/ui/views/find_bar_host.h" #include "base/logging.h" -#include "ui/base/events/event.h" +#include "ui/events/event.h" void FindBarHost::AudibleAlert() { #if defined(OS_WIN) diff --git a/chrome/browser/ui/views/find_bar_host_win.cc b/chrome/browser/ui/views/find_bar_host_win.cc index d7ea817a..74e340d 100644 --- a/chrome/browser/ui/views/find_bar_host_win.cc +++ b/chrome/browser/ui/views/find_bar_host_win.cc @@ -8,7 +8,7 @@ #include "chrome/browser/ui/views/frame/browser_view.h" #include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents_view.h" -#include "ui/base/events/event.h" +#include "ui/events/event.h" #include "ui/views/controls/scrollbar/native_scroll_bar.h" #include "ui/views/widget/widget.h" diff --git a/chrome/browser/ui/views/find_bar_view.cc b/chrome/browser/ui/views/find_bar_view.cc index 549bc2b..c297d87 100644 --- a/chrome/browser/ui/views/find_bar_view.cc +++ b/chrome/browser/ui/views/find_bar_view.cc @@ -23,10 +23,10 @@ #include "grit/theme_resources.h" #include "grit/ui_resources.h" #include "third_party/skia/include/effects/SkGradientShader.h" -#include "ui/base/events/event.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" #include "ui/base/theme_provider.h" +#include "ui/events/event.h" #include "ui/gfx/canvas.h" #include "ui/views/controls/button/image_button.h" #include "ui/views/controls/label.h" diff --git a/chrome/browser/ui/views/frame/browser_view.cc b/chrome/browser/ui/views/frame/browser_view.cc index bbd7822..3c48696 100644 --- a/chrome/browser/ui/views/frame/browser_view.cc +++ b/chrome/browser/ui/views/frame/browser_view.cc @@ -108,11 +108,11 @@ #include "grit/webkit_resources.h" #include "ui/base/accelerators/accelerator.h" #include "ui/base/accessibility/accessible_view_state.h" -#include "ui/base/events/event_utils.h" #include "ui/base/hit_test.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" #include "ui/base/theme_provider.h" +#include "ui/events/event_utils.h" #include "ui/gfx/canvas.h" #include "ui/gfx/color_utils.h" #include "ui/gfx/sys_color_change_listener.h" diff --git a/chrome/browser/ui/views/frame/immersive_mode_controller_ash.h b/chrome/browser/ui/views/frame/immersive_mode_controller_ash.h index 09ace22..a1f90cb 100644 --- a/chrome/browser/ui/views/frame/immersive_mode_controller_ash.h +++ b/chrome/browser/ui/views/frame/immersive_mode_controller_ash.h @@ -11,7 +11,7 @@ #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" #include "ui/aura/window_observer.h" -#include "ui/base/events/event_handler.h" +#include "ui/events/event_handler.h" #include "ui/gfx/animation/animation_delegate.h" #include "ui/gfx/rect.h" #include "ui/views/focus/focus_manager.h" diff --git a/chrome/browser/ui/views/frame/immersive_mode_controller_ash_browsertest.cc b/chrome/browser/ui/views/frame/immersive_mode_controller_ash_browsertest.cc index 450115c..f15af8a 100644 --- a/chrome/browser/ui/views/frame/immersive_mode_controller_ash_browsertest.cc +++ b/chrome/browser/ui/views/frame/immersive_mode_controller_ash_browsertest.cc @@ -29,9 +29,9 @@ #include "ui/aura/client/screen_position_client.h" #include "ui/aura/env.h" #include "ui/aura/root_window.h" -#include "ui/base/events/event.h" #include "ui/compositor/layer_animator.h" #include "ui/compositor/scoped_animation_duration_scale_mode.h" +#include "ui/events/event.h" #include "ui/gfx/rect.h" #include "ui/views/view.h" diff --git a/chrome/browser/ui/views/keyboard_access_browsertest.cc b/chrome/browser/ui/views/keyboard_access_browsertest.cc index e06dfbc..362c277 100644 --- a/chrome/browser/ui/views/keyboard_access_browsertest.cc +++ b/chrome/browser/ui/views/keyboard_access_browsertest.cc @@ -19,8 +19,8 @@ #include "chrome/test/base/in_process_browser_test.h" #include "chrome/test/base/interactive_test_utils.h" #include "chrome/test/base/ui_test_utils.h" -#include "ui/base/events/event_constants.h" #include "ui/base/test/ui_controls.h" +#include "ui/events/event_constants.h" #include "ui/events/keycodes/keyboard_codes.h" #include "ui/views/controls/menu/menu_listener.h" #include "ui/views/focus/focus_manager.h" diff --git a/chrome/browser/ui/views/location_bar/location_bar_decoration_view.cc b/chrome/browser/ui/views/location_bar/location_bar_decoration_view.cc index c0bf64c..67f87bf 100644 --- a/chrome/browser/ui/views/location_bar/location_bar_decoration_view.cc +++ b/chrome/browser/ui/views/location_bar/location_bar_decoration_view.cc @@ -5,7 +5,7 @@ #include "chrome/browser/ui/views/location_bar/location_bar_decoration_view.h" #include "chrome/browser/ui/views/location_bar/location_bar_view.h" -#include "ui/base/events/event.h" +#include "ui/events/event.h" LocationBarDecorationView::LocationBarDecorationView() : could_handle_click_(true) { diff --git a/chrome/browser/ui/views/location_bar/location_bar_view.cc b/chrome/browser/ui/views/location_bar/location_bar_view.cc index 05d5743..5022b44 100644 --- a/chrome/browser/ui/views/location_bar/location_bar_view.cc +++ b/chrome/browser/ui/views/location_bar/location_bar_view.cc @@ -64,11 +64,11 @@ #include "grit/theme_resources.h" #include "ui/base/accessibility/accessible_view_state.h" #include "ui/base/dragdrop/drag_drop_types.h" -#include "ui/base/events/event.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/layout.h" #include "ui/base/resource/resource_bundle.h" #include "ui/base/theme_provider.h" +#include "ui/events/event.h" #include "ui/gfx/canvas.h" #include "ui/gfx/color_utils.h" #include "ui/gfx/image/image.h" diff --git a/chrome/browser/ui/views/location_bar/page_action_image_view.cc b/chrome/browser/ui/views/location_bar/page_action_image_view.cc index aba4564..bd2d06b 100644 --- a/chrome/browser/ui/views/location_bar/page_action_image_view.cc +++ b/chrome/browser/ui/views/location_bar/page_action_image_view.cc @@ -23,7 +23,7 @@ #include "chrome/browser/ui/webui/extensions/extension_info_ui.h" #include "chrome/common/extensions/extension.h" #include "ui/base/accessibility/accessible_view_state.h" -#include "ui/base/events/event.h" +#include "ui/events/event.h" #include "ui/gfx/canvas.h" #include "ui/gfx/image/image.h" #include "ui/views/controls/menu/menu_item_view.h" diff --git a/chrome/browser/ui/views/location_bar/star_view.cc b/chrome/browser/ui/views/location_bar/star_view.cc index bb70241..e952661 100644 --- a/chrome/browser/ui/views/location_bar/star_view.cc +++ b/chrome/browser/ui/views/location_bar/star_view.cc @@ -15,9 +15,9 @@ #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "ui/base/accessibility/accessible_view_state.h" -#include "ui/base/events/event.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" +#include "ui/events/event.h" StarView::StarView(CommandUpdater* command_updater) : command_updater_(command_updater), diff --git a/chrome/browser/ui/views/location_bar/zoom_view.cc b/chrome/browser/ui/views/location_bar/zoom_view.cc index 0ed27fb..d0b1541 100644 --- a/chrome/browser/ui/views/location_bar/zoom_view.cc +++ b/chrome/browser/ui/views/location_bar/zoom_view.cc @@ -11,9 +11,9 @@ #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "ui/base/accessibility/accessible_view_state.h" -#include "ui/base/events/event.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" +#include "ui/events/event.h" #include "ui/gfx/size.h" ZoomView::ZoomView(LocationBarView::Delegate* location_bar_delegate) diff --git a/chrome/browser/ui/views/notifications/balloon_collection_views.cc b/chrome/browser/ui/views/notifications/balloon_collection_views.cc index 110fa34..8da6940 100644 --- a/chrome/browser/ui/views/notifications/balloon_collection_views.cc +++ b/chrome/browser/ui/views/notifications/balloon_collection_views.cc @@ -6,8 +6,8 @@ #include "chrome/browser/notifications/balloon.h" #include "chrome/browser/ui/views/notifications/balloon_view_views.h" -#include "ui/base/events/event_constants.h" -#include "ui/base/events/event_utils.h" +#include "ui/events/event_constants.h" +#include "ui/events/event_utils.h" #include "ui/gfx/rect.h" #include "ui/gfx/screen.h" diff --git a/chrome/browser/ui/views/omnibox/omnibox_view_views.cc b/chrome/browser/ui/views/omnibox/omnibox_view_views.cc index f4a5c85..bf56ecc 100644 --- a/chrome/browser/ui/views/omnibox/omnibox_view_views.cc +++ b/chrome/browser/ui/views/omnibox/omnibox_view_views.cc @@ -32,12 +32,12 @@ #include "ui/base/clipboard/scoped_clipboard_writer.h" #include "ui/base/dragdrop/drag_drop_types.h" #include "ui/base/dragdrop/os_exchange_data.h" -#include "ui/base/events/event.h" #include "ui/base/ime/text_input_client.h" #include "ui/base/ime/text_input_type.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/models/simple_menu_model.h" #include "ui/base/resource/resource_bundle.h" +#include "ui/events/event.h" #include "ui/gfx/canvas.h" #include "ui/gfx/font_list.h" #include "ui/gfx/selection_model.h" diff --git a/chrome/browser/ui/views/omnibox/omnibox_view_win.cc b/chrome/browser/ui/views/omnibox/omnibox_view_win.cc index 53cb06a..43bf0c7 100644 --- a/chrome/browser/ui/views/omnibox/omnibox_view_win.cc +++ b/chrome/browser/ui/views/omnibox/omnibox_view_win.cc @@ -54,8 +54,6 @@ #include "ui/base/dragdrop/drop_target_win.h" #include "ui/base/dragdrop/os_exchange_data.h" #include "ui/base/dragdrop/os_exchange_data_provider_win.h" -#include "ui/base/events/event.h" -#include "ui/base/events/event_constants.h" #include "ui/base/ime/win/tsf_bridge.h" #include "ui/base/ime/win/tsf_event_router.h" #include "ui/base/l10n/l10n_util.h" @@ -63,6 +61,8 @@ #include "ui/base/touch/touch_enabled.h" #include "ui/base/win/mouse_wheel_util.h" #include "ui/base/win/touch_input.h" +#include "ui/events/event.h" +#include "ui/events/event_constants.h" #include "ui/events/keycodes/keyboard_codes.h" #include "ui/gfx/canvas.h" #include "ui/gfx/image/image.h" diff --git a/chrome/browser/ui/views/tabs/tab_drag_controller.cc b/chrome/browser/ui/views/tabs/tab_drag_controller.cc index c54a233..69d15ed 100644 --- a/chrome/browser/ui/views/tabs/tab_drag_controller.cc +++ b/chrome/browser/ui/views/tabs/tab_drag_controller.cc @@ -36,9 +36,9 @@ #include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents_view.h" #include "grit/theme_resources.h" -#include "ui/base/events/event_constants.h" -#include "ui/base/events/event_utils.h" #include "ui/base/resource/resource_bundle.h" +#include "ui/events/event_constants.h" +#include "ui/events/event_utils.h" #include "ui/gfx/animation/animation.h" #include "ui/gfx/animation/animation_delegate.h" #include "ui/gfx/animation/slide_animation.h" |