diff options
252 files changed, 356 insertions, 557 deletions
diff --git a/chrome/browser/automation/automation_provider.h b/chrome/browser/automation/automation_provider.h index 583549e..3edda097 100644 --- a/chrome/browser/automation/automation_provider.h +++ b/chrome/browser/automation/automation_provider.h @@ -35,7 +35,7 @@ #if defined(OS_WIN) && !defined(USE_AURA) #include "ui/gfx/native_widget_types.h" -#include "views/events/event.h" +#include "ui/views/events/event.h" #endif // defined(OS_WIN) && !defined(USE_AURA) class TabContents; diff --git a/chrome/browser/automation/automation_provider_win.cc b/chrome/browser/automation/automation_provider_win.cc index 83395b7..4fa7a9c 100644 --- a/chrome/browser/automation/automation_provider_win.cc +++ b/chrome/browser/automation/automation_provider_win.cc @@ -26,7 +26,7 @@ #include "content/browser/tab_contents/tab_contents.h" #include "content/public/common/page_zoom.h" #include "ui/base/keycodes/keyboard_codes.h" -#include "views/focus/accelerator_handler.h" +#include "ui/views/focus/accelerator_handler.h" #include "views/widget/root_view.h" // This task just adds another task to the event queue. This is useful if diff --git a/chrome/browser/bookmarks/bookmark_drop_info.cc b/chrome/browser/bookmarks/bookmark_drop_info.cc index 0eacd2a..7c708ef 100644 --- a/chrome/browser/bookmarks/bookmark_drop_info.cc +++ b/chrome/browser/bookmarks/bookmark_drop_info.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -9,7 +9,7 @@ #endif #include "base/basictypes.h" -#include "views/events/event.h" +#include "ui/views/events/event.h" #include "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 380bcb1..b09d314 100644 --- a/chrome/browser/bookmarks/bookmark_utils.cc +++ b/chrome/browser/bookmarks/bookmark_utils.cc @@ -41,8 +41,8 @@ #if defined(TOOLKIT_VIEWS) #include "ui/base/dragdrop/os_exchange_data.h" +#include "ui/views/events/event.h" #include "views/drag_utils.h" -#include "views/events/event.h" #include "views/widget/native_widget.h" #include "views/widget/widget.h" #endif diff --git a/chrome/browser/browser_focus_uitest.cc b/chrome/browser/browser_focus_uitest.cc index cdb9431..0f4fdcc 100644 --- a/chrome/browser/browser_focus_uitest.cc +++ b/chrome/browser/browser_focus_uitest.cc @@ -8,8 +8,8 @@ #include "base/format_macros.h" #include "base/message_loop.h" #include "base/path_service.h" -#include "base/stringprintf.h" #include "base/string_number_conversions.h" +#include "base/stringprintf.h" #include "base/utf_string_conversions.h" #include "chrome/browser/tabs/tab_strip_model.h" #include "chrome/browser/ui/browser.h" @@ -19,19 +19,19 @@ #include "chrome/common/chrome_notification_types.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/url_constants.h" -#include "chrome/test/base/ui_test_utils.h" #include "chrome/test/base/in_process_browser_test.h" +#include "chrome/test/base/ui_test_utils.h" #include "content/browser/renderer_host/render_view_host.h" #include "content/browser/renderer_host/render_widget_host_view.h" #include "content/browser/tab_contents/interstitial_page.h" #include "content/browser/tab_contents/tab_contents.h" #include "content/browser/tab_contents/tab_contents_view.h" -#include "content/public/browser/notification_service.h" #include "content/common/view_messages.h" +#include "content/public/browser/notification_service.h" #include "net/test/test_server.h" #if defined(TOOLKIT_VIEWS) || defined(OS_WIN) -#include "views/focus/focus_manager.h" +#include "ui/views/focus/focus_manager.h" #include "views/view.h" #endif diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc index f04b165..b11de3d 100644 --- a/chrome/browser/browser_process_impl.cc +++ b/chrome/browser/browser_process_impl.cc @@ -89,7 +89,7 @@ #include "ui/base/l10n/l10n_util.h" #if defined(OS_WIN) -#include "views/focus/view_storage.h" +#include "ui/views/focus/view_storage.h" #elif defined(OS_MACOSX) #include "chrome/browser/chrome_browser_main_mac.h" #endif diff --git a/chrome/browser/chrome_browser_main.cc b/chrome/browser/chrome_browser_main.cc index ab2b807..95efc73 100644 --- a/chrome/browser/chrome_browser_main.cc +++ b/chrome/browser/chrome_browser_main.cc @@ -183,7 +183,7 @@ #endif #if defined(TOOLKIT_VIEWS) -#include "views/focus/accelerator_handler.h" +#include "ui/views/focus/accelerator_handler.h" #endif #if defined(TOOLKIT_USES_GTK) diff --git a/chrome/browser/chrome_browser_main_win.cc b/chrome/browser/chrome_browser_main_win.cc index 130cd41..16dd72a 100644 --- a/chrome/browser/chrome_browser_main_win.cc +++ b/chrome/browser/chrome_browser_main_win.cc @@ -40,7 +40,7 @@ #include "ui/base/l10n/l10n_util_win.h" #include "ui/base/message_box_win.h" #include "ui/gfx/platform_font_win.h" -#include "views/focus/accelerator_handler.h" +#include "ui/views/focus/accelerator_handler.h" #include "views/widget/widget.h" namespace { diff --git a/chrome/browser/chromeos/frame/panel_controller.cc b/chrome/browser/chromeos/frame/panel_controller.cc index 43bfcba..9fe7278 100644 --- a/chrome/browser/chromeos/frame/panel_controller.cc +++ b/chrome/browser/chromeos/frame/panel_controller.cc @@ -28,10 +28,10 @@ #include "third_party/skia/include/effects/SkGradientShader.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/canvas_skia.h" +#include "ui/views/events/event.h" #include "views/controls/button/image_button.h" #include "views/controls/image_view.h" #include "views/controls/label.h" -#include "views/events/event.h" #include "views/painter.h" #include "views/view.h" #include "views/widget/widget.h" diff --git a/chrome/browser/chromeos/input_method/candidate_window.cc b/chrome/browser/chromeos/input_method/candidate_window.cc index cc23bad..067b20b 100644 --- a/chrome/browser/chromeos/input_method/candidate_window.cc +++ b/chrome/browser/chromeos/input_method/candidate_window.cc @@ -23,12 +23,12 @@ #include "ui/gfx/canvas.h" #include "ui/gfx/font.h" #include "ui/gfx/screen.h" +#include "ui/views/events/event.h" +#include "ui/views/layout/fill_layout.h" +#include "ui/views/layout/grid_layout.h" #include "ui/views/window/non_client_view.h" #include "views/controls/label.h" #include "views/controls/textfield/textfield.h" -#include "views/events/event.h" -#include "views/layout/fill_layout.h" -#include "views/layout/grid_layout.h" #include "views/widget/widget.h" namespace chromeos { diff --git a/chrome/browser/chromeos/login/captcha_view.cc b/chrome/browser/chromeos/login/captcha_view.cc index 1a5f23b..9825daa 100644 --- a/chrome/browser/chromeos/login/captcha_view.cc +++ b/chrome/browser/chromeos/login/captcha_view.cc @@ -15,13 +15,13 @@ #include "grit/generated_resources.h" #include "grit/locale_settings.h" #include "ui/base/l10n/l10n_util.h" +#include "ui/views/layout/grid_layout.h" +#include "ui/views/layout/layout_constants.h" #include "views/background.h" #include "views/controls/button/text_button.h" #include "views/controls/image_view.h" #include "views/controls/label.h" #include "views/controls/textfield/textfield.h" -#include "views/layout/grid_layout.h" -#include "views/layout/layout_constants.h" #include "views/widget/widget.h" using views::Label; diff --git a/chrome/browser/chromeos/login/html_page_screen.cc b/chrome/browser/chromeos/login/html_page_screen.cc index f0d6d64..edd985b 100644 --- a/chrome/browser/chromeos/login/html_page_screen.cc +++ b/chrome/browser/chromeos/login/html_page_screen.cc @@ -16,7 +16,7 @@ #include "content/browser/site_instance.h" #include "content/browser/tab_contents/tab_contents.h" #include "googleurl/src/gurl.h" -#include "views/events/event.h" +#include "ui/views/events/event.h" namespace chromeos { diff --git a/chrome/browser/chromeos/login/message_bubble.cc b/chrome/browser/chromeos/login/message_bubble.cc index 3304705..8a42517 100644 --- a/chrome/browser/chromeos/login/message_bubble.cc +++ b/chrome/browser/chromeos/login/message_bubble.cc @@ -12,11 +12,11 @@ #include "grit/generated_resources.h" #include "grit/theme_resources_standard.h" #include "ui/base/resource/resource_bundle.h" +#include "ui/views/layout/grid_layout.h" #include "views/controls/button/image_button.h" #include "views/controls/image_view.h" #include "views/controls/label.h" #include "views/controls/link.h" -#include "views/layout/grid_layout.h" #include "views/widget/widget.h" namespace chromeos { diff --git a/chrome/browser/chromeos/login/password_changed_view.cc b/chrome/browser/chromeos/login/password_changed_view.cc index fdb6300..5b8c9cd 100644 --- a/chrome/browser/chromeos/login/password_changed_view.cc +++ b/chrome/browser/chromeos/login/password_changed_view.cc @@ -13,11 +13,11 @@ #include "ui/base/keycodes/keyboard_codes.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" +#include "ui/views/layout/grid_layout.h" +#include "ui/views/layout/layout_constants.h" #include "views/controls/button/radio_button.h" #include "views/controls/label.h" #include "views/controls/textfield/textfield.h" -#include "views/layout/grid_layout.h" -#include "views/layout/layout_constants.h" #include "views/widget/widget.h" using views::Button; diff --git a/chrome/browser/chromeos/login/screen_lock_view.cc b/chrome/browser/chromeos/login/screen_lock_view.cc index 3d110a4..da3b7bb 100644 --- a/chrome/browser/chromeos/login/screen_lock_view.cc +++ b/chrome/browser/chromeos/login/screen_lock_view.cc @@ -19,13 +19,13 @@ #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" +#include "ui/views/layout/grid_layout.h" #include "views/background.h" #include "views/border.h" #include "views/controls/image_view.h" #include "views/controls/label.h" #include "views/controls/textfield/native_textfield_wrapper.h" #include "views/controls/textfield/textfield.h" -#include "views/layout/grid_layout.h" #include "views/widget/native_widget_gtk.h" namespace chromeos { diff --git a/chrome/browser/chromeos/login/screen_locker_tester.cc b/chrome/browser/chromeos/login/screen_locker_tester.cc index 2043f84..0899001 100644 --- a/chrome/browser/chromeos/login/screen_locker_tester.cc +++ b/chrome/browser/chromeos/login/screen_locker_tester.cc @@ -12,10 +12,10 @@ #include "chrome/browser/chromeos/login/screen_lock_view.h" #include "chrome/browser/chromeos/login/screen_locker.h" #include "chrome/browser/chromeos/login/screen_locker_views.h" +#include "ui/views/events/event.h" #include "views/controls/button/button.h" #include "views/controls/label.h" #include "views/controls/textfield/textfield.h" -#include "views/events/event.h" #include "views/widget/root_view.h" namespace chromeos { diff --git a/chrome/browser/chromeos/login/take_photo_view.cc b/chrome/browser/chromeos/login/take_photo_view.cc index 1046472..29925cf 100644 --- a/chrome/browser/chromeos/login/take_photo_view.cc +++ b/chrome/browser/chromeos/login/take_photo_view.cc @@ -12,13 +12,13 @@ #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/canvas.h" +#include "ui/views/layout/grid_layout.h" #include "views/background.h" #include "views/border.h" #include "views/controls/button/image_button.h" #include "views/controls/image_view.h" #include "views/controls/label.h" #include "views/controls/throbber.h" -#include "views/layout/grid_layout.h" namespace { diff --git a/chrome/browser/chromeos/options/network_config_view.cc b/chrome/browser/chromeos/options/network_config_view.cc index fbd2e1d..63c15f1 100644 --- a/chrome/browser/chromeos/options/network_config_view.cc +++ b/chrome/browser/chromeos/options/network_config_view.cc @@ -16,9 +16,9 @@ #include "ui/base/accessibility/accessible_view_state.h" #include "ui/base/l10n/l10n_util.h" #include "ui/gfx/rect.h" +#include "ui/views/layout/grid_layout.h" +#include "ui/views/layout/layout_constants.h" #include "views/controls/button/text_button.h" -#include "views/layout/grid_layout.h" -#include "views/layout/layout_constants.h" #include "views/widget/widget.h" namespace chromeos { diff --git a/chrome/browser/chromeos/options/take_photo_dialog.cc b/chrome/browser/chromeos/options/take_photo_dialog.cc index 24d3919..01a2379 100644 --- a/chrome/browser/chromeos/options/take_photo_dialog.cc +++ b/chrome/browser/chromeos/options/take_photo_dialog.cc @@ -14,7 +14,7 @@ #include "grit/locale_settings.h" #include "ui/base/accessibility/accessible_view_state.h" #include "ui/base/l10n/l10n_util.h" -#include "views/layout/layout_constants.h" +#include "ui/views/layout/layout_constants.h" namespace chromeos { diff --git a/chrome/browser/chromeos/options/vpn_config_view.cc b/chrome/browser/chromeos/options/vpn_config_view.cc index 376017d..5ef0a24 100644 --- a/chrome/browser/chromeos/options/vpn_config_view.cc +++ b/chrome/browser/chromeos/options/vpn_config_view.cc @@ -17,10 +17,10 @@ #include "ui/base/l10n/l10n_util.h" #include "ui/base/models/combobox_model.h" #include "ui/base/resource/resource_bundle.h" +#include "ui/views/layout/grid_layout.h" +#include "ui/views/layout/layout_constants.h" #include "views/controls/label.h" #include "views/controls/textfield/textfield.h" -#include "views/layout/grid_layout.h" -#include "views/layout/layout_constants.h" namespace { diff --git a/chrome/browser/chromeos/options/wifi_config_view.cc b/chrome/browser/chromeos/options/wifi_config_view.cc index 4c68acd..f64b13e 100644 --- a/chrome/browser/chromeos/options/wifi_config_view.cc +++ b/chrome/browser/chromeos/options/wifi_config_view.cc @@ -15,12 +15,12 @@ #include "grit/theme_resources.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" +#include "ui/views/layout/grid_layout.h" +#include "ui/views/layout/layout_constants.h" #include "views/controls/button/checkbox.h" #include "views/controls/button/image_button.h" #include "views/controls/label.h" #include "views/controls/textfield/textfield.h" -#include "views/layout/grid_layout.h" -#include "views/layout/layout_constants.h" namespace chromeos { diff --git a/chrome/browser/chromeos/setting_level_bubble.cc b/chrome/browser/chromeos/setting_level_bubble.cc index 3251a64..f1052c5 100644 --- a/chrome/browser/chromeos/setting_level_bubble.cc +++ b/chrome/browser/chromeos/setting_level_bubble.cc @@ -8,8 +8,8 @@ #include "chrome/browser/chromeos/login/background_view.h" #include "chrome/browser/chromeos/login/base_login_display_host.h" -#include "chrome/browser/chromeos/login/login_utils.h" #include "chrome/browser/chromeos/login/login_display_host.h" +#include "chrome/browser/chromeos/login/login_utils.h" #include "chrome/browser/chromeos/login/webui_login_display.h" #include "chrome/browser/chromeos/setting_level_bubble_view.h" #include "chrome/browser/profiles/profile_manager.h" @@ -17,8 +17,8 @@ #include "chrome/browser/ui/browser_list.h" #include "chrome/browser/ui/browser_window.h" #include "ui/gfx/screen.h" -#include "views/bubble/bubble_delegate.h" -#include "views/layout/fill_layout.h" +#include "ui/views/bubble/bubble_delegate.h" +#include "ui/views/layout/fill_layout.h" #include "views/widget/root_view.h" #if !defined(USE_AURA) diff --git a/chrome/browser/chromeos/setting_level_bubble.h b/chrome/browser/chromeos/setting_level_bubble.h index 11005d9..5e0861b 100644 --- a/chrome/browser/chromeos/setting_level_bubble.h +++ b/chrome/browser/chromeos/setting_level_bubble.h @@ -10,7 +10,7 @@ #include "base/gtest_prod_util.h" #include "base/time.h" #include "base/timer.h" -#include "views/bubble/bubble_delegate.h" +#include "ui/views/bubble/bubble_delegate.h" #include "views/widget/widget.h" class SkBitmap; diff --git a/chrome/browser/chromeos/status/status_area_bubble.cc b/chrome/browser/chromeos/status/status_area_bubble.cc index 1d6f3dc..98626e7 100644 --- a/chrome/browser/chromeos/status/status_area_bubble.cc +++ b/chrome/browser/chromeos/status/status_area_bubble.cc @@ -4,10 +4,10 @@ #include "chrome/browser/chromeos/status/status_area_bubble.h" -#include "views/controls/label.h" -#include "views/layout/box_layout.h" -#include "views/layout/fill_layout.h" #include "ui/base/accessibility/accessible_view_state.h" +#include "ui/views/layout/box_layout.h" +#include "ui/views/layout/fill_layout.h" +#include "views/controls/label.h" namespace chromeos { diff --git a/chrome/browser/extensions/extension_browser_event_router.h b/chrome/browser/extensions/extension_browser_event_router.h index 12417f9..ce3937b 100644 --- a/chrome/browser/extensions/extension_browser_event_router.h +++ b/chrome/browser/extensions/extension_browser_event_router.h @@ -16,7 +16,7 @@ #include "chrome/browser/ui/browser_list.h" #include "content/public/browser/notification_registrar.h" #if defined(TOOLKIT_VIEWS) -#include "views/focus/widget_focus_manager.h" +#include "ui/views/focus/widget_focus_manager.h" #elif defined(TOOLKIT_GTK) #include "ui/base/x/active_window_watcher_x.h" #endif diff --git a/chrome/browser/extensions/extension_input_api.cc b/chrome/browser/extensions/extension_input_api.cc index 8e2c7ee..fe231d8 100644 --- a/chrome/browser/extensions/extension_input_api.cc +++ b/chrome/browser/extensions/extension_input_api.cc @@ -14,8 +14,8 @@ #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/views/events/event.h" #include "ui/views/ime/input_method.h" -#include "views/events/event.h" #include "views/views_delegate.h" #include "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 23f9375..c471f38 100644 --- a/chrome/browser/extensions/key_identifier_conversion_views.cc +++ b/chrome/browser/extensions/key_identifier_conversion_views.cc @@ -10,7 +10,7 @@ #include "base/hash_tables.h" #include "content/public/browser/browser_thread.h" #include "ui/base/keycodes/keyboard_codes.h" -#include "views/events/event.h" +#include "ui/views/events/event.h" using content::BrowserThread; diff --git a/chrome/browser/extensions/key_identifier_conversion_views.h b/chrome/browser/extensions/key_identifier_conversion_views.h index 51d6171..c3e2dd8 100644 --- a/chrome/browser/extensions/key_identifier_conversion_views.h +++ b/chrome/browser/extensions/key_identifier_conversion_views.h @@ -7,7 +7,7 @@ #pragma once #include "ui/base/keycodes/keyboard_codes.h" -#include "views/events/event.h" +#include "ui/views/events/event.h" #include <string> diff --git a/chrome/browser/external_tab_container_win.cc b/chrome/browser/external_tab_container_win.cc index 7dd57ae..bd33525 100644 --- a/chrome/browser/external_tab_container_win.cc +++ b/chrome/browser/external_tab_container_win.cc @@ -17,8 +17,8 @@ #include "chrome/browser/automation/automation_provider.h" #include "chrome/browser/debugger/devtools_toggle_action.h" #include "chrome/browser/debugger/devtools_window.h" -#include "chrome/browser/history/history_types.h" #include "chrome/browser/history/history_tab_helper.h" +#include "chrome/browser/history/history_types.h" #include "chrome/browser/infobars/infobar_tab_helper.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/app_modal_dialogs/message_box_handler.h" @@ -40,19 +40,19 @@ #include "content/browser/renderer_host/resource_dispatcher_host_request_info.h" #include "content/browser/tab_contents/navigation_details.h" #include "content/browser/tab_contents/provisional_load_details.h" -#include "content/public/browser/notification_service.h" #include "content/common/view_messages.h" #include "content/public/browser/native_web_keyboard_event.h" +#include "content/public/browser/notification_service.h" #include "content/public/common/bindings_policy.h" #include "content/public/common/page_transition_types.h" #include "content/public/common/page_zoom.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" #include "ui/base/l10n/l10n_util.h" +#include "ui/base/models/menu_model.h" #include "ui/base/resource/resource_bundle.h" #include "ui/base/view_prop.h" -#include "ui/base/models/menu_model.h" -#include "views/layout/grid_layout.h" +#include "ui/views/layout/grid_layout.h" using content::BrowserThread; using ui::ViewProp; diff --git a/chrome/browser/first_run/try_chrome_dialog_view.cc b/chrome/browser/first_run/try_chrome_dialog_view.cc index db9757a..c9f76bd 100644 --- a/chrome/browser/first_run/try_chrome_dialog_view.cc +++ b/chrome/browser/first_run/try_chrome_dialog_view.cc @@ -18,13 +18,13 @@ #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/image/image.h" +#include "ui/views/layout/grid_layout.h" +#include "ui/views/layout/layout_constants.h" #include "views/controls/button/image_button.h" #include "views/controls/button/radio_button.h" #include "views/controls/button/text_button.h" #include "views/controls/image_view.h" #include "views/controls/link.h" -#include "views/layout/grid_layout.h" -#include "views/layout/layout_constants.h" #include "views/widget/widget.h" namespace { diff --git a/chrome/browser/instant/instant_controller.cc b/chrome/browser/instant/instant_controller.cc index 8a84e05..c879b1d 100644 --- a/chrome/browser/instant/instant_controller.cc +++ b/chrome/browser/instant/instant_controller.cc @@ -30,7 +30,7 @@ #include "content/public/browser/notification_service.h" #if defined(TOOLKIT_VIEWS) -#include "views/focus/focus_manager.h" +#include "ui/views/focus/focus_manager.h" #include "views/view.h" #include "views/widget/widget.h" #endif diff --git a/chrome/browser/renderer_host/render_widget_host_view_views.cc b/chrome/browser/renderer_host/render_widget_host_view_views.cc index 0026c31..3a82310 100644 --- a/chrome/browser/renderer_host/render_widget_host_view_views.cc +++ b/chrome/browser/renderer_host/render_widget_host_view_views.cc @@ -31,8 +31,8 @@ #include "ui/base/text/text_elider.h" #include "ui/gfx/canvas.h" #include "ui/gfx/canvas_skia.h" +#include "ui/views/events/event.h" #include "ui/views/ime/input_method.h" -#include "views/events/event.h" #include "views/views_delegate.h" #include "views/widget/tooltip_manager.h" #include "views/widget/widget.h" diff --git a/chrome/browser/renderer_host/render_widget_host_view_views.h b/chrome/browser/renderer_host/render_widget_host_view_views.h index 083e2ae..d3f400d 100644 --- a/chrome/browser/renderer_host/render_widget_host_view_views.h +++ b/chrome/browser/renderer_host/render_widget_host_view_views.h @@ -22,9 +22,9 @@ #include "ui/base/ime/text_input_client.h" #include "ui/gfx/compositor/compositor_observer.h" #include "ui/gfx/native_widget_types.h" +#include "ui/views/events/event.h" #include "ui/views/touchui/touch_selection_controller.h" #include "views/controls/native/native_view_host.h" -#include "views/events/event.h" #include "views/view.h" #include "webkit/glue/webcursor.h" diff --git a/chrome/browser/speech/speech_input_bubble_views.cc b/chrome/browser/speech/speech_input_bubble_views.cc index 3f804d8..9f02ed1 100644 --- a/chrome/browser/speech/speech_input_bubble_views.cc +++ b/chrome/browser/speech/speech_input_bubble_views.cc @@ -18,13 +18,13 @@ #include "media/audio/audio_manager.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" -#include "views/bubble/bubble_delegate.h" +#include "ui/views/bubble/bubble_delegate.h" +#include "ui/views/layout/layout_constants.h" #include "views/controls/button/text_button.h" #include "views/controls/image_view.h" #include "views/controls/label.h" #include "views/controls/link.h" #include "views/controls/link_listener.h" -#include "views/layout/layout_constants.h" namespace { diff --git a/chrome/browser/ui/find_bar/find_bar_host_browsertest.cc b/chrome/browser/ui/find_bar/find_bar_host_browsertest.cc index a849184..2294daa 100644 --- a/chrome/browser/ui/find_bar/find_bar_host_browsertest.cc +++ b/chrome/browser/ui/find_bar/find_bar_host_browsertest.cc @@ -29,7 +29,7 @@ #if defined(TOOLKIT_VIEWS) #include "chrome/browser/ui/views/find_bar_host.h" -#include "views/focus/focus_manager.h" +#include "ui/views/focus/focus_manager.h" #include "views/widget/widget.h" #elif defined(TOOLKIT_GTK) #include "chrome/browser/ui/gtk/slide_animator_gtk.h" diff --git a/chrome/browser/ui/gtk/omnibox/omnibox_view_gtk.cc b/chrome/browser/ui/gtk/omnibox/omnibox_view_gtk.cc index a1e6c4a..6ea2a4a 100644 --- a/chrome/browser/ui/gtk/omnibox/omnibox_view_gtk.cc +++ b/chrome/browser/ui/gtk/omnibox/omnibox_view_gtk.cc @@ -48,8 +48,8 @@ #include "chrome/browser/ui/views/autocomplete/autocomplete_popup_contents_view.h" #include "chrome/browser/ui/views/location_bar/location_bar_view.h" #include "chrome/browser/ui/views/omnibox/omnibox_view_views.h" +#include "ui/views/events/event.h" #include "views/controls/textfield/native_textfield_views.h" -#include "views/events/event.h" #else #include "chrome/browser/ui/gtk/gtk_theme_service.h" #include "chrome/browser/ui/gtk/location_bar_view_gtk.h" diff --git a/chrome/browser/ui/input_window_dialog_win.cc b/chrome/browser/ui/input_window_dialog_win.cc index 5b6f294..8e6ebbb 100644 --- a/chrome/browser/ui/input_window_dialog_win.cc +++ b/chrome/browser/ui/input_window_dialog_win.cc @@ -13,12 +13,12 @@ #include "chrome/browser/ui/webui/input_window_dialog_webui.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" +#include "ui/views/layout/grid_layout.h" +#include "ui/views/layout/layout_constants.h" #include "ui/views/window/dialog_delegate.h" #include "views/controls/label.h" #include "views/controls/textfield/textfield.h" #include "views/controls/textfield/textfield_controller.h" -#include "views/layout/grid_layout.h" -#include "views/layout/layout_constants.h" #include "views/widget/widget.h" namespace { diff --git a/chrome/browser/ui/omnibox/omnibox_view_browsertest.cc b/chrome/browser/ui/omnibox/omnibox_view_browsertest.cc index dcd8a1e..d88b6ba 100644 --- a/chrome/browser/ui/omnibox/omnibox_view_browsertest.cc +++ b/chrome/browser/ui/omnibox/omnibox_view_browsertest.cc @@ -43,8 +43,8 @@ #endif #if defined(TOOLKIT_VIEWS) +#include "ui/views/events/event.h" #include "views/controls/textfield/native_textfield_views.h" -#include "views/events/event.h" #include "views/widget/widget.h" #endif diff --git a/chrome/browser/ui/views/about_chrome_view.cc b/chrome/browser/ui/views/about_chrome_view.cc index 48201d9..7c29add 100644 --- a/chrome/browser/ui/views/about_chrome_view.cc +++ b/chrome/browser/ui/views/about_chrome_view.cc @@ -34,11 +34,11 @@ #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/canvas.h" #include "ui/gfx/color_utils.h" +#include "ui/views/layout/layout_constants.h" #include "views/controls/button/text_button.h" #include "views/controls/link.h" #include "views/controls/textfield/textfield.h" #include "views/controls/throbber.h" -#include "views/layout/layout_constants.h" #include "views/view_text_utils.h" #include "views/widget/widget.h" #include "webkit/glue/webkit_glue.h" diff --git a/chrome/browser/ui/views/about_ipc_dialog.cc b/chrome/browser/ui/views/about_ipc_dialog.cc index 0d8165e..669893b 100644 --- a/chrome/browser/ui/views/about_ipc_dialog.cc +++ b/chrome/browser/ui/views/about_ipc_dialog.cc @@ -30,10 +30,10 @@ #include "content/public/browser/content_ipc_logging.h" #include "net/url_request/url_request.h" #include "net/url_request/url_request_job.h" +#include "ui/views/layout/grid_layout.h" +#include "ui/views/layout/layout_constants.h" #include "views/controls/button/text_button.h" #include "views/controls/native/native_view_host.h" -#include "views/layout/grid_layout.h" -#include "views/layout/layout_constants.h" #include "views/widget/widget.h" namespace { diff --git a/chrome/browser/ui/views/accessibility_event_router_views_unittest.cc b/chrome/browser/ui/views/accessibility_event_router_views_unittest.cc index 450bb87..e80c3c1 100644 --- a/chrome/browser/ui/views/accessibility_event_router_views_unittest.cc +++ b/chrome/browser/ui/views/accessibility_event_router_views_unittest.cc @@ -14,8 +14,8 @@ #include "content/public/browser/notification_registrar.h" #include "content/public/browser/notification_service.h" #include "testing/gtest/include/gtest/gtest.h" +#include "ui/views/layout/grid_layout.h" #include "views/controls/button/text_button.h" -#include "views/layout/grid_layout.h" #include "views/views_delegate.h" #include "views/widget/native_widget.h" #include "views/widget/root_view.h" diff --git a/chrome/browser/ui/views/autocomplete/autocomplete_popup_contents_view.cc b/chrome/browser/ui/views/autocomplete/autocomplete_popup_contents_view.cc index 2cfbe68..3d20eb3 100644 --- a/chrome/browser/ui/views/autocomplete/autocomplete_popup_contents_view.cc +++ b/chrome/browser/ui/views/autocomplete/autocomplete_popup_contents_view.cc @@ -29,12 +29,12 @@ #include "ui/gfx/canvas_skia.h" #include "ui/gfx/insets.h" #include "ui/gfx/path.h" +#include "ui/views/bubble/bubble_border.h" +#include "ui/views/layout/grid_layout.h" +#include "ui/views/layout/layout_constants.h" #include "unicode/ubidi.h" -#include "views/bubble/bubble_border.h" #include "views/controls/button/text_button.h" #include "views/controls/label.h" -#include "views/layout/grid_layout.h" -#include "views/layout/layout_constants.h" #include "views/painter.h" #include "views/widget/widget.h" diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc b/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc index dbf0d14..35cdd17 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc +++ b/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc @@ -22,13 +22,13 @@ #include "ui/base/keycodes/keyboard_codes.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" +#include "ui/views/events/event.h" +#include "ui/views/layout/grid_layout.h" +#include "ui/views/layout/layout_constants.h" #include "views/controls/button/text_button.h" #include "views/controls/label.h" #include "views/controls/link.h" #include "views/controls/textfield/textfield.h" -#include "views/events/event.h" -#include "views/layout/grid_layout.h" -#include "views/layout/layout_constants.h" #include "views/widget/widget.h" using views::ColumnSet; diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.h b/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.h index a699e79..7a7d20b 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.h +++ b/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.h @@ -9,7 +9,7 @@ #include "base/string16.h" #include "chrome/browser/bookmarks/recently_used_folders_combo_model.h" #include "googleurl/src/gurl.h" -#include "views/bubble/bubble_delegate.h" +#include "ui/views/bubble/bubble_delegate.h" #include "views/controls/button/button.h" #include "views/controls/combobox/combobox.h" #include "views/controls/link_listener.h" diff --git a/chrome/browser/ui/views/bookmarks/bookmark_editor_view.cc b/chrome/browser/ui/views/bookmarks/bookmark_editor_view.cc index 1ad3e7e..44087be 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_editor_view.cc +++ b/chrome/browser/ui/views/bookmarks/bookmark_editor_view.cc @@ -23,14 +23,14 @@ #include "grit/locale_settings.h" #include "net/base/net_util.h" #include "ui/base/l10n/l10n_util.h" +#include "ui/views/focus/focus_manager.h" +#include "ui/views/layout/grid_layout.h" +#include "ui/views/layout/layout_constants.h" #include "views/background.h" #include "views/controls/button/text_button.h" #include "views/controls/label.h" #include "views/controls/menu/menu_2.h" #include "views/controls/textfield/textfield.h" -#include "views/focus/focus_manager.h" -#include "views/layout/grid_layout.h" -#include "views/layout/layout_constants.h" #include "views/widget/widget.h" using views::GridLayout; diff --git a/chrome/browser/ui/views/browser_bubble.h b/chrome/browser/ui/views/browser_bubble.h index a28f221..e563572 100644 --- a/chrome/browser/ui/views/browser_bubble.h +++ b/chrome/browser/ui/views/browser_bubble.h @@ -6,7 +6,7 @@ #define CHROME_BROWSER_UI_VIEWS_BROWSER_BUBBLE_H_ #pragma once -#include "views/bubble/bubble_border.h" +#include "ui/views/bubble/bubble_border.h" #include "views/view.h" #include "views/widget/widget.h" diff --git a/chrome/browser/ui/views/bubble/border_contents.h b/chrome/browser/ui/views/bubble/border_contents.h index 52ae4902..83db0a2 100644 --- a/chrome/browser/ui/views/bubble/border_contents.h +++ b/chrome/browser/ui/views/bubble/border_contents.h @@ -6,7 +6,7 @@ #define CHROME_BROWSER_UI_VIEWS_BUBBLE_BORDER_CONTENTS_H_ #pragma once -#include "views/bubble/border_contents_view.h" +#include "ui/views/bubble/border_contents_view.h" // This is used to paint the border of the Bubble. Windows uses this via // BorderWidgetWin, while others can use it directly in the bubble. diff --git a/chrome/browser/ui/views/bubble/border_widget_win.h b/chrome/browser/ui/views/bubble/border_widget_win.h index 6faff35..ba75fb0 100644 --- a/chrome/browser/ui/views/bubble/border_widget_win.h +++ b/chrome/browser/ui/views/bubble/border_widget_win.h @@ -6,7 +6,7 @@ #define CHROME_BROWSER_UI_VIEWS_BUBBLE_BORDER_WIDGET_WIN_H_ #pragma once -#include "views/bubble/bubble_border.h" +#include "ui/views/bubble/bubble_border.h" #include "views/widget/native_widget_win.h" class BorderContents; diff --git a/chrome/browser/ui/views/bubble/bubble.cc b/chrome/browser/ui/views/bubble/bubble.cc index 43b68aa..f75d657 100644 --- a/chrome/browser/ui/views/bubble/bubble.cc +++ b/chrome/browser/ui/views/bubble/bubble.cc @@ -11,8 +11,8 @@ #include "ui/base/animation/slide_animation.h" #include "ui/base/keycodes/keyboard_codes.h" #include "ui/gfx/color_utils.h" +#include "ui/views/layout/fill_layout.h" #include "ui/views/window/client_view.h" -#include "views/layout/fill_layout.h" #include "views/widget/widget.h" #if defined(OS_CHROMEOS) && defined(TOOLKIT_USES_GTK) diff --git a/chrome/browser/ui/views/bubble/bubble.h b/chrome/browser/ui/views/bubble/bubble.h index f62d8fa..8a56781 100644 --- a/chrome/browser/ui/views/bubble/bubble.h +++ b/chrome/browser/ui/views/bubble/bubble.h @@ -7,9 +7,9 @@ #pragma once #include "base/observer_list.h" -#include "views/bubble/bubble_border.h" #include "ui/base/animation/animation_delegate.h" #include "ui/base/models/accelerator.h" +#include "ui/views/bubble/bubble_border.h" #include "views/view.h" #if defined(USE_AURA) diff --git a/chrome/browser/ui/views/collected_cookies_win.cc b/chrome/browser/ui/views/collected_cookies_win.cc index e50d38b..221c2e1 100644 --- a/chrome/browser/ui/views/collected_cookies_win.cc +++ b/chrome/browser/ui/views/collected_cookies_win.cc @@ -25,13 +25,13 @@ #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/color_utils.h" +#include "ui/views/layout/box_layout.h" +#include "ui/views/layout/grid_layout.h" +#include "ui/views/layout/layout_constants.h" #include "views/controls/button/text_button.h" #include "views/controls/image_view.h" #include "views/controls/label.h" #include "views/controls/tabbed_pane/tabbed_pane.h" -#include "views/layout/box_layout.h" -#include "views/layout/grid_layout.h" -#include "views/layout/layout_constants.h" #include "views/widget/widget.h" namespace browser { diff --git a/chrome/browser/ui/views/confirm_bubble_view.cc b/chrome/browser/ui/views/confirm_bubble_view.cc index 110938d..ca4789e 100644 --- a/chrome/browser/ui/views/confirm_bubble_view.cc +++ b/chrome/browser/ui/views/confirm_bubble_view.cc @@ -8,13 +8,13 @@ #include "grit/theme_resources.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/image/image.h" +#include "ui/views/layout/grid_layout.h" +#include "ui/views/layout/layout_constants.h" #include "views/controls/button/image_button.h" #include "views/controls/button/text_button.h" #include "views/controls/image_view.h" #include "views/controls/label.h" #include "views/controls/link.h" -#include "views/layout/grid_layout.h" -#include "views/layout/layout_constants.h" namespace { diff --git a/chrome/browser/ui/views/constrained_window_views.cc b/chrome/browser/ui/views/constrained_window_views.cc index c9b9037..584c7f8 100644 --- a/chrome/browser/ui/views/constrained_window_views.cc +++ b/chrome/browser/ui/views/constrained_window_views.cc @@ -31,12 +31,12 @@ #include "ui/gfx/font.h" #include "ui/gfx/path.h" #include "ui/gfx/rect.h" +#include "ui/views/focus/focus_manager.h" #include "ui/views/window/client_view.h" #include "ui/views/window/non_client_view.h" #include "ui/views/window/window_resources.h" #include "ui/views/window/window_shape.h" #include "views/controls/button/image_button.h" -#include "views/focus/focus_manager.h" #include "views/views_delegate.h" #include "views/widget/widget.h" diff --git a/chrome/browser/ui/views/constrained_window_views_browsertest.cc b/chrome/browser/ui/views/constrained_window_views_browsertest.cc index 0d5c549..9a08011 100644 --- a/chrome/browser/ui/views/constrained_window_views_browsertest.cc +++ b/chrome/browser/ui/views/constrained_window_views_browsertest.cc @@ -10,10 +10,10 @@ #include "chrome/test/base/in_process_browser_test.h" #include "chrome/test/base/ui_test_utils.h" #include "ui/base/models/accelerator.h" +#include "ui/views/focus/focus_manager.h" +#include "ui/views/layout/fill_layout.h" #include "ui/views/window/dialog_delegate.h" #include "views/controls/textfield/textfield.h" -#include "views/focus/focus_manager.h" -#include "views/layout/fill_layout.h" namespace { diff --git a/chrome/browser/ui/views/content_setting_bubble_contents.cc b/chrome/browser/ui/views/content_setting_bubble_contents.cc index a9e327b..56b4687 100644 --- a/chrome/browser/ui/views/content_setting_bubble_contents.cc +++ b/chrome/browser/ui/views/content_setting_bubble_contents.cc @@ -25,14 +25,14 @@ #include "content/public/browser/notification_types.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" +#include "ui/views/layout/grid_layout.h" +#include "ui/views/layout/layout_constants.h" #include "views/controls/button/radio_button.h" #include "views/controls/button/text_button.h" #include "views/controls/image_view.h" #include "views/controls/label.h" #include "views/controls/link.h" #include "views/controls/separator.h" -#include "views/layout/grid_layout.h" -#include "views/layout/layout_constants.h" #if defined(TOOLKIT_USES_GTK) #include "ui/gfx/gtk_util.h" diff --git a/chrome/browser/ui/views/cookie_info_view.cc b/chrome/browser/ui/views/cookie_info_view.cc index 7e5f5e8..6d88b9c 100644 --- a/chrome/browser/ui/views/cookie_info_view.cc +++ b/chrome/browser/ui/views/cookie_info_view.cc @@ -17,12 +17,12 @@ #include "ui/base/l10n/l10n_util.h" #include "ui/gfx/canvas.h" #include "ui/gfx/color_utils.h" +#include "ui/views/layout/grid_layout.h" +#include "ui/views/layout/layout_constants.h" #include "views/border.h" #include "views/controls/label.h" -#include "views/controls/tree/tree_view.h" #include "views/controls/textfield/textfield.h" -#include "views/layout/grid_layout.h" -#include "views/layout/layout_constants.h" +#include "views/controls/tree/tree_view.h" static const int kCookieInfoViewBorderSize = 1; static const int kCookieInfoViewInsetSize = 3; diff --git a/chrome/browser/ui/views/create_application_shortcut_view.cc b/chrome/browser/ui/views/create_application_shortcut_view.cc index 86efb87..f7de50a 100644 --- a/chrome/browser/ui/views/create_application_shortcut_view.cc +++ b/chrome/browser/ui/views/create_application_shortcut_view.cc @@ -34,11 +34,11 @@ #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/canvas_skia.h" #include "ui/gfx/codec/png_codec.h" +#include "ui/views/layout/grid_layout.h" +#include "ui/views/layout/layout_constants.h" #include "views/controls/button/checkbox.h" #include "views/controls/image_view.h" #include "views/controls/label.h" -#include "views/layout/grid_layout.h" -#include "views/layout/layout_constants.h" #include "views/widget/widget.h" namespace { diff --git a/chrome/browser/ui/views/critical_notification_bubble_view.cc b/chrome/browser/ui/views/critical_notification_bubble_view.cc index f95ad63..0f4f2ba 100644 --- a/chrome/browser/ui/views/critical_notification_bubble_view.cc +++ b/chrome/browser/ui/views/critical_notification_bubble_view.cc @@ -19,11 +19,11 @@ #include "ui/base/l10n/l10n_util.h" #include "ui/base/models/accelerator.h" #include "ui/base/resource/resource_bundle.h" +#include "ui/views/layout/grid_layout.h" +#include "ui/views/layout/layout_constants.h" #include "views/controls/button/text_button.h" #include "views/controls/image_view.h" #include "views/controls/label.h" -#include "views/layout/grid_layout.h" -#include "views/layout/layout_constants.h" #include "views/widget/widget.h" namespace { diff --git a/chrome/browser/ui/views/critical_notification_bubble_view.h b/chrome/browser/ui/views/critical_notification_bubble_view.h index 7ba4300..d6421ad 100644 --- a/chrome/browser/ui/views/critical_notification_bubble_view.h +++ b/chrome/browser/ui/views/critical_notification_bubble_view.h @@ -7,8 +7,8 @@ #pragma once #include "base/timer.h" +#include "ui/views/bubble/bubble_delegate.h" #include "views/controls/button/button.h" -#include "views/bubble/bubble_delegate.h" namespace ui { class Accelerator; diff --git a/chrome/browser/ui/views/database_info_view.cc b/chrome/browser/ui/views/database_info_view.cc index 71db3eb..b8efe0a 100644 --- a/chrome/browser/ui/views/database_info_view.cc +++ b/chrome/browser/ui/views/database_info_view.cc @@ -12,10 +12,10 @@ #include "ui/base/l10n/l10n_util.h" #include "ui/base/text/bytes_formatting.h" #include "ui/gfx/color_utils.h" +#include "ui/views/layout/grid_layout.h" +#include "ui/views/layout/layout_constants.h" #include "views/controls/label.h" #include "views/controls/textfield/textfield.h" -#include "views/layout/grid_layout.h" -#include "views/layout/layout_constants.h" static const int kDatabaseInfoViewBorderSize = 1; static const int kDatabaseInfoViewInsetSize = 3; diff --git a/chrome/browser/ui/views/default_search_view.cc b/chrome/browser/ui/views/default_search_view.cc index 1631fe1..716b021 100644 --- a/chrome/browser/ui/views/default_search_view.cc +++ b/chrome/browser/ui/views/default_search_view.cc @@ -22,12 +22,12 @@ #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/canvas.h" +#include "ui/views/layout/grid_layout.h" +#include "ui/views/layout/layout_constants.h" #include "ui/views/window/dialog_client_view.h" #include "views/controls/button/text_button.h" #include "views/controls/image_view.h" #include "views/controls/label.h" -#include "views/layout/grid_layout.h" -#include "views/layout/layout_constants.h" #include "views/widget/widget.h" namespace { diff --git a/chrome/browser/ui/views/dom_view.cc b/chrome/browser/ui/views/dom_view.cc index 7627938..9027059 100644 --- a/chrome/browser/ui/views/dom_view.cc +++ b/chrome/browser/ui/views/dom_view.cc @@ -8,7 +8,7 @@ #include "chrome/browser/renderer_preferences_util.h" #include "chrome/browser/ui/views/tab_contents/tab_contents_view_views.h" #include "content/browser/tab_contents/tab_contents.h" -#include "views/focus/focus_manager.h" +#include "ui/views/focus/focus_manager.h" #include "views/widget/native_widget_views.h" // static diff --git a/chrome/browser/ui/views/dom_view.h b/chrome/browser/ui/views/dom_view.h index 8fa5340..1287e77 100644 --- a/chrome/browser/ui/views/dom_view.h +++ b/chrome/browser/ui/views/dom_view.h @@ -12,8 +12,8 @@ #include "base/memory/scoped_ptr.h" #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" #include "googleurl/src/gurl.h" +#include "ui/views/events/event.h" #include "views/controls/native/native_view_host.h" -#include "views/events/event.h" class Profile; class SiteInstance; diff --git a/chrome/browser/ui/views/download/download_in_progress_dialog_view.cc b/chrome/browser/ui/views/download/download_in_progress_dialog_view.cc index f785137..e4c8171 100644 --- a/chrome/browser/ui/views/download/download_in_progress_dialog_view.cc +++ b/chrome/browser/ui/views/download/download_in_progress_dialog_view.cc @@ -19,9 +19,9 @@ #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/size.h" +#include "ui/views/layout/grid_layout.h" #include "views/border.h" #include "views/controls/label.h" -#include "views/layout/grid_layout.h" #include "views/widget/widget.h" DownloadInProgressDialogView::DownloadInProgressDialogView(Browser* browser) diff --git a/chrome/browser/ui/views/download/download_item_view.h b/chrome/browser/ui/views/download/download_item_view.h index 85385a8a..9bf52e1 100644 --- a/chrome/browser/ui/views/download/download_item_view.h +++ b/chrome/browser/ui/views/download/download_item_view.h @@ -31,8 +31,8 @@ #include "content/browser/download/download_manager.h" #include "ui/base/animation/animation_delegate.h" #include "ui/gfx/font.h" +#include "ui/views/events/event.h" #include "views/controls/button/button.h" -#include "views/events/event.h" #include "views/view.h" class BaseDownloadItemModel; diff --git a/chrome/browser/ui/views/dropdown_bar_host.cc b/chrome/browser/ui/views/dropdown_bar_host.cc index bf544ba..b66d70f 100644 --- a/chrome/browser/ui/views/dropdown_bar_host.cc +++ b/chrome/browser/ui/views/dropdown_bar_host.cc @@ -14,8 +14,8 @@ #include "ui/base/keycodes/keyboard_codes.h" #include "ui/gfx/path.h" #include "ui/gfx/scrollbar_size.h" -#include "views/focus/external_focus_tracker.h" -#include "views/focus/view_storage.h" +#include "ui/views/focus/external_focus_tracker.h" +#include "ui/views/focus/view_storage.h" #include "views/widget/widget.h" #if defined(USE_AURA) diff --git a/chrome/browser/ui/views/dropdown_bar_host.h b/chrome/browser/ui/views/dropdown_bar_host.h index 0140f8b..98a8936 100644 --- a/chrome/browser/ui/views/dropdown_bar_host.h +++ b/chrome/browser/ui/views/dropdown_bar_host.h @@ -11,8 +11,8 @@ #include "ui/base/animation/animation_delegate.h" #include "ui/gfx/native_widget_types.h" #include "ui/gfx/rect.h" +#include "ui/views/focus/focus_manager.h" #include "views/controls/textfield/textfield.h" -#include "views/focus/focus_manager.h" class BrowserView; class DropdownBarHostDelegate; diff --git a/chrome/browser/ui/views/edit_search_engine_dialog.cc b/chrome/browser/ui/views/edit_search_engine_dialog.cc index d5713ec..568dcf9 100644 --- a/chrome/browser/ui/views/edit_search_engine_dialog.cc +++ b/chrome/browser/ui/views/edit_search_engine_dialog.cc @@ -15,12 +15,12 @@ #include "grit/ui_resources.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" +#include "ui/views/layout/grid_layout.h" +#include "ui/views/layout/layout_constants.h" #include "views/controls/image_view.h" #include "views/controls/label.h" #include "views/controls/table/table_view.h" #include "views/controls/textfield/textfield.h" -#include "views/layout/grid_layout.h" -#include "views/layout/layout_constants.h" #include "views/widget/widget.h" using views::GridLayout; diff --git a/chrome/browser/ui/views/event_utils.cc b/chrome/browser/ui/views/event_utils.cc index f134f38..19a35af 100644 --- a/chrome/browser/ui/views/event_utils.cc +++ b/chrome/browser/ui/views/event_utils.cc @@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/ui/views/event_utils.h" #include "chrome/browser/event_disposition.h" +#include "chrome/browser/ui/views/event_utils.h" #include "content/browser/disposition_utils.h" -#include "views/events/event.h" +#include "ui/views/events/event.h" using views::Event; diff --git a/chrome/browser/ui/views/extensions/extension_install_dialog_view.cc b/chrome/browser/ui/views/extensions/extension_install_dialog_view.cc index 97f4517..81cc726 100644 --- a/chrome/browser/ui/views/extensions/extension_install_dialog_view.cc +++ b/chrome/browser/ui/views/extensions/extension_install_dialog_view.cc @@ -15,6 +15,9 @@ #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" +#include "ui/views/layout/box_layout.h" +#include "ui/views/layout/grid_layout.h" +#include "ui/views/layout/layout_constants.h" #include "ui/views/window/dialog_delegate.h" #include "views/border.h" #include "views/controls/image_view.h" @@ -22,9 +25,6 @@ #include "views/controls/link.h" #include "views/controls/link_listener.h" #include "views/controls/separator.h" -#include "views/layout/box_layout.h" -#include "views/layout/grid_layout.h" -#include "views/layout/layout_constants.h" #include "views/view.h" #include "views/widget/widget.h" diff --git a/chrome/browser/ui/views/extensions/extension_installed_bubble.cc b/chrome/browser/ui/views/extensions/extension_installed_bubble.cc index adb2520..62288d7 100644 --- a/chrome/browser/ui/views/extensions/extension_installed_bubble.cc +++ b/chrome/browser/ui/views/extensions/extension_installed_bubble.cc @@ -29,12 +29,12 @@ #include "grit/theme_resources_standard.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" +#include "ui/views/layout/layout_constants.h" #include "views/controls/button/image_button.h" #include "views/controls/image_view.h" #include "views/controls/label.h" #include "views/controls/link.h" #include "views/controls/link_listener.h" -#include "views/layout/layout_constants.h" #include "views/view.h" namespace { diff --git a/chrome/browser/ui/views/extensions/extension_popup.h b/chrome/browser/ui/views/extensions/extension_popup.h index 709520a..61c574e 100644 --- a/chrome/browser/ui/views/extensions/extension_popup.h +++ b/chrome/browser/ui/views/extensions/extension_popup.h @@ -12,7 +12,7 @@ #include "chrome/browser/ui/views/extensions/extension_view.h" #include "content/public/browser/notification_observer.h" #include "googleurl/src/gurl.h" -#include "views/bubble/bubble_border.h" +#include "ui/views/bubble/bubble_border.h" class Browser; diff --git a/chrome/browser/ui/views/extensions/extension_uninstall_dialog_view.cc b/chrome/browser/ui/views/extensions/extension_uninstall_dialog_view.cc index 0e0de8f..93c1282 100644 --- a/chrome/browser/ui/views/extensions/extension_uninstall_dialog_view.cc +++ b/chrome/browser/ui/views/extensions/extension_uninstall_dialog_view.cc @@ -16,10 +16,10 @@ #include "ui/base/l10n/l10n_util.h" #include "ui/gfx/compositor/compositor.h" #include "ui/gfx/compositor/layer.h" +#include "ui/views/layout/layout_constants.h" #include "ui/views/window/dialog_delegate.h" #include "views/controls/image_view.h" #include "views/controls/label.h" -#include "views/layout/layout_constants.h" #include "views/view.h" #include "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 fe7e3fa..066b016 100644 --- a/chrome/browser/ui/views/find_bar_host.cc +++ b/chrome/browser/ui/views/find_bar_host.cc @@ -16,8 +16,8 @@ #include "content/browser/tab_contents/tab_contents.h" #include "content/browser/tab_contents/tab_contents_view.h" #include "ui/base/keycodes/keyboard_codes.h" -#include "views/focus/external_focus_tracker.h" -#include "views/focus/view_storage.h" +#include "ui/views/focus/external_focus_tracker.h" +#include "ui/views/focus/view_storage.h" #include "views/widget/root_view.h" #include "views/widget/widget.h" diff --git a/chrome/browser/ui/views/find_bar_host_interactive_uitest.cc b/chrome/browser/ui/views/find_bar_host_interactive_uitest.cc index 89c3749..e6eb370 100644 --- a/chrome/browser/ui/views/find_bar_host_interactive_uitest.cc +++ b/chrome/browser/ui/views/find_bar_host_interactive_uitest.cc @@ -20,7 +20,7 @@ #include "net/test/test_server.h" #include "ui/base/clipboard/clipboard.h" #include "ui/base/keycodes/keyboard_codes.h" -#include "views/focus/focus_manager.h" +#include "ui/views/focus/focus_manager.h" #include "views/view.h" #include "views/views_delegate.h" diff --git a/chrome/browser/ui/views/first_run_bubble.cc b/chrome/browser/ui/views/first_run_bubble.cc index 6f5c8f9..606bc44 100644 --- a/chrome/browser/ui/views/first_run_bubble.cc +++ b/chrome/browser/ui/views/first_run_bubble.cc @@ -19,11 +19,11 @@ #include "ui/base/l10n/l10n_font_util.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" +#include "ui/views/events/event.h" +#include "ui/views/layout/grid_layout.h" +#include "ui/views/layout/layout_constants.h" #include "views/controls/button/image_button.h" #include "views/controls/label.h" -#include "views/events/event.h" -#include "views/layout/grid_layout.h" -#include "views/layout/layout_constants.h" #include "views/widget/widget.h" namespace { diff --git a/chrome/browser/ui/views/first_run_bubble.h b/chrome/browser/ui/views/first_run_bubble.h index fe22293..fd4c733 100644 --- a/chrome/browser/ui/views/first_run_bubble.h +++ b/chrome/browser/ui/views/first_run_bubble.h @@ -7,7 +7,7 @@ #pragma once #include "chrome/browser/first_run/first_run.h" -#include "views/bubble/bubble_delegate.h" +#include "ui/views/bubble/bubble_delegate.h" #include "views/controls/button/button.h" class Profile; diff --git a/chrome/browser/ui/views/first_run_search_engine_view.cc b/chrome/browser/ui/views/first_run_search_engine_view.cc index 2b056caa..7e33241 100644 --- a/chrome/browser/ui/views/first_run_search_engine_view.cc +++ b/chrome/browser/ui/views/first_run_search_engine_view.cc @@ -30,11 +30,11 @@ #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/canvas.h" #include "ui/gfx/font.h" +#include "ui/views/focus/accelerator_handler.h" +#include "ui/views/layout/layout_constants.h" #include "views/controls/button/button.h" #include "views/controls/image_view.h" #include "views/controls/label.h" -#include "views/focus/accelerator_handler.h" -#include "views/layout/layout_constants.h" #include "views/view_text_utils.h" #include "views/widget/widget.h" diff --git a/chrome/browser/ui/views/frame/browser_view.cc b/chrome/browser/ui/views/frame/browser_view.cc index c225f23..aceab57 100644 --- a/chrome/browser/ui/views/frame/browser_view.cc +++ b/chrome/browser/ui/views/frame/browser_view.cc @@ -95,12 +95,12 @@ #include "ui/base/models/accelerator.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/canvas_skia.h" +#include "ui/views/events/event.h" +#include "ui/views/focus/external_focus_tracker.h" +#include "ui/views/focus/view_storage.h" +#include "ui/views/layout/grid_layout.h" #include "ui/views/window/dialog_delegate.h" #include "views/controls/single_split_view.h" -#include "views/events/event.h" -#include "views/focus/external_focus_tracker.h" -#include "views/focus/view_storage.h" -#include "views/layout/grid_layout.h" #include "views/widget/native_widget.h" #include "views/widget/root_view.h" #include "views/widget/widget.h" diff --git a/chrome/browser/ui/views/frame/browser_view_layout.h b/chrome/browser/ui/views/frame/browser_view_layout.h index 29767ca..3f4ab31 100644 --- a/chrome/browser/ui/views/frame/browser_view_layout.h +++ b/chrome/browser/ui/views/frame/browser_view_layout.h @@ -8,7 +8,7 @@ #include "base/basictypes.h" #include "ui/gfx/rect.h" -#include "views/layout/layout_manager.h" +#include "ui/views/layout/layout_manager.h" class AbstractTabStripView; class BookmarkBarView; diff --git a/chrome/browser/ui/views/fullscreen_exit_bubble_views.cc b/chrome/browser/ui/views/fullscreen_exit_bubble_views.cc index dd1996a..3bc7051 100644 --- a/chrome/browser/ui/views/fullscreen_exit_bubble_views.cc +++ b/chrome/browser/ui/views/fullscreen_exit_bubble_views.cc @@ -15,7 +15,7 @@ #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/canvas_skia.h" #include "ui/gfx/screen.h" -#include "views/bubble/bubble_border.h" +#include "ui/views/bubble/bubble_border.h" #include "views/controls/button/text_button.h" #include "views/controls/link.h" #include "views/widget/widget.h" diff --git a/chrome/browser/ui/views/generic_info_view.cc b/chrome/browser/ui/views/generic_info_view.cc index 644d960..1a0be5a 100644 --- a/chrome/browser/ui/views/generic_info_view.cc +++ b/chrome/browser/ui/views/generic_info_view.cc @@ -8,10 +8,10 @@ #include "base/utf_string_conversions.h" #include "ui/base/l10n/l10n_util.h" #include "ui/gfx/color_utils.h" +#include "ui/views/layout/grid_layout.h" +#include "ui/views/layout/layout_constants.h" #include "views/controls/label.h" #include "views/controls/textfield/textfield.h" -#include "views/layout/grid_layout.h" -#include "views/layout/layout_constants.h" GenericInfoView::GenericInfoView(int number_of_rows) : number_of_rows_(number_of_rows), name_string_ids_(NULL) { diff --git a/chrome/browser/ui/views/global_error_bubble_view.cc b/chrome/browser/ui/views/global_error_bubble_view.cc index ff737cc..bc88f13 100644 --- a/chrome/browser/ui/views/global_error_bubble_view.cc +++ b/chrome/browser/ui/views/global_error_bubble_view.cc @@ -10,11 +10,11 @@ #include "chrome/browser/ui/views/toolbar_view.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/image/image.h" +#include "ui/views/layout/grid_layout.h" +#include "ui/views/layout/layout_constants.h" #include "views/controls/button/text_button.h" #include "views/controls/image_view.h" #include "views/controls/label.h" -#include "views/layout/grid_layout.h" -#include "views/layout/layout_constants.h" namespace { diff --git a/chrome/browser/ui/views/global_error_bubble_view.h b/chrome/browser/ui/views/global_error_bubble_view.h index a9b143d..ef8155e 100644 --- a/chrome/browser/ui/views/global_error_bubble_view.h +++ b/chrome/browser/ui/views/global_error_bubble_view.h @@ -6,7 +6,7 @@ #define CHROME_BROWSER_UI_VIEWS_GLOBAL_ERROR_BUBBLE_VIEW_H_ #pragma once -#include "views/bubble/bubble_delegate.h" +#include "ui/views/bubble/bubble_delegate.h" #include "views/controls/button/button.h" class Browser; diff --git a/chrome/browser/ui/views/html_dialog_view.cc b/chrome/browser/ui/views/html_dialog_view.cc index d93100e..e6995c2 100644 --- a/chrome/browser/ui/views/html_dialog_view.cc +++ b/chrome/browser/ui/views/html_dialog_view.cc @@ -16,7 +16,7 @@ #include "content/public/browser/notification_source.h" #include "content/public/browser/notification_types.h" #include "ui/base/keycodes/keyboard_codes.h" -#include "views/events/event.h" +#include "ui/views/events/event.h" #include "views/widget/root_view.h" #include "views/widget/widget.h" diff --git a/chrome/browser/ui/views/hung_renderer_view.cc b/chrome/browser/ui/views/hung_renderer_view.cc index c128e19..1320f6b 100644 --- a/chrome/browser/ui/views/hung_renderer_view.cc +++ b/chrome/browser/ui/views/hung_renderer_view.cc @@ -22,14 +22,14 @@ #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/canvas.h" +#include "ui/views/layout/grid_layout.h" +#include "ui/views/layout/layout_constants.h" #include "ui/views/window/client_view.h" #include "ui/views/window/dialog_delegate.h" #include "views/controls/button/text_button.h" #include "views/controls/image_view.h" #include "views/controls/label.h" #include "views/controls/table/group_table_view.h" -#include "views/layout/grid_layout.h" -#include "views/layout/layout_constants.h" #include "views/widget/widget.h" class HungRendererDialogView; diff --git a/chrome/browser/ui/views/importer/import_lock_dialog_view.cc b/chrome/browser/ui/views/importer/import_lock_dialog_view.cc index 404b26c..375ed0e 100644 --- a/chrome/browser/ui/views/importer/import_lock_dialog_view.cc +++ b/chrome/browser/ui/views/importer/import_lock_dialog_view.cc @@ -14,8 +14,8 @@ #include "grit/generated_resources.h" #include "grit/locale_settings.h" #include "ui/base/l10n/l10n_util.h" +#include "ui/views/layout/layout_constants.h" #include "views/controls/label.h" -#include "views/layout/layout_constants.h" #include "views/widget/widget.h" // Default size of the dialog window. diff --git a/chrome/browser/ui/views/importer/import_progress_dialog_view.cc b/chrome/browser/ui/views/importer/import_progress_dialog_view.cc index 9cb7dee..b5d58f0 100644 --- a/chrome/browser/ui/views/importer/import_progress_dialog_view.cc +++ b/chrome/browser/ui/views/importer/import_progress_dialog_view.cc @@ -12,10 +12,10 @@ #include "grit/generated_resources.h" #include "grit/locale_settings.h" #include "ui/base/l10n/l10n_util.h" +#include "ui/views/layout/grid_layout.h" +#include "ui/views/layout/layout_constants.h" #include "views/controls/label.h" #include "views/controls/throbber.h" -#include "views/layout/grid_layout.h" -#include "views/layout/layout_constants.h" #include "views/widget/widget.h" ImportProgressDialogView::ImportProgressDialogView( diff --git a/chrome/browser/ui/views/indexed_db_info_view.cc b/chrome/browser/ui/views/indexed_db_info_view.cc index 1cc7f31..93c2f45 100644 --- a/chrome/browser/ui/views/indexed_db_info_view.cc +++ b/chrome/browser/ui/views/indexed_db_info_view.cc @@ -12,10 +12,10 @@ #include "ui/base/l10n/l10n_util.h" #include "ui/base/text/bytes_formatting.h" #include "ui/gfx/color_utils.h" +#include "ui/views/layout/grid_layout.h" +#include "ui/views/layout/layout_constants.h" #include "views/controls/label.h" #include "views/controls/textfield/textfield.h" -#include "views/layout/grid_layout.h" -#include "views/layout/layout_constants.h" static const int kIndexedDBInfoViewBorderSize = 1; static const int kIndexedDBInfoViewInsetSize = 3; diff --git a/chrome/browser/ui/views/infobars/infobar_view.cc b/chrome/browser/ui/views/infobars/infobar_view.cc index 63ce5cb..cce51ed 100644 --- a/chrome/browser/ui/views/infobars/infobar_view.cc +++ b/chrome/browser/ui/views/infobars/infobar_view.cc @@ -24,6 +24,7 @@ #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/canvas_skia_paint.h" #include "ui/gfx/image/image.h" +#include "ui/views/focus/external_focus_tracker.h" #include "ui/views/window/non_client_view.h" #include "views/controls/button/image_button.h" #include "views/controls/button/menu_button.h" @@ -33,7 +34,6 @@ #include "views/controls/link.h" #include "views/controls/menu/menu_model_adapter.h" #include "views/controls/menu/menu_runner.h" -#include "views/focus/external_focus_tracker.h" #include "views/widget/widget.h" #if defined(OS_WIN) diff --git a/chrome/browser/ui/views/infobars/infobar_view.h b/chrome/browser/ui/views/infobars/infobar_view.h index 8707377..a1cafe2 100644 --- a/chrome/browser/ui/views/infobars/infobar_view.h +++ b/chrome/browser/ui/views/infobars/infobar_view.h @@ -11,9 +11,9 @@ #include "chrome/browser/infobars/infobar.h" #include "chrome/browser/infobars/infobar_container.h" #include "third_party/skia/include/core/SkPath.h" +#include "ui/views/focus/focus_manager.h" #include "views/controls/button/button.h" #include "views/controls/menu/menu_item_view.h" -#include "views/focus/focus_manager.h" namespace ui { class MenuModel; diff --git a/chrome/browser/ui/views/instant_confirm_view.cc b/chrome/browser/ui/views/instant_confirm_view.cc index 5ebab9c..b6ade51a 100644 --- a/chrome/browser/ui/views/instant_confirm_view.cc +++ b/chrome/browser/ui/views/instant_confirm_view.cc @@ -14,10 +14,10 @@ #include "grit/generated_resources.h" #include "grit/locale_settings.h" #include "ui/base/l10n/l10n_util.h" +#include "ui/views/layout/grid_layout.h" +#include "ui/views/layout/layout_constants.h" #include "views/controls/label.h" #include "views/controls/link.h" -#include "views/layout/grid_layout.h" -#include "views/layout/layout_constants.h" #include "views/widget/widget.h" InstantConfirmView::InstantConfirmView(Profile* profile) : profile_(profile) { diff --git a/chrome/browser/ui/views/keyboard_overlay_dialog_view.cc b/chrome/browser/ui/views/keyboard_overlay_dialog_view.cc index d1c7436..d8c2752 100644 --- a/chrome/browser/ui/views/keyboard_overlay_dialog_view.cc +++ b/chrome/browser/ui/views/keyboard_overlay_dialog_view.cc @@ -17,7 +17,7 @@ #include "grit/generated_resources.h" #include "ui/base/keycodes/keyboard_codes.h" #include "ui/base/l10n/l10n_util.h" -#include "views/events/event.h" +#include "ui/views/events/event.h" #include "views/widget/root_view.h" #include "views/widget/widget.h" diff --git a/chrome/browser/ui/views/local_storage_info_view.cc b/chrome/browser/ui/views/local_storage_info_view.cc index 21327f4..b3ce310 100644 --- a/chrome/browser/ui/views/local_storage_info_view.cc +++ b/chrome/browser/ui/views/local_storage_info_view.cc @@ -12,10 +12,10 @@ #include "ui/base/l10n/l10n_util.h" #include "ui/base/text/bytes_formatting.h" #include "ui/gfx/color_utils.h" +#include "ui/views/layout/grid_layout.h" +#include "ui/views/layout/layout_constants.h" #include "views/controls/label.h" #include "views/controls/textfield/textfield.h" -#include "views/layout/grid_layout.h" -#include "views/layout/layout_constants.h" static const int kLocalStorageInfoViewBorderSize = 1; static const int kLocalStorageInfoViewInsetSize = 3; diff --git a/chrome/browser/ui/views/local_storage_set_item_info_view.cc b/chrome/browser/ui/views/local_storage_set_item_info_view.cc index 93a1c713..94d66b2 100644 --- a/chrome/browser/ui/views/local_storage_set_item_info_view.cc +++ b/chrome/browser/ui/views/local_storage_set_item_info_view.cc @@ -10,10 +10,10 @@ #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" #include "ui/gfx/color_utils.h" +#include "ui/views/layout/grid_layout.h" +#include "ui/views/layout/layout_constants.h" #include "views/controls/label.h" #include "views/controls/textfield/textfield.h" -#include "views/layout/grid_layout.h" -#include "views/layout/layout_constants.h" static const int kLocalStorageSetItemInfoViewBorderSize = 1; static const int kLocalStorageSetItemInfoViewInsetSize = 3; diff --git a/chrome/browser/ui/views/login_view.cc b/chrome/browser/ui/views/login_view.cc index 04ba4ec..40373ff 100644 --- a/chrome/browser/ui/views/login_view.cc +++ b/chrome/browser/ui/views/login_view.cc @@ -11,10 +11,10 @@ #include "base/utf_string_conversions.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" +#include "ui/views/layout/grid_layout.h" +#include "ui/views/layout/layout_constants.h" #include "views/controls/label.h" #include "views/controls/textfield/textfield.h" -#include "views/layout/grid_layout.h" -#include "views/layout/layout_constants.h" #include "views/widget/root_view.h" static const int kMessageWidth = 320; diff --git a/chrome/browser/ui/views/notifications/balloon_view.cc b/chrome/browser/ui/views/notifications/balloon_view.cc index 2ce871c..24cfb81 100644 --- a/chrome/browser/ui/views/notifications/balloon_view.cc +++ b/chrome/browser/ui/views/notifications/balloon_view.cc @@ -32,7 +32,7 @@ #include "ui/gfx/canvas_skia.h" #include "ui/gfx/insets.h" #include "ui/gfx/native_widget_types.h" -#include "views/bubble/bubble_border.h" +#include "ui/views/bubble/bubble_border.h" #include "views/controls/button/button.h" #include "views/controls/button/image_button.h" #include "views/controls/button/text_button.h" diff --git a/chrome/browser/ui/views/omnibox/omnibox_view_views.cc b/chrome/browser/ui/views/omnibox/omnibox_view_views.cc index f7e1da3..a49bcc2 100644 --- a/chrome/browser/ui/views/omnibox/omnibox_view_views.cc +++ b/chrome/browser/ui/views/omnibox/omnibox_view_views.cc @@ -26,10 +26,10 @@ #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/font.h" #include "ui/gfx/render_text.h" +#include "ui/views/events/event.h" +#include "ui/views/layout/fill_layout.h" #include "views/border.h" #include "views/controls/textfield/textfield.h" -#include "views/events/event.h" -#include "views/layout/fill_layout.h" #if defined(TOUCH_UI) #include "chrome/browser/ui/views/autocomplete/touch_autocomplete_popup_contents_view.h" diff --git a/chrome/browser/ui/views/page_info_bubble_view.cc b/chrome/browser/ui/views/page_info_bubble_view.cc index b0bb3ae..8e1a507 100644 --- a/chrome/browser/ui/views/page_info_bubble_view.cc +++ b/chrome/browser/ui/views/page_info_bubble_view.cc @@ -21,11 +21,11 @@ #include "ui/gfx/canvas.h" #include "ui/gfx/canvas_skia.h" #include "ui/gfx/image/image.h" +#include "ui/views/layout/grid_layout.h" #include "views/controls/image_view.h" #include "views/controls/label.h" #include "views/controls/link.h" #include "views/controls/separator.h" -#include "views/layout/grid_layout.h" #include "views/widget/widget.h" namespace { diff --git a/chrome/browser/ui/views/page_info_bubble_view.h b/chrome/browser/ui/views/page_info_bubble_view.h index 5fad7ba..4723211 100644 --- a/chrome/browser/ui/views/page_info_bubble_view.h +++ b/chrome/browser/ui/views/page_info_bubble_view.h @@ -9,7 +9,7 @@ #include "chrome/browser/page_info_model.h" #include "chrome/browser/page_info_model_observer.h" #include "ui/base/animation/slide_animation.h" -#include "views/bubble/bubble_delegate.h" +#include "ui/views/bubble/bubble_delegate.h" #include "views/controls/link_listener.h" class PageInfoBubbleView : public views::BubbleDelegateView, diff --git a/chrome/browser/ui/views/sad_tab_view.cc b/chrome/browser/ui/views/sad_tab_view.cc index 2c006e67..17a55a5 100644 --- a/chrome/browser/ui/views/sad_tab_view.cc +++ b/chrome/browser/ui/views/sad_tab_view.cc @@ -17,10 +17,10 @@ #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/font.h" +#include "ui/views/layout/grid_layout.h" #include "views/controls/image_view.h" #include "views/controls/label.h" #include "views/controls/link.h" -#include "views/layout/grid_layout.h" static const int kPadding = 20; static const float kMessageSize = 0.65f; diff --git a/chrome/browser/ui/views/simple_message_box_views.cc b/chrome/browser/ui/views/simple_message_box_views.cc index 251c8fc..9f9a604 100644 --- a/chrome/browser/ui/views/simple_message_box_views.cc +++ b/chrome/browser/ui/views/simple_message_box_views.cc @@ -15,7 +15,7 @@ #include "views/widget/widget.h" #if defined(TOUCH_UI) || defined(USE_AURA) -#include "views/focus/accelerator_handler.h" +#include "ui/views/focus/accelerator_handler.h" #endif namespace browser { diff --git a/chrome/browser/ui/views/ssl_client_certificate_selector.cc b/chrome/browser/ui/views/ssl_client_certificate_selector.cc index 3d74cac..861e6f9 100644 --- a/chrome/browser/ui/views/ssl_client_certificate_selector.cc +++ b/chrome/browser/ui/views/ssl_client_certificate_selector.cc @@ -19,11 +19,11 @@ #include "ui/base/models/table_model.h" #include "ui/base/models/table_model_observer.h" #include "ui/gfx/native_widget_types.h" +#include "ui/views/layout/grid_layout.h" +#include "ui/views/layout/layout_constants.h" #include "views/controls/button/text_button.h" #include "views/controls/label.h" #include "views/controls/table/table_view.h" -#include "views/layout/grid_layout.h" -#include "views/layout/layout_constants.h" using content::BrowserThread; diff --git a/chrome/browser/ui/views/tab_contents/native_tab_contents_container_aura.cc b/chrome/browser/ui/views/tab_contents/native_tab_contents_container_aura.cc index b020939..7c42af6 100644 --- a/chrome/browser/ui/views/tab_contents/native_tab_contents_container_aura.cc +++ b/chrome/browser/ui/views/tab_contents/native_tab_contents_container_aura.cc @@ -12,9 +12,9 @@ #include "content/browser/tab_contents/tab_contents.h" #include "ui/aura/window.h" #include "ui/base/accessibility/accessible_view_state.h" +#include "ui/views/focus/focus_manager.h" +#include "ui/views/focus/widget_focus_manager.h" #include "views/views_delegate.h" -#include "views/focus/focus_manager.h" -#include "views/focus/widget_focus_manager.h" //////////////////////////////////////////////////////////////////////////////// // NativeTabContentsContainerAura, public: diff --git a/chrome/browser/ui/views/tab_contents/native_tab_contents_container_gtk.cc b/chrome/browser/ui/views/tab_contents/native_tab_contents_container_gtk.cc index 9fcde00..5394892 100644 --- a/chrome/browser/ui/views/tab_contents/native_tab_contents_container_gtk.cc +++ b/chrome/browser/ui/views/tab_contents/native_tab_contents_container_gtk.cc @@ -12,7 +12,7 @@ #include "content/browser/tab_contents/interstitial_page.h" #include "content/browser/tab_contents/tab_contents.h" #include "ui/base/accessibility/accessible_view_state.h" -#include "views/focus/focus_manager.h" +#include "ui/views/focus/focus_manager.h" //////////////////////////////////////////////////////////////////////////////// // NativeTabContentsContainerGtk, public: diff --git a/chrome/browser/ui/views/tab_contents/native_tab_contents_container_views.cc b/chrome/browser/ui/views/tab_contents/native_tab_contents_container_views.cc index 2ca4587..bba7c85 100644 --- a/chrome/browser/ui/views/tab_contents/native_tab_contents_container_views.cc +++ b/chrome/browser/ui/views/tab_contents/native_tab_contents_container_views.cc @@ -12,9 +12,9 @@ #include "content/browser/tab_contents/interstitial_page.h" #include "content/browser/tab_contents/tab_contents.h" #include "ui/base/accessibility/accessible_view_state.h" -#include "views/focus/focus_manager.h" -#include "views/focus/widget_focus_manager.h" -#include "views/layout/fill_layout.h" +#include "ui/views/focus/focus_manager.h" +#include "ui/views/focus/widget_focus_manager.h" +#include "ui/views/layout/fill_layout.h" #include "views/widget/native_widget_views.h" //////////////////////////////////////////////////////////////////////////////// diff --git a/chrome/browser/ui/views/tab_contents/native_tab_contents_container_win.cc b/chrome/browser/ui/views/tab_contents/native_tab_contents_container_win.cc index 2e30e1e..5002c05d 100644 --- a/chrome/browser/ui/views/tab_contents/native_tab_contents_container_win.cc +++ b/chrome/browser/ui/views/tab_contents/native_tab_contents_container_win.cc @@ -12,8 +12,8 @@ #include "content/browser/tab_contents/interstitial_page.h" #include "content/browser/tab_contents/tab_contents.h" #include "ui/base/accessibility/accessible_view_state.h" -#include "views/focus/focus_manager.h" -#include "views/focus/widget_focus_manager.h" +#include "ui/views/focus/focus_manager.h" +#include "ui/views/focus/widget_focus_manager.h" //////////////////////////////////////////////////////////////////////////////// // NativeTabContentsContainerWin, public: diff --git a/chrome/browser/ui/views/tab_contents/tab_contents_view_views.cc b/chrome/browser/ui/views/tab_contents/tab_contents_view_views.cc index c22f9c5..9a96f1b 100644 --- a/chrome/browser/ui/views/tab_contents/tab_contents_view_views.cc +++ b/chrome/browser/ui/views/tab_contents/tab_contents_view_views.cc @@ -20,8 +20,8 @@ #include "content/browser/tab_contents/tab_contents_delegate.h" #include "content/public/browser/render_process_host.h" #include "ui/gfx/screen.h" -#include "views/focus/focus_manager.h" -#include "views/focus/view_storage.h" +#include "ui/views/focus/focus_manager.h" +#include "ui/views/focus/view_storage.h" #include "views/widget/native_widget.h" #include "views/widget/widget.h" diff --git a/chrome/browser/ui/views/tabs/dragged_tab_controller.cc b/chrome/browser/ui/views/tabs/dragged_tab_controller.cc index 97f634c..a95ea47 100644 --- a/chrome/browser/ui/views/tabs/dragged_tab_controller.cc +++ b/chrome/browser/ui/views/tabs/dragged_tab_controller.cc @@ -35,7 +35,7 @@ #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/canvas_skia.h" #include "ui/gfx/screen.h" -#include "views/events/event.h" +#include "ui/views/events/event.h" #include "views/widget/widget.h" #if defined(TOOLKIT_USES_GTK) diff --git a/chrome/browser/ui/views/tabs/tab_dragging_test.cc b/chrome/browser/ui/views/tabs/tab_dragging_test.cc index 76ef050..a0038b4 100644 --- a/chrome/browser/ui/views/tabs/tab_dragging_test.cc +++ b/chrome/browser/ui/views/tabs/tab_dragging_test.cc @@ -15,7 +15,7 @@ #include "googleurl/src/gurl.h" #include "net/base/net_util.h" #include "ui/gfx/rect.h" -#include "views/events/event.h" +#include "ui/views/events/event.h" #if defined(OS_LINUX) // This test doesn't make sense on chromeos as chromeos doesn't allow dragging diff --git a/chrome/browser/ui/views/task_manager_view.cc b/chrome/browser/ui/views/task_manager_view.cc index 215f4bd..0e04d35 100644 --- a/chrome/browser/ui/views/task_manager_view.cc +++ b/chrome/browser/ui/views/task_manager_view.cc @@ -24,6 +24,7 @@ #include "ui/base/l10n/l10n_util.h" #include "ui/base/models/accelerator.h" #include "ui/base/models/table_model_observer.h" +#include "ui/views/layout/layout_constants.h" #include "ui/views/window/dialog_delegate.h" #include "views/background.h" #include "views/context_menu_controller.h" @@ -33,7 +34,6 @@ #include "views/controls/menu/menu.h" #include "views/controls/table/group_table_view.h" #include "views/controls/table/table_view_observer.h" -#include "views/layout/layout_constants.h" #include "views/widget/widget.h" // The task manager window default size. diff --git a/chrome/browser/ui/views/toolbar_view.cc b/chrome/browser/ui/views/toolbar_view.cc index 06e5653..d3bf8ee 100644 --- a/chrome/browser/ui/views/toolbar_view.cc +++ b/chrome/browser/ui/views/toolbar_view.cc @@ -35,10 +35,10 @@ #include "ui/gfx/canvas.h" #include "ui/gfx/canvas_skia.h" #include "ui/gfx/skbitmap_operations.h" +#include "ui/views/focus/view_storage.h" #include "ui/views/window/non_client_view.h" #include "views/controls/button/button_dropdown.h" #include "views/controls/menu/menu_listener.h" -#include "views/focus/view_storage.h" #include "views/widget/tooltip_manager.h" #if defined(OS_WIN) diff --git a/chrome/browser/ui/views/unhandled_keyboard_event_handler.cc b/chrome/browser/ui/views/unhandled_keyboard_event_handler.cc index 25ea0789..fdf17e3 100644 --- a/chrome/browser/ui/views/unhandled_keyboard_event_handler.cc +++ b/chrome/browser/ui/views/unhandled_keyboard_event_handler.cc @@ -5,7 +5,7 @@ #include "chrome/browser/ui/views/unhandled_keyboard_event_handler.h" #include "base/logging.h" -#include "views/focus/focus_manager.h" +#include "ui/views/focus/focus_manager.h" UnhandledKeyboardEventHandler::UnhandledKeyboardEventHandler() { ignore_next_char_event_ = false; diff --git a/chrome/browser/ui/views/uninstall_view.cc b/chrome/browser/ui/views/uninstall_view.cc index 1dd1341..fdeb245 100644 --- a/chrome/browser/ui/views/uninstall_view.cc +++ b/chrome/browser/ui/views/uninstall_view.cc @@ -14,10 +14,10 @@ #include "chrome/installer/util/shell_util.h" #include "grit/chromium_strings.h" #include "ui/base/l10n/l10n_util.h" +#include "ui/views/layout/grid_layout.h" +#include "ui/views/layout/layout_constants.h" #include "views/controls/button/checkbox.h" #include "views/controls/label.h" -#include "views/layout/grid_layout.h" -#include "views/layout/layout_constants.h" UninstallView::UninstallView(int* user_selection) : confirm_label_(NULL), diff --git a/chrome/browser/ui/views/web_intent_picker_view.cc b/chrome/browser/ui/views/web_intent_picker_view.cc index 14fce13..ea85299 100644 --- a/chrome/browser/ui/views/web_intent_picker_view.cc +++ b/chrome/browser/ui/views/web_intent_picker_view.cc @@ -6,8 +6,8 @@ #include <vector> #include "chrome/browser/ui/browser.h" -#include "chrome/browser/ui/intents/web_intent_picker_delegate.h" #include "chrome/browser/ui/intents/web_intent_picker.h" +#include "chrome/browser/ui/intents/web_intent_picker_delegate.h" #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" #include "chrome/browser/ui/views/bubble/bubble.h" #include "chrome/browser/ui/views/frame/browser_view.h" @@ -21,10 +21,10 @@ #include "ui/gfx/canvas.h" #include "ui/gfx/canvas_skia.h" #include "ui/gfx/image/image.h" +#include "ui/views/layout/box_layout.h" #include "views/controls/button/image_button.h" #include "views/controls/image_view.h" #include "views/controls/label.h" -#include "views/layout/box_layout.h" namespace { diff --git a/chrome/browser/ui/webui/chromeos/login/network_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/network_screen_handler.cc index c749490..f02ecb8 100644 --- a/chrome/browser/ui/webui/chromeos/login/network_screen_handler.cc +++ b/chrome/browser/ui/webui/chromeos/login/network_screen_handler.cc @@ -9,7 +9,6 @@ #include "base/stringprintf.h" #include "base/utf_string_conversions.h" #include "base/values.h" -#include "content/browser/webui/web_ui.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/chromeos/cros/cros_library.h" #include "chrome/browser/chromeos/input_method/input_method_manager.h" @@ -20,11 +19,12 @@ #include "chrome/browser/ui/webui/options/chromeos/cros_language_options_handler.h" #include "content/browser/tab_contents/tab_contents.h" #include "content/browser/webui/web_ui.h" +#include "content/browser/webui/web_ui.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" #include "ui/gfx/rect.h" -#include "views/layout/fill_layout.h" +#include "ui/views/layout/fill_layout.h" #include "views/widget/widget.h" #if defined(TOOLKIT_USES_GTK) diff --git a/chrome/common/native_web_keyboard_event_views.cc b/chrome/common/native_web_keyboard_event_views.cc index e419fb1..ebf167f 100644 --- a/chrome/common/native_web_keyboard_event_views.cc +++ b/chrome/common/native_web_keyboard_event_views.cc @@ -9,7 +9,7 @@ #endif #include "base/logging.h" -#include "views/events/event.h" +#include "ui/views/events/event.h" namespace { diff --git a/chrome/test/base/ui_test_utils.cc b/chrome/test/base/ui_test_utils.cc index aa35f0f..6ef89a1 100644 --- a/chrome/test/base/ui_test_utils.cc +++ b/chrome/test/base/ui_test_utils.cc @@ -55,7 +55,7 @@ #include "ui/gfx/size.h" #if defined(TOOLKIT_VIEWS) -#include "views/focus/accelerator_handler.h" +#include "ui/views/focus/accelerator_handler.h" #endif #if defined(USE_AURA) diff --git a/chrome/test/base/ui_test_utils_aura.cc b/chrome/test/base/ui_test_utils_aura.cc index 8cb6280..b5113a9 100644 --- a/chrome/test/base/ui_test_utils_aura.cc +++ b/chrome/test/base/ui_test_utils_aura.cc @@ -11,7 +11,7 @@ #include "chrome/browser/ui/browser_window.h" #include "chrome/browser/ui/views/frame/browser_view.h" #include "ui/aura/window.h" -#include "views/focus/focus_manager.h" +#include "ui/views/focus/focus_manager.h" namespace ui_test_utils { diff --git a/chrome/test/base/ui_test_utils_gtk.cc b/chrome/test/base/ui_test_utils_gtk.cc index 841f558..7260bc4 100644 --- a/chrome/test/base/ui_test_utils_gtk.cc +++ b/chrome/test/base/ui_test_utils_gtk.cc @@ -14,7 +14,7 @@ #include "chrome/browser/ui/gtk/view_id_util.h" #if defined(TOOLKIT_VIEWS) #include "chrome/browser/ui/views/frame/browser_view.h" -#include "views/focus/focus_manager.h" +#include "ui/views/focus/focus_manager.h" #endif namespace ui_test_utils { diff --git a/chrome/test/base/ui_test_utils_win.cc b/chrome/test/base/ui_test_utils_win.cc index c585a92..68e850c 100644 --- a/chrome/test/base/ui_test_utils_win.cc +++ b/chrome/test/base/ui_test_utils_win.cc @@ -10,7 +10,7 @@ #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_window.h" #include "chrome/browser/ui/views/frame/browser_view.h" -#include "views/focus/focus_manager.h" +#include "ui/views/focus/focus_manager.h" namespace ui_test_utils { diff --git a/ui/aura_shell/drag_drop_controller_unittest.cc b/ui/aura_shell/drag_drop_controller_unittest.cc index ad87b3d..36d3170 100644 --- a/ui/aura_shell/drag_drop_controller_unittest.cc +++ b/ui/aura_shell/drag_drop_controller_unittest.cc @@ -11,9 +11,9 @@ #include "ui/aura/event.h" #include "ui/aura_shell/desktop_event_filter.h" #include "ui/aura_shell/test/aura_shell_test_base.h" -#include "ui/base/dragdrop/os_exchange_data.h" #include "ui/base/dragdrop/drag_drop_types.h" -#include "views/events/event.h" +#include "ui/base/dragdrop/os_exchange_data.h" +#include "ui/views/events/event.h" #include "views/view.h" #include "views/widget/widget.h" diff --git a/ui/aura_shell/examples/bubble.cc b/ui/aura_shell/examples/bubble.cc index ff0e7a1..03cdfc1 100644 --- a/ui/aura_shell/examples/bubble.cc +++ b/ui/aura_shell/examples/bubble.cc @@ -3,10 +3,10 @@ // found in the LICENSE file. #include "base/utf_string_conversions.h" -#include "views/bubble/bubble_border.h" -#include "views/bubble/bubble_delegate.h" +#include "ui/views/bubble/bubble_border.h" +#include "ui/views/bubble/bubble_delegate.h" +#include "ui/views/layout/fill_layout.h" #include "views/controls/label.h" -#include "views/layout/fill_layout.h" #include "views/widget/widget.h" namespace aura_shell { diff --git a/ui/views/bubble/border_contents_view.cc b/ui/views/bubble/border_contents_view.cc index 67c893a..afa82fe 100644 --- a/ui/views/bubble/border_contents_view.cc +++ b/ui/views/bubble/border_contents_view.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 "views/bubble/border_contents_view.h" +#include "ui/views/bubble/border_contents_view.h" #include <algorithm> diff --git a/ui/views/bubble/border_contents_view.h b/ui/views/bubble/border_contents_view.h index 696dd26..e30ba19 100644 --- a/ui/views/bubble/border_contents_view.h +++ b/ui/views/bubble/border_contents_view.h @@ -6,8 +6,8 @@ #define UI_VIEWS_BUBBLE_BORDER_CONTENTS_VIEW_H_ #pragma once -#include "views/bubble/bubble_border.h" #include "third_party/skia/include/core/SkColor.h" +#include "ui/views/bubble/bubble_border.h" #include "views/view.h" namespace views { diff --git a/ui/views/bubble/bubble_border.cc b/ui/views/bubble/bubble_border.cc index 368b0be..2538b73 100644 --- a/ui/views/bubble/bubble_border.cc +++ b/ui/views/bubble/bubble_border.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 "views/bubble/bubble_border.h" +#include "ui/views/bubble/bubble_border.h" #include <algorithm> // for std::max diff --git a/ui/views/bubble/bubble_delegate.cc b/ui/views/bubble/bubble_delegate.cc index b3baea4..bffe755 100644 --- a/ui/views/bubble/bubble_delegate.cc +++ b/ui/views/bubble/bubble_delegate.cc @@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "views/bubble/bubble_delegate.h" +#include "ui/views/bubble/bubble_delegate.h" #include "ui/base/animation/slide_animation.h" -#include "views/bubble/bubble_frame_view.h" +#include "ui/views/bubble/bubble_frame_view.h" #include "views/widget/widget.h" // The duration of the fade animation in milliseconds. diff --git a/ui/views/bubble/bubble_delegate.h b/ui/views/bubble/bubble_delegate.h index a21bfab..a2654e1 100644 --- a/ui/views/bubble/bubble_delegate.h +++ b/ui/views/bubble/bubble_delegate.h @@ -8,7 +8,7 @@ #include "base/gtest_prod_util.h" #include "ui/base/animation/animation_delegate.h" -#include "views/bubble/bubble_border.h" +#include "ui/views/bubble/bubble_border.h" #include "views/widget/widget.h" #include "views/widget/widget_delegate.h" diff --git a/ui/views/bubble/bubble_delegate_unittest.cc b/ui/views/bubble/bubble_delegate_unittest.cc index f6d256a..6e61b5e 100644 --- a/ui/views/bubble/bubble_delegate_unittest.cc +++ b/ui/views/bubble/bubble_delegate_unittest.cc @@ -2,9 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "ui/views/bubble/bubble_delegate.h" +#include "ui/views/bubble/bubble_frame_view.h" #include "ui/views/test/views_test_base.h" -#include "views/bubble/bubble_delegate.h" -#include "views/bubble/bubble_frame_view.h" #include "views/widget/widget.h" namespace views { diff --git a/ui/views/bubble/bubble_frame_view.cc b/ui/views/bubble/bubble_frame_view.cc index 85e1f6e..cc35496 100644 --- a/ui/views/bubble/bubble_frame_view.cc +++ b/ui/views/bubble/bubble_frame_view.cc @@ -2,14 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "views/bubble/bubble_frame_view.h" +#include "ui/views/bubble/bubble_frame_view.h" #include <algorithm> +#include "ui/views/bubble/border_contents_view.h" +#include "ui/views/bubble/bubble_border.h" +#include "ui/views/layout/fill_layout.h" #include "ui/views/window/client_view.h" -#include "views/bubble/border_contents_view.h" -#include "views/bubble/bubble_border.h" -#include "views/layout/fill_layout.h" #include "views/widget/widget.h" namespace views { diff --git a/ui/views/bubble/bubble_frame_view.h b/ui/views/bubble/bubble_frame_view.h index f134725..e3aca58 100644 --- a/ui/views/bubble/bubble_frame_view.h +++ b/ui/views/bubble/bubble_frame_view.h @@ -7,8 +7,8 @@ #pragma once #include "base/gtest_prod_util.h" +#include "ui/views/bubble/bubble_border.h" #include "ui/views/window/non_client_view.h" -#include "views/bubble/bubble_border.h" namespace views { diff --git a/ui/views/bubble/bubble_frame_view_unittest.cc b/ui/views/bubble/bubble_frame_view_unittest.cc index 6699bfd..bde9f7c 100644 --- a/ui/views/bubble/bubble_frame_view_unittest.cc +++ b/ui/views/bubble/bubble_frame_view_unittest.cc @@ -3,11 +3,11 @@ // found in the LICENSE file. #include "ui/base/hit_test.h" +#include "ui/views/bubble/border_contents_view.h" +#include "ui/views/bubble/bubble_border.h" +#include "ui/views/bubble/bubble_delegate.h" +#include "ui/views/bubble/bubble_frame_view.h" #include "ui/views/test/views_test_base.h" -#include "views/bubble/border_contents_view.h" -#include "views/bubble/bubble_border.h" -#include "views/bubble/bubble_delegate.h" -#include "views/bubble/bubble_frame_view.h" #include "views/widget/widget.h" namespace views { diff --git a/ui/views/desktop/desktop_main.cc b/ui/views/desktop/desktop_main.cc index 96a56fa..9fed7a0 100644 --- a/ui/views/desktop/desktop_main.cc +++ b/ui/views/desktop/desktop_main.cc @@ -11,7 +11,7 @@ #include "ui/base/ui_base_paths.h" #include "ui/views/desktop/desktop_views_delegate.h" #include "ui/views/desktop/desktop_window_view.h" -#include "views/focus/accelerator_handler.h" +#include "ui/views/focus/accelerator_handler.h" #include "views/widget/widget.h" #if defined(OS_WIN) diff --git a/ui/views/desktop/desktop_window_manager.cc b/ui/views/desktop/desktop_window_manager.cc index d812359..0275673 100644 --- a/ui/views/desktop/desktop_window_manager.cc +++ b/ui/views/desktop/desktop_window_manager.cc @@ -7,8 +7,8 @@ #include "ui/base/hit_test.h" #include "ui/gfx/point.h" #include "ui/gfx/rect.h" +#include "ui/views/events/event.h" #include "ui/views/window/non_client_view.h" -#include "views/events/event.h" #include "views/widget/native_widget_private.h" #include "views/widget/native_widget_view.h" #include "views/widget/native_widget_views.h" diff --git a/ui/views/events/event.cc b/ui/views/events/event.cc index 67d165e..433098e 100644 --- a/ui/views/events/event.cc +++ b/ui/views/events/event.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "views/events/event.h" +#include "ui/views/events/event.h" #include "base/logging.h" #include "ui/base/keycodes/keyboard_code_conversion.h" diff --git a/ui/views/events/event_aura.cc b/ui/views/events/event_aura.cc index a4d3169..39ae3f7 100644 --- a/ui/views/events/event_aura.cc +++ b/ui/views/events/event_aura.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 "views/events/event.h" +#include "ui/views/events/event.h" #include "base/logging.h" #include "ui/aura/event.h" diff --git a/ui/views/events/event_gtk.cc b/ui/views/events/event_gtk.cc index fb0c88a..7c67134 100644 --- a/ui/views/events/event_gtk.cc +++ b/ui/views/events/event_gtk.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 "views/events/event.h" +#include "ui/views/events/event.h" #include <gdk/gdk.h> diff --git a/ui/views/events/event_unittest.cc b/ui/views/events/event_unittest.cc index 211877d..867a9a4 100644 --- a/ui/views/events/event_unittest.cc +++ b/ui/views/events/event_unittest.cc @@ -5,7 +5,7 @@ #include "testing/gtest/include/gtest/gtest.h" #include "base/basictypes.h" -#include "views/events/event.h" +#include "ui/views/events/event.h" // Bug 99129. #if defined(USE_AURA) diff --git a/ui/views/events/event_wayland.cc b/ui/views/events/event_wayland.cc index 44998e6..be248d1 100644 --- a/ui/views/events/event_wayland.cc +++ b/ui/views/events/event_wayland.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 "views/events/event.h" +#include "ui/views/events/event.h" #include "base/logging.h" #include "ui/base/keycodes/keyboard_code_conversion.h" diff --git a/ui/views/events/event_win.cc b/ui/views/events/event_win.cc index 03b855e..82a83ed 100644 --- a/ui/views/events/event_win.cc +++ b/ui/views/events/event_win.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 "views/events/event.h" +#include "ui/views/events/event.h" #include "base/logging.h" #include "ui/base/keycodes/keyboard_code_conversion.h" diff --git a/ui/views/events/event_x.cc b/ui/views/events/event_x.cc index 1c9e330..48e7bea 100644 --- a/ui/views/events/event_x.cc +++ b/ui/views/events/event_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 "views/events/event.h" +#include "ui/views/events/event.h" #include <gdk/gdk.h> #include <gdk/gdkx.h> diff --git a/ui/views/examples/bubble_example.cc b/ui/views/examples/bubble_example.cc index 38a3529..70b4357 100644 --- a/ui/views/examples/bubble_example.cc +++ b/ui/views/examples/bubble_example.cc @@ -5,11 +5,11 @@ #include "ui/views/examples/bubble_example.h" #include "base/utf_string_conversions.h" -#include "views/bubble/bubble_delegate.h" +#include "ui/views/bubble/bubble_delegate.h" +#include "ui/views/layout/box_layout.h" +#include "ui/views/layout/fill_layout.h" #include "views/controls/button/text_button.h" #include "views/controls/label.h" -#include "views/layout/box_layout.h" -#include "views/layout/fill_layout.h" #include "views/widget/widget.h" namespace examples { diff --git a/ui/views/examples/button_example.cc b/ui/views/examples/button_example.cc index f3f1c1f..4ef0534 100644 --- a/ui/views/examples/button_example.cc +++ b/ui/views/examples/button_example.cc @@ -7,8 +7,8 @@ #include "base/utf_string_conversions.h" #include "grit/ui_resources.h" #include "ui/base/resource/resource_bundle.h" +#include "ui/views/layout/fill_layout.h" #include "views/controls/button/checkbox.h" -#include "views/layout/fill_layout.h" #include "views/view.h" namespace examples { diff --git a/ui/views/examples/combobox_example.cc b/ui/views/examples/combobox_example.cc index 8e41311..016ae6a 100644 --- a/ui/views/examples/combobox_example.cc +++ b/ui/views/examples/combobox_example.cc @@ -7,7 +7,7 @@ #include "base/stringprintf.h" #include "base/utf_string_conversions.h" #include "ui/base/models/combobox_model.h" -#include "views/layout/fill_layout.h" +#include "ui/views/layout/fill_layout.h" namespace { diff --git a/ui/views/examples/double_split_view_example.cc b/ui/views/examples/double_split_view_example.cc index bd7d756..e2a43bc 100644 --- a/ui/views/examples/double_split_view_example.cc +++ b/ui/views/examples/double_split_view_example.cc @@ -4,8 +4,8 @@ #include "ui/views/examples/double_split_view_example.h" +#include "ui/views/layout/grid_layout.h" #include "views/controls/single_split_view.h" -#include "views/layout/grid_layout.h" namespace { diff --git a/ui/views/examples/examples_main.cc b/ui/views/examples/examples_main.cc index 6718d78..1205196 100644 --- a/ui/views/examples/examples_main.cc +++ b/ui/views/examples/examples_main.cc @@ -32,12 +32,12 @@ #include "ui/views/examples/textfield_example.h" #include "ui/views/examples/throbber_example.h" #include "ui/views/examples/widget_example.h" +#include "ui/views/focus/accelerator_handler.h" +#include "ui/views/layout/grid_layout.h" #include "ui/views/test/test_views_delegate.h" #include "views/controls/button/text_button.h" #include "views/controls/label.h" #include "views/controls/tabbed_pane/tabbed_pane.h" -#include "views/focus/accelerator_handler.h" -#include "views/layout/grid_layout.h" #include "views/widget/widget.h" #if defined(OS_WIN) diff --git a/ui/views/examples/link_example.cc b/ui/views/examples/link_example.cc index 7b81d88..69731ad 100644 --- a/ui/views/examples/link_example.cc +++ b/ui/views/examples/link_example.cc @@ -5,8 +5,8 @@ #include "ui/views/examples/link_example.h" #include "base/utf_string_conversions.h" +#include "ui/views/layout/fill_layout.h" #include "views/controls/link.h" -#include "views/layout/fill_layout.h" #include "views/view.h" namespace examples { diff --git a/ui/views/examples/menu_example.cc b/ui/views/examples/menu_example.cc index 15bfc0d..54346a2 100644 --- a/ui/views/examples/menu_example.cc +++ b/ui/views/examples/menu_example.cc @@ -8,11 +8,11 @@ #include "base/utf_string_conversions.h" #include "ui/base/models/simple_menu_model.h" +#include "ui/views/layout/fill_layout.h" #include "views/controls/button/menu_button.h" #include "views/controls/button/text_button.h" #include "views/controls/menu/menu_2.h" #include "views/controls/menu/view_menu_delegate.h" -#include "views/layout/fill_layout.h" #include "views/view.h" namespace { diff --git a/ui/views/examples/message_box_example.cc b/ui/views/examples/message_box_example.cc index 5da917f..89d4a6c 100644 --- a/ui/views/examples/message_box_example.cc +++ b/ui/views/examples/message_box_example.cc @@ -5,8 +5,8 @@ #include "ui/views/examples/message_box_example.h" #include "base/utf_string_conversions.h" +#include "ui/views/layout/grid_layout.h" #include "views/controls/message_box_view.h" -#include "views/layout/grid_layout.h" #include "views/view.h" namespace examples { diff --git a/ui/views/examples/native_theme_button_example.cc b/ui/views/examples/native_theme_button_example.cc index e11bfcd..d9350ed 100644 --- a/ui/views/examples/native_theme_button_example.cc +++ b/ui/views/examples/native_theme_button_example.cc @@ -13,8 +13,8 @@ #include "ui/base/models/combobox_model.h" #include "ui/gfx/canvas.h" #include "ui/views/examples/example_combobox_model.h" +#include "ui/views/layout/grid_layout.h" #include "views/controls/label.h" -#include "views/layout/grid_layout.h" #include "views/native_theme_painter.h" namespace { diff --git a/ui/views/examples/native_theme_checkbox_example.cc b/ui/views/examples/native_theme_checkbox_example.cc index 8c2bb55..6df2056 100644 --- a/ui/views/examples/native_theme_checkbox_example.cc +++ b/ui/views/examples/native_theme_checkbox_example.cc @@ -6,9 +6,9 @@ #include "base/stringprintf.h" #include "base/utf_string_conversions.h" +#include "ui/views/layout/fill_layout.h" #include "views/controls/button/checkbox.h" #include "views/controls/button/radio_button.h" -#include "views/layout/fill_layout.h" namespace examples { diff --git a/ui/views/examples/progress_bar_example.cc b/ui/views/examples/progress_bar_example.cc index 5fabe7a..14776d5 100644 --- a/ui/views/examples/progress_bar_example.cc +++ b/ui/views/examples/progress_bar_example.cc @@ -5,9 +5,9 @@ #include "ui/views/examples/progress_bar_example.h" #include "base/utf_string_conversions.h" +#include "ui/views/layout/grid_layout.h" #include "views/controls/button/text_button.h" #include "views/controls/progress_bar.h" -#include "views/layout/grid_layout.h" #include "views/view.h" namespace { diff --git a/ui/views/examples/radio_button_example.cc b/ui/views/examples/radio_button_example.cc index 6450248..f501fec 100644 --- a/ui/views/examples/radio_button_example.cc +++ b/ui/views/examples/radio_button_example.cc @@ -6,8 +6,8 @@ #include "base/stringprintf.h" #include "base/utf_string_conversions.h" +#include "ui/views/layout/grid_layout.h" #include "views/controls/button/text_button.h" -#include "views/layout/grid_layout.h" #include "views/view.h" namespace examples { diff --git a/ui/views/examples/scroll_view_example.cc b/ui/views/examples/scroll_view_example.cc index ddd9af9..d085c57 100644 --- a/ui/views/examples/scroll_view_example.cc +++ b/ui/views/examples/scroll_view_example.cc @@ -6,8 +6,8 @@ #include "base/stringprintf.h" #include "base/utf_string_conversions.h" +#include "ui/views/layout/grid_layout.h" #include "views/controls/button/radio_button.h" -#include "views/layout/grid_layout.h" #include "views/view.h" namespace examples { diff --git a/ui/views/examples/single_split_view_example.cc b/ui/views/examples/single_split_view_example.cc index df57373..9f0f7f1 100644 --- a/ui/views/examples/single_split_view_example.cc +++ b/ui/views/examples/single_split_view_example.cc @@ -4,8 +4,8 @@ #include "ui/views/examples/single_split_view_example.h" +#include "ui/views/layout/grid_layout.h" #include "views/controls/single_split_view.h" -#include "views/layout/grid_layout.h" namespace { diff --git a/ui/views/examples/tabbed_pane_example.cc b/ui/views/examples/tabbed_pane_example.cc index 5016e53b..03a7e32 100644 --- a/ui/views/examples/tabbed_pane_example.cc +++ b/ui/views/examples/tabbed_pane_example.cc @@ -5,8 +5,8 @@ #include "ui/views/examples/tabbed_pane_example.h" #include "base/utf_string_conversions.h" +#include "ui/views/layout/grid_layout.h" #include "views/controls/tabbed_pane/tabbed_pane.h" -#include "views/layout/grid_layout.h" namespace examples { diff --git a/ui/views/examples/table2_example.cc b/ui/views/examples/table2_example.cc index 4ee46b8..f60b097 100644 --- a/ui/views/examples/table2_example.cc +++ b/ui/views/examples/table2_example.cc @@ -6,9 +6,9 @@ #include "base/utf_string_conversions.h" #include "third_party/skia/include/core/SkCanvas.h" +#include "ui/views/layout/grid_layout.h" #include "views/controls/button/checkbox.h" #include "views/controls/table/table_view2.h" -#include "views/layout/grid_layout.h" namespace examples { diff --git a/ui/views/examples/table_example.cc b/ui/views/examples/table_example.cc index 06671d4..7073ad3 100644 --- a/ui/views/examples/table_example.cc +++ b/ui/views/examples/table_example.cc @@ -8,8 +8,8 @@ #include "base/utf_string_conversions.h" #include "third_party/skia/include/core/SkCanvas.h" +#include "ui/views/layout/grid_layout.h" #include "views/controls/button/checkbox.h" -#include "views/layout/grid_layout.h" namespace examples { diff --git a/ui/views/examples/text_example.cc b/ui/views/examples/text_example.cc index 3b7c82d..baa7f33 100644 --- a/ui/views/examples/text_example.cc +++ b/ui/views/examples/text_example.cc @@ -9,9 +9,9 @@ #include "ui/gfx/canvas.h" #include "ui/gfx/canvas_skia.h" #include "ui/views/examples/example_combobox_model.h" +#include "ui/views/layout/grid_layout.h" #include "views/controls/button/checkbox.h" #include "views/controls/label.h" -#include "views/layout/grid_layout.h" #include "views/view.h" namespace { diff --git a/ui/views/examples/textfield_example.cc b/ui/views/examples/textfield_example.cc index f9536e5..d4ad38e 100644 --- a/ui/views/examples/textfield_example.cc +++ b/ui/views/examples/textfield_example.cc @@ -7,9 +7,9 @@ #include "base/utf_string_conversions.h" #include "ui/base/range/range.h" #include "ui/gfx/render_text.h" +#include "ui/views/layout/grid_layout.h" #include "views/controls/label.h" #include "views/controls/textfield/textfield.h" -#include "views/layout/grid_layout.h" #include "views/view.h" namespace examples { diff --git a/ui/views/examples/throbber_example.cc b/ui/views/examples/throbber_example.cc index dbba597..2f4e673 100644 --- a/ui/views/examples/throbber_example.cc +++ b/ui/views/examples/throbber_example.cc @@ -4,8 +4,8 @@ #include "ui/views/examples/throbber_example.h" +#include "ui/views/layout/fill_layout.h" #include "views/controls/throbber.h" -#include "views/layout/fill_layout.h" #include "views/view.h" namespace { diff --git a/ui/views/examples/widget_example.cc b/ui/views/examples/widget_example.cc index 07844a0..e1d542e 100644 --- a/ui/views/examples/widget_example.cc +++ b/ui/views/examples/widget_example.cc @@ -5,9 +5,9 @@ #include "ui/views/examples/widget_example.h" #include "base/utf_string_conversions.h" +#include "ui/views/layout/box_layout.h" +#include "ui/views/layout/layout_manager.h" #include "views/controls/button/text_button.h" -#include "views/layout/box_layout.h" -#include "views/layout/layout_manager.h" #include "views/view.h" #include "views/widget/widget.h" diff --git a/views/focus/OWNERS b/ui/views/focus/OWNERS index ed994c6..ed994c6 100644 --- a/views/focus/OWNERS +++ b/ui/views/focus/OWNERS diff --git a/ui/views/focus/accelerator_handler_aura.cc b/ui/views/focus/accelerator_handler_aura.cc index ab552899..274de1e 100644 --- a/ui/views/focus/accelerator_handler_aura.cc +++ b/ui/views/focus/accelerator_handler_aura.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 "views/focus/accelerator_handler.h" +#include "ui/views/focus/accelerator_handler.h" namespace views { diff --git a/ui/views/focus/accelerator_handler_gtk.cc b/ui/views/focus/accelerator_handler_gtk.cc index fab3b86..2191686 100644 --- a/ui/views/focus/accelerator_handler_gtk.cc +++ b/ui/views/focus/accelerator_handler_gtk.cc @@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "views/focus/accelerator_handler.h" +#include "ui/views/focus/accelerator_handler.h" #include <gtk/gtk.h> -#include "views/focus/focus_manager.h" +#include "ui/views/focus/focus_manager.h" namespace views { diff --git a/ui/views/focus/accelerator_handler_gtk_unittest.cc b/ui/views/focus/accelerator_handler_gtk_unittest.cc index 098325d..f549b9c 100644 --- a/ui/views/focus/accelerator_handler_gtk_unittest.cc +++ b/ui/views/focus/accelerator_handler_gtk_unittest.cc @@ -5,10 +5,10 @@ #include <gdk/gdkkeysyms.h> #include "testing/gtest/include/gtest/gtest.h" -#include "ui/gfx/rect.h" #include "ui/base/models/accelerator.h" -#include "views/focus/accelerator_handler.h" -#include "views/focus/focus_manager.h" +#include "ui/gfx/rect.h" +#include "ui/views/focus/accelerator_handler.h" +#include "ui/views/focus/focus_manager.h" #include "views/view.h" #include "views/widget/widget.h" #include "views/widget/widget_delegate.h" diff --git a/ui/views/focus/accelerator_handler_touch.cc b/ui/views/focus/accelerator_handler_touch.cc index 1c4c9b3..5012dc2 100644 --- a/ui/views/focus/accelerator_handler_touch.cc +++ b/ui/views/focus/accelerator_handler_touch.cc @@ -2,16 +2,17 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "views/focus/accelerator_handler.h" +#include "ui/views/focus/accelerator_handler.h" -#include <bitset> -#include <gtk/gtk.h> #include <X11/extensions/XInput2.h> +#include <gtk/gtk.h> + +#include <bitset> #include "ui/base/touch/touch_factory.h" +#include "ui/views/events/event.h" +#include "ui/views/focus/focus_manager.h" #include "ui/views/ime/input_method.h" -#include "views/events/event.h" -#include "views/focus/focus_manager.h" #include "views/view.h" #include "views/widget/native_widget.h" diff --git a/ui/views/focus/accelerator_handler_wayland.cc b/ui/views/focus/accelerator_handler_wayland.cc index a8963ee..167ae68 100644 --- a/ui/views/focus/accelerator_handler_wayland.cc +++ b/ui/views/focus/accelerator_handler_wayland.cc @@ -2,9 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "views/focus/accelerator_handler.h" +#include "ui/views/focus/accelerator_handler.h" -#include "views/focus/focus_manager.h" +#include "ui/views/focus/focus_manager.h" namespace views { diff --git a/ui/views/focus/accelerator_handler_win.cc b/ui/views/focus/accelerator_handler_win.cc index 8f2c8e8..f923cd0 100644 --- a/ui/views/focus/accelerator_handler_win.cc +++ b/ui/views/focus/accelerator_handler_win.cc @@ -2,12 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "views/focus/accelerator_handler.h" +#include "ui/views/focus/accelerator_handler.h" -#include "ui/base/keycodes/keyboard_codes.h" #include "ui/base/keycodes/keyboard_code_conversion_win.h" -#include "views/events/event.h" -#include "views/focus/focus_manager.h" +#include "ui/base/keycodes/keyboard_codes.h" +#include "ui/views/events/event.h" +#include "ui/views/focus/focus_manager.h" #include "views/widget/widget.h" namespace views { diff --git a/ui/views/focus/external_focus_tracker.cc b/ui/views/focus/external_focus_tracker.cc index 193b57e..7e58bc6 100644 --- a/ui/views/focus/external_focus_tracker.cc +++ b/ui/views/focus/external_focus_tracker.cc @@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "views/focus/external_focus_tracker.h" +#include "ui/views/focus/external_focus_tracker.h" #include "base/logging.h" +#include "ui/views/focus/view_storage.h" #include "views/view.h" -#include "views/focus/view_storage.h" namespace views { diff --git a/ui/views/focus/external_focus_tracker.h b/ui/views/focus/external_focus_tracker.h index 0ea1479..d8493c7 100644 --- a/ui/views/focus/external_focus_tracker.h +++ b/ui/views/focus/external_focus_tracker.h @@ -6,7 +6,7 @@ #define UI_VIEWS_FOCUS_EXTERNAL_FOCUS_TRACKER_H_ #pragma once -#include "views/focus/focus_manager.h" +#include "ui/views/focus/focus_manager.h" namespace views { diff --git a/ui/views/focus/focus_manager.cc b/ui/views/focus/focus_manager.cc index 3ee0755..268623b 100644 --- a/ui/views/focus/focus_manager.cc +++ b/ui/views/focus/focus_manager.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "views/focus/focus_manager.h" +#include "ui/views/focus/focus_manager.h" #include <algorithm> @@ -12,9 +12,9 @@ #include "ui/base/accelerator_manager.h" #include "ui/base/keycodes/keyboard_codes.h" #include "ui/base/models/accelerator.h" -#include "views/focus/focus_search.h" -#include "views/focus/view_storage.h" -#include "views/focus/widget_focus_manager.h" +#include "ui/views/focus/focus_search.h" +#include "ui/views/focus/view_storage.h" +#include "ui/views/focus/widget_focus_manager.h" #include "views/view.h" #include "views/widget/root_view.h" #include "views/widget/widget.h" diff --git a/ui/views/focus/focus_manager.h b/ui/views/focus/focus_manager.h index 0fdecc1..01899e1 100644 --- a/ui/views/focus/focus_manager.h +++ b/ui/views/focus/focus_manager.h @@ -14,8 +14,8 @@ #include "base/observer_list.h" #include "ui/base/models/accelerator.h" #include "ui/gfx/native_widget_types.h" +#include "ui/views/events/event.h" #include "views/views_export.h" -#include "views/events/event.h" // The FocusManager class is used to handle focus traversal, store/restore // focused views and handle keyboard accelerators. diff --git a/ui/views/focus/focus_manager_factory.cc b/ui/views/focus/focus_manager_factory.cc index 457f60b..e3ec805 100644 --- a/ui/views/focus/focus_manager_factory.cc +++ b/ui/views/focus/focus_manager_factory.cc @@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "views/focus/focus_manager_factory.h" +#include "ui/views/focus/focus_manager_factory.h" #include "base/compiler_specific.h" -#include "views/focus/focus_manager.h" +#include "ui/views/focus/focus_manager.h" namespace { diff --git a/ui/views/focus/focus_manager_unittest.cc b/ui/views/focus/focus_manager_unittest.cc index d4372f2..a0420e9 100644 --- a/ui/views/focus/focus_manager_unittest.cc +++ b/ui/views/focus/focus_manager_unittest.cc @@ -11,6 +11,8 @@ #include "ui/base/models/accelerator.h" #include "ui/base/models/combobox_model.h" #include "ui/gfx/rect.h" +#include "ui/views/focus/accelerator_handler.h" +#include "ui/views/focus/focus_manager_factory.h" #include "ui/views/test/views_test_base.h" #include "ui/views/window/non_client_view.h" #include "views/background.h" @@ -26,8 +28,6 @@ #include "views/controls/tabbed_pane/native_tabbed_pane_wrapper.h" #include "views/controls/tabbed_pane/tabbed_pane.h" #include "views/controls/textfield/textfield.h" -#include "views/focus/accelerator_handler.h" -#include "views/focus/focus_manager_factory.h" #include "views/widget/root_view.h" #include "views/widget/widget.h" #include "views/widget/widget_delegate.h" diff --git a/ui/views/focus/focus_search.cc b/ui/views/focus/focus_search.cc index eac3f21..e1f3c7b 100644 --- a/ui/views/focus/focus_search.cc +++ b/ui/views/focus/focus_search.cc @@ -3,8 +3,8 @@ // found in the LICENSE file. #include "base/logging.h" -#include "views/focus/focus_manager.h" -#include "views/focus/focus_search.h" +#include "ui/views/focus/focus_manager.h" +#include "ui/views/focus/focus_search.h" #include "views/view.h" namespace views { diff --git a/ui/views/focus/view_storage.cc b/ui/views/focus/view_storage.cc index 3b9ec10..ae17c73 100644 --- a/ui/views/focus/view_storage.cc +++ b/ui/views/focus/view_storage.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 "views/focus/view_storage.h" +#include "ui/views/focus/view_storage.h" #include <algorithm> diff --git a/ui/views/focus/widget_focus_manager.cc b/ui/views/focus/widget_focus_manager.cc index 57cd2cd..d2b67d7 100644 --- a/ui/views/focus/widget_focus_manager.cc +++ b/ui/views/focus/widget_focus_manager.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "views/focus/widget_focus_manager.h" +#include "ui/views/focus/widget_focus_manager.h" #include "base/memory/singleton.h" diff --git a/ui/views/ime/input_method_base.h b/ui/views/ime/input_method_base.h index cdecbda..da2e459 100644 --- a/ui/views/ime/input_method_base.h +++ b/ui/views/ime/input_method_base.h @@ -8,9 +8,9 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" +#include "ui/views/focus/focus_manager.h" #include "ui/views/ime/input_method.h" #include "ui/views/ime/input_method_delegate.h" -#include "views/focus/focus_manager.h" namespace gfx { class Rect; diff --git a/ui/views/ime/input_method_gtk.cc b/ui/views/ime/input_method_gtk.cc index edaa20e..9de362b 100644 --- a/ui/views/ime/input_method_gtk.cc +++ b/ui/views/ime/input_method_gtk.cc @@ -19,7 +19,7 @@ #include "ui/base/gtk/gtk_im_context_util.h" #include "ui/base/keycodes/keyboard_code_conversion_gtk.h" #include "ui/base/keycodes/keyboard_codes.h" -#include "views/events/event.h" +#include "ui/views/events/event.h" #include "views/widget/widget.h" namespace views { diff --git a/ui/views/ime/input_method_ibus.cc b/ui/views/ime/input_method_ibus.cc index 9fa9525..82b1455 100644 --- a/ui/views/ime/input_method_ibus.cc +++ b/ui/views/ime/input_method_ibus.cc @@ -25,7 +25,7 @@ #include "ui/base/keycodes/keyboard_codes.h" #include "ui/gfx/point.h" #include "ui/gfx/rect.h" -#include "views/events/event.h" +#include "ui/views/events/event.h" #include "views/widget/widget.h" #if defined(USE_AURA) || defined(TOUCH_UI) diff --git a/ui/views/ime/input_method_ibus.h b/ui/views/ime/input_method_ibus.h index 8d7b591..c4b516b 100644 --- a/ui/views/ime/input_method_ibus.h +++ b/ui/views/ime/input_method_ibus.h @@ -17,8 +17,8 @@ #include "ui/base/ime/character_composer.h" #include "ui/base/ime/composition_text.h" #include "ui/base/ime/text_input_client.h" +#include "ui/views/events/event.h" #include "ui/views/ime/input_method_base.h" -#include "views/events/event.h" #include "views/view.h" // Forward declarations, so that we don't need to include ibus.h in this file. diff --git a/ui/views/ime/input_method_win.cc b/ui/views/ime/input_method_win.cc index 1bc56b1..5411e3f 100644 --- a/ui/views/ime/input_method_win.cc +++ b/ui/views/ime/input_method_win.cc @@ -10,7 +10,7 @@ #include "ui/base/ime/composition_text.h" #include "ui/base/ime/text_input_client.h" #include "ui/base/keycodes/keyboard_codes.h" -#include "views/events/event.h" +#include "ui/views/events/event.h" // Extra number of chars before and after selection (or composition) range which // is returned to IME for improving conversion accuracy. diff --git a/ui/views/ime/mock_input_method.cc b/ui/views/ime/mock_input_method.cc index 52a5912..8365f74 100644 --- a/ui/views/ime/mock_input_method.cc +++ b/ui/views/ime/mock_input_method.cc @@ -8,7 +8,7 @@ #include "base/logging.h" #include "ui/base/ime/text_input_client.h" #include "ui/base/keycodes/keyboard_codes.h" -#include "views/events/event.h" +#include "ui/views/events/event.h" #include "views/widget/widget.h" namespace views { diff --git a/ui/views/layout/box_layout.cc b/ui/views/layout/box_layout.cc index 5441e87..7471b4c 100644 --- a/ui/views/layout/box_layout.cc +++ b/ui/views/layout/box_layout.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 "views/layout/box_layout.h" +#include "ui/views/layout/box_layout.h" #include "ui/gfx/insets.h" #include "ui/gfx/rect.h" diff --git a/ui/views/layout/box_layout.h b/ui/views/layout/box_layout.h index 81e5a94..7235119 100644 --- a/ui/views/layout/box_layout.h +++ b/ui/views/layout/box_layout.h @@ -8,7 +8,7 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" -#include "views/layout/layout_manager.h" +#include "ui/views/layout/layout_manager.h" namespace gfx { class Size; diff --git a/ui/views/layout/box_layout_unittest.cc b/ui/views/layout/box_layout_unittest.cc index 12ea2b5..0430c0c 100644 --- a/ui/views/layout/box_layout_unittest.cc +++ b/ui/views/layout/box_layout_unittest.cc @@ -3,7 +3,7 @@ // found in the LICENSE file. #include "testing/gtest/include/gtest/gtest.h" -#include "views/layout/box_layout.h" +#include "ui/views/layout/box_layout.h" #include "views/view.h" class StaticSizedView : public views::View { diff --git a/ui/views/layout/fill_layout.cc b/ui/views/layout/fill_layout.cc index 13fbcce..65c397b 100644 --- a/ui/views/layout/fill_layout.cc +++ b/ui/views/layout/fill_layout.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 "views/layout/fill_layout.h" +#include "ui/views/layout/fill_layout.h" #include "base/logging.h" diff --git a/ui/views/layout/fill_layout.h b/ui/views/layout/fill_layout.h index 604d9b5..c57adf0 100644 --- a/ui/views/layout/fill_layout.h +++ b/ui/views/layout/fill_layout.h @@ -6,7 +6,7 @@ #define UI_VIEWS_LAYOUT_FILL_LAYOUT_H_ #pragma once -#include "views/layout/layout_manager.h" +#include "ui/views/layout/layout_manager.h" #include "views/view.h" namespace views { diff --git a/ui/views/layout/grid_layout.cc b/ui/views/layout/grid_layout.cc index 55a50ceb..7444b8b 100644 --- a/ui/views/layout/grid_layout.cc +++ b/ui/views/layout/grid_layout.cc @@ -2,14 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "views/layout/grid_layout.h" +#include "ui/views/layout/grid_layout.h" #include <algorithm> #include "base/logging.h" #include "base/stl_util.h" #include "ui/gfx/insets.h" -#include "views/layout/layout_constants.h" +#include "ui/views/layout/layout_constants.h" #include "views/view.h" namespace views { diff --git a/ui/views/layout/grid_layout.h b/ui/views/layout/grid_layout.h index 6c38585..ea0aba7 100644 --- a/ui/views/layout/grid_layout.h +++ b/ui/views/layout/grid_layout.h @@ -9,7 +9,7 @@ #include <string> #include <vector> -#include "views/layout/layout_manager.h" +#include "ui/views/layout/layout_manager.h" #include "views/view.h" namespace gfx { diff --git a/ui/views/layout/grid_layout_unittest.cc b/ui/views/layout/grid_layout_unittest.cc index 542d7c5..d7911c6 100644 --- a/ui/views/layout/grid_layout_unittest.cc +++ b/ui/views/layout/grid_layout_unittest.cc @@ -3,7 +3,7 @@ // found in the LICENSE file. #include "testing/gtest/include/gtest/gtest.h" -#include "views/layout/grid_layout.h" +#include "ui/views/layout/grid_layout.h" #include "views/view.h" using views::ColumnSet; diff --git a/ui/views/layout/layout_manager.cc b/ui/views/layout/layout_manager.cc index c62c6bb..f2b4e8a 100644 --- a/ui/views/layout/layout_manager.cc +++ b/ui/views/layout/layout_manager.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "views/layout/layout_manager.h" +#include "ui/views/layout/layout_manager.h" #include "views/view.h" diff --git a/ui/views/touchui/gesture_manager.cc b/ui/views/touchui/gesture_manager.cc index e935a46..0508592 100644 --- a/ui/views/touchui/gesture_manager.cc +++ b/ui/views/touchui/gesture_manager.cc @@ -9,7 +9,7 @@ #endif #include "base/logging.h" -#include "views/events/event.h" +#include "ui/views/events/event.h" #include "views/view.h" #include "views/views_delegate.h" #include "views/widget/widget.h" diff --git a/ui/views/touchui/touch_selection_controller_impl.cc b/ui/views/touchui/touch_selection_controller_impl.cc index 8fb532f..30f94cc 100644 --- a/ui/views/touchui/touch_selection_controller_impl.cc +++ b/ui/views/touchui/touch_selection_controller_impl.cc @@ -17,13 +17,13 @@ #include "ui/gfx/screen.h" #include "ui/gfx/size.h" #include "ui/gfx/transform.h" +#include "ui/views/layout/box_layout.h" #include "views/background.h" #include "views/controls/button/button.h" #include "views/controls/button/custom_button.h" #include "views/controls/button/text_button.h" #include "views/controls/label.h" #include "views/controls/menu/menu_config.h" -#include "views/layout/box_layout.h" #include "views/widget/widget.h" namespace { diff --git a/ui/views/window/dialog_client_view.cc b/ui/views/window/dialog_client_view.cc index 46c9d03..610ae8d 100644 --- a/ui/views/window/dialog_client_view.cc +++ b/ui/views/window/dialog_client_view.cc @@ -24,9 +24,9 @@ #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/canvas_skia.h" #include "ui/gfx/font.h" +#include "ui/views/layout/layout_constants.h" #include "ui/views/window/dialog_delegate.h" #include "views/controls/button/text_button.h" -#include "views/layout/layout_constants.h" #include "views/widget/root_view.h" #include "views/widget/widget.h" diff --git a/ui/views/window/dialog_client_view.h b/ui/views/window/dialog_client_view.h index 7ea9720..6602709 100644 --- a/ui/views/window/dialog_client_view.h +++ b/ui/views/window/dialog_client_view.h @@ -7,9 +7,9 @@ #pragma once #include "ui/gfx/font.h" +#include "ui/views/focus/focus_manager.h" #include "ui/views/window/client_view.h" #include "views/controls/button/button.h" -#include "views/focus/focus_manager.h" namespace views { diff --git a/views/accessible_pane_view.cc b/views/accessible_pane_view.cc index 2131991..425523a 100644 --- a/views/accessible_pane_view.cc +++ b/views/accessible_pane_view.cc @@ -5,8 +5,8 @@ #include "views/accessible_pane_view.h" #include "ui/base/accessibility/accessible_view_state.h" -#include "views/focus/focus_search.h" -#include "views/focus/view_storage.h" +#include "ui/views/focus/focus_search.h" +#include "ui/views/focus/view_storage.h" #include "views/widget/widget.h" namespace views { diff --git a/views/accessible_pane_view.h b/views/accessible_pane_view.h index a94c4af..80c098b 100644 --- a/views/accessible_pane_view.h +++ b/views/accessible_pane_view.h @@ -10,7 +10,7 @@ #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "ui/base/models/accelerator.h" -#include "views/focus/focus_manager.h" +#include "ui/views/focus/focus_manager.h" #include "views/view.h" namespace views { diff --git a/views/accessible_pane_view_unittest.cc b/views/accessible_pane_view_unittest.cc index b702b32..bc88aa4 100644 --- a/views/accessible_pane_view_unittest.cc +++ b/views/accessible_pane_view_unittest.cc @@ -5,9 +5,9 @@ #include "views/accessible_pane_view.h" #include "ui/base/models/accelerator.h" +#include "ui/views/layout/fill_layout.h" #include "ui/views/test/views_test_base.h" #include "views/controls/button/text_button.h" -#include "views/layout/fill_layout.h" #include "views/widget/widget.h" namespace views { diff --git a/views/bubble/border_contents_view.h b/views/bubble/border_contents_view.h deleted file mode 100644 index a6c1bf2..0000000 --- a/views/bubble/border_contents_view.h +++ /dev/null @@ -1,12 +0,0 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef VIEWS_BUBBLE_BORDER_CONTENTS_VIEW_H_ -#define VIEWS_BUBBLE_BORDER_CONTENTS_VIEW_H_ -#pragma once - -#include "ui/views/bubble/border_contents_view.h" -// TODO(tfarina): remove this file once all includes have been updated. - -#endif // VIEWS_BUBBLE_BORDER_CONTENTS_VIEW_H_ diff --git a/views/bubble/bubble_border.h b/views/bubble/bubble_border.h deleted file mode 100644 index 5612eb70..0000000 --- a/views/bubble/bubble_border.h +++ /dev/null @@ -1,12 +0,0 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef VIEWS_BUBBLE_BUBBLE_BORDER_H_ -#define VIEWS_BUBBLE_BUBBLE_BORDER_H_ -#pragma once - -#include "ui/views/bubble/bubble_border.h" -// TODO(tfarina): remove this file once all includes have been updated. - -#endif // VIEWS_BUBBLE_BUBBLE_BORDER_H_ diff --git a/views/bubble/bubble_delegate.h b/views/bubble/bubble_delegate.h deleted file mode 100644 index c533220..0000000 --- a/views/bubble/bubble_delegate.h +++ /dev/null @@ -1,12 +0,0 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef VIEWS_BUBBLE_BUBBLE_DELEGATE_H_ -#define VIEWS_BUBBLE_BUBBLE_DELEGATE_H_ -#pragma once - -#include "ui/views/bubble/bubble_delegate.h" -// TODO(tfarina): remove this file once all includes have been updated. - -#endif // VIEWS_BUBBLE_BUBBLE_DELEGATE_H_ diff --git a/views/bubble/bubble_frame_view.h b/views/bubble/bubble_frame_view.h deleted file mode 100644 index 268e1a2..0000000 --- a/views/bubble/bubble_frame_view.h +++ /dev/null @@ -1,12 +0,0 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef VIEWS_BUBBLE_BUBBLE_FRAME_VIEW_H_ -#define VIEWS_BUBBLE_BUBBLE_FRAME_VIEW_H_ -#pragma once - -#include "ui/views/bubble/bubble_frame_view.h" -// TODO(tfarina): remove this file once all includes have been updated. - -#endif // VIEWS_BUBBLE_BUBBLE_FRAME_VIEW_H_ diff --git a/views/controls/button/menu_button.cc b/views/controls/button/menu_button.cc index 50af173..fc6afaa 100644 --- a/views/controls/button/menu_button.cc +++ b/views/controls/button/menu_button.cc @@ -13,9 +13,9 @@ #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/canvas.h" #include "ui/gfx/screen.h" +#include "ui/views/events/event.h" #include "views/controls/button/button.h" #include "views/controls/menu/view_menu_delegate.h" -#include "views/events/event.h" #include "views/widget/root_view.h" #include "views/widget/widget.h" diff --git a/views/controls/button/text_button.cc b/views/controls/button/text_button.cc index 0c5b9cc..12f28f5 100644 --- a/views/controls/button/text_button.cc +++ b/views/controls/button/text_button.cc @@ -11,8 +11,8 @@ #include "ui/base/animation/throb_animation.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/canvas_skia.h" +#include "ui/views/events/event.h" #include "views/controls/button/button.h" -#include "views/events/event.h" #include "views/widget/widget.h" #if defined(OS_WIN) diff --git a/views/controls/link.cc b/views/controls/link.cc index 4f71741..8565bdf 100644 --- a/views/controls/link.cc +++ b/views/controls/link.cc @@ -16,8 +16,8 @@ #include "ui/base/keycodes/keyboard_codes.h" #include "ui/gfx/color_utils.h" #include "ui/gfx/font.h" +#include "ui/views/events/event.h" #include "views/controls/link_listener.h" -#include "views/events/event.h" #if defined(TOOLKIT_USES_GTK) #include "ui/gfx/gtk_util.h" diff --git a/views/controls/menu/menu_controller.cc b/views/controls/menu/menu_controller.cc index 3269c62..37b98b1 100644 --- a/views/controls/menu/menu_controller.cc +++ b/views/controls/menu/menu_controller.cc @@ -33,7 +33,7 @@ #endif #if defined(TOUCH_UI) -#include "views/focus/accelerator_handler.h" +#include "ui/views/focus/accelerator_handler.h" #endif using base::Time; diff --git a/views/controls/menu/menu_delegate.h b/views/controls/menu/menu_delegate.h index dc29eb8..a787be6 100644 --- a/views/controls/menu/menu_delegate.h +++ b/views/controls/menu/menu_delegate.h @@ -13,8 +13,8 @@ #include "base/string16.h" #include "ui/base/dragdrop/drag_drop_types.h" #include "ui/base/dragdrop/os_exchange_data.h" +#include "ui/views/events/event.h" #include "views/controls/menu/menu_item_view.h" -#include "views/events/event.h" using ui::OSExchangeData; diff --git a/views/controls/menu/nested_dispatcher_gtk.cc b/views/controls/menu/nested_dispatcher_gtk.cc index 688df9b..6504acc 100644 --- a/views/controls/menu/nested_dispatcher_gtk.cc +++ b/views/controls/menu/nested_dispatcher_gtk.cc @@ -5,7 +5,7 @@ #include "views/controls/menu/nested_dispatcher_gtk.h" #if defined(TOUCH_UI) -#include "views/focus/accelerator_handler.h" +#include "ui/views/focus/accelerator_handler.h" #endif namespace views { diff --git a/views/controls/message_box_view.cc b/views/controls/message_box_view.cc index 216853c..be8a305 100644 --- a/views/controls/message_box_view.cc +++ b/views/controls/message_box_view.cc @@ -11,13 +11,13 @@ #include "ui/base/clipboard/clipboard.h" #include "ui/base/clipboard/scoped_clipboard_writer.h" #include "ui/base/message_box_flags.h" +#include "ui/views/layout/grid_layout.h" +#include "ui/views/layout/layout_constants.h" #include "ui/views/window/client_view.h" #include "views/controls/button/checkbox.h" #include "views/controls/image_view.h" #include "views/controls/label.h" #include "views/controls/textfield/textfield.h" -#include "views/layout/grid_layout.h" -#include "views/layout/layout_constants.h" #include "views/views_delegate.h" #include "views/widget/widget.h" diff --git a/views/controls/native/native_view_host_gtk.cc b/views/controls/native/native_view_host_gtk.cc index adc21d5..cdb8290 100644 --- a/views/controls/native/native_view_host_gtk.cc +++ b/views/controls/native/native_view_host_gtk.cc @@ -5,12 +5,13 @@ #include "views/controls/native/native_view_host_gtk.h" #include <gtk/gtk.h> + #include <algorithm> #include "base/logging.h" #include "views/controls/native/native_view_host.h" #include "views/controls/native/native_view_host_views.h" -#include "views/focus/focus_manager.h" +#include "ui/views/focus/focus_manager.h" #include "views/views_delegate.h" #include "views/widget/gtk_views_fixed.h" #include "views/widget/native_widget_gtk.h" diff --git a/views/controls/native/native_view_host_views.cc b/views/controls/native/native_view_host_views.cc index 06ca63a..56e6e37 100644 --- a/views/controls/native/native_view_host_views.cc +++ b/views/controls/native/native_view_host_views.cc @@ -6,8 +6,8 @@ #include "base/logging.h" #include "ui/gfx/canvas.h" +#include "ui/views/focus/focus_manager.h" #include "views/controls/native/native_view_host.h" -#include "views/focus/focus_manager.h" #include "views/widget/root_view.h" #include "views/widget/widget.h" diff --git a/views/controls/native/native_view_host_win.cc b/views/controls/native/native_view_host_win.cc index 6e77f2a..d02bd9f 100644 --- a/views/controls/native/native_view_host_win.cc +++ b/views/controls/native/native_view_host_win.cc @@ -8,8 +8,8 @@ #include "base/logging.h" #include "ui/gfx/canvas.h" +#include "ui/views/focus/focus_manager.h" #include "views/controls/native/native_view_host.h" -#include "views/focus/focus_manager.h" #include "views/widget/native_widget.h" #include "views/widget/root_view.h" #include "views/widget/widget.h" diff --git a/views/controls/native_control.cc b/views/controls/native_control.cc index 9958be2..f1550b8 100644 --- a/views/controls/native_control.cc +++ b/views/controls/native_control.cc @@ -18,10 +18,10 @@ #include "ui/base/l10n/l10n_util_win.h" #include "ui/base/view_prop.h" #include "ui/base/win/hwnd_util.h" +#include "ui/views/focus/focus_manager.h" #include "views/background.h" #include "views/border.h" #include "views/controls/native/native_view_host.h" -#include "views/focus/focus_manager.h" #include "views/widget/widget.h" using ui::ViewProp; diff --git a/views/controls/native_control_gtk.cc b/views/controls/native_control_gtk.cc index a798bc6..c1ec850 100644 --- a/views/controls/native_control_gtk.cc +++ b/views/controls/native_control_gtk.cc @@ -8,7 +8,7 @@ #include "base/logging.h" #include "ui/base/accessibility/accessibility_types.h" -#include "views/focus/focus_manager.h" +#include "ui/views/focus/focus_manager.h" #include "views/widget/widget.h" #if defined(TOUCH_UI) diff --git a/views/controls/native_control_win.cc b/views/controls/native_control_win.cc index 4a450f0..4b10afe 100644 --- a/views/controls/native_control_win.cc +++ b/views/controls/native_control_win.cc @@ -11,8 +11,8 @@ #include "ui/base/l10n/l10n_util_win.h" #include "ui/base/view_prop.h" #include "ui/base/win/hwnd_util.h" +#include "ui/views/focus/focus_manager.h" #include "views/controls/combobox/combobox.h" -#include "views/focus/focus_manager.h" #include "views/widget/widget.h" using ui::ViewProp; diff --git a/views/controls/tabbed_pane/native_tabbed_pane_gtk.cc b/views/controls/tabbed_pane/native_tabbed_pane_gtk.cc index 63d3d5e..1eaf48e 100644 --- a/views/controls/tabbed_pane/native_tabbed_pane_gtk.cc +++ b/views/controls/tabbed_pane/native_tabbed_pane_gtk.cc @@ -12,10 +12,10 @@ #include "ui/gfx/canvas.h" #include "ui/gfx/font.h" #include "ui/gfx/skia_utils_gtk.h" +#include "ui/views/layout/fill_layout.h" #include "views/background.h" #include "views/controls/tabbed_pane/tabbed_pane.h" #include "views/controls/tabbed_pane/tabbed_pane_listener.h" -#include "views/layout/fill_layout.h" #include "views/widget/native_widget.h" #include "views/widget/widget.h" diff --git a/views/controls/tabbed_pane/native_tabbed_pane_win.cc b/views/controls/tabbed_pane/native_tabbed_pane_win.cc index e975e4a..654be79 100644 --- a/views/controls/tabbed_pane/native_tabbed_pane_win.cc +++ b/views/controls/tabbed_pane/native_tabbed_pane_win.cc @@ -14,9 +14,9 @@ #include "ui/gfx/canvas_skia.h" #include "ui/gfx/font.h" #include "ui/gfx/native_theme_win.h" +#include "ui/views/layout/fill_layout.h" #include "views/controls/tabbed_pane/tabbed_pane.h" #include "views/controls/tabbed_pane/tabbed_pane_listener.h" -#include "views/layout/fill_layout.h" #include "views/widget/root_view.h" #include "views/widget/widget.h" diff --git a/views/controls/textfield/native_textfield_views.cc b/views/controls/textfield/native_textfield_views.cc index ccde435..fa22340 100644 --- a/views/controls/textfield/native_textfield_views.cc +++ b/views/controls/textfield/native_textfield_views.cc @@ -18,6 +18,7 @@ #include "ui/gfx/canvas.h" #include "ui/gfx/insets.h" #include "ui/gfx/render_text.h" +#include "ui/views/events/event.h" #include "ui/views/ime/input_method.h" #include "views/background.h" #include "views/border.h" @@ -28,7 +29,6 @@ #include "views/controls/textfield/textfield.h" #include "views/controls/textfield/textfield_controller.h" #include "views/controls/textfield/textfield_views_model.h" -#include "views/events/event.h" #include "views/metrics.h" #include "views/views_delegate.h" #include "views/widget/widget.h" diff --git a/views/controls/textfield/native_textfield_views_unittest.cc b/views/controls/textfield/native_textfield_views_unittest.cc index dba7b43..aa1e20d 100644 --- a/views/controls/textfield/native_textfield_views_unittest.cc +++ b/views/controls/textfield/native_textfield_views_unittest.cc @@ -21,6 +21,8 @@ #include "ui/base/keycodes/keyboard_codes.h" #include "ui/base/l10n/l10n_util.h" #include "ui/gfx/render_text.h" +#include "ui/views/events/event.h" +#include "ui/views/focus/focus_manager.h" #include "ui/views/ime/mock_input_method.h" #include "ui/views/test/test_views_delegate.h" #include "ui/views/test/views_test_base.h" @@ -28,8 +30,6 @@ #include "views/controls/textfield/textfield.h" #include "views/controls/textfield/textfield_controller.h" #include "views/controls/textfield/textfield_views_model.h" -#include "views/events/event.h" -#include "views/focus/focus_manager.h" #include "views/views_delegate.h" #include "views/widget/native_widget_private.h" #include "views/widget/widget.h" diff --git a/views/controls/textfield/native_textfield_win.cc b/views/controls/textfield/native_textfield_win.cc index 0b0c6f6..e0ef11f 100644 --- a/views/controls/textfield/native_textfield_win.cc +++ b/views/controls/textfield/native_textfield_win.cc @@ -23,6 +23,7 @@ #include "ui/base/range/range.h" #include "ui/base/win/mouse_wheel_util.h" #include "ui/gfx/native_theme_win.h" +#include "ui/views/focus/focus_manager.h" #include "views/controls/label.h" #include "views/controls/menu/menu_2.h" #include "views/controls/menu/menu_win.h" @@ -30,7 +31,6 @@ #include "views/controls/textfield/native_textfield_views.h" #include "views/controls/textfield/textfield.h" #include "views/controls/textfield/textfield_controller.h" -#include "views/focus/focus_manager.h" #include "views/metrics.h" #include "views/views_delegate.h" #include "views/widget/widget.h" diff --git a/views/controls/tree/tree_view.cc b/views/controls/tree/tree_view.cc index c0a4c657..18fdc85 100644 --- a/views/controls/tree/tree_view.cc +++ b/views/controls/tree/tree_view.cc @@ -23,7 +23,7 @@ #include "ui/gfx/favicon_size.h" #include "ui/gfx/icon_util.h" #include "ui/gfx/point.h" -#include "views/focus/focus_manager.h" +#include "ui/views/focus/focus_manager.h" #include "views/widget/widget.h" using ui::TreeModel; diff --git a/views/events/event.h b/views/events/event.h deleted file mode 100644 index 015eb08..0000000 --- a/views/events/event.h +++ /dev/null @@ -1,12 +0,0 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef VIEWS_EVENTS_EVENT_H_ -#define VIEWS_EVENTS_EVENT_H_ -#pragma once - -#include "ui/views/events/event.h" -// TODO(tfarina): remove this file once all includes have been updated. - -#endif // VIEWS_EVENTS_EVENT_H_ diff --git a/views/focus/accelerator_handler.h b/views/focus/accelerator_handler.h deleted file mode 100644 index 5eef62a..0000000 --- a/views/focus/accelerator_handler.h +++ /dev/null @@ -1,12 +0,0 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef VIEWS_FOCUS_ACCELERATOR_HANDLER_H_ -#define VIEWS_FOCUS_ACCELERATOR_HANDLER_H_ -#pragma once - -#include "ui/views/focus/accelerator_handler.h" -// TODO(tfarina): remove this file once all includes have been updated. - -#endif // VIEWS_FOCUS_ACCELERATOR_HANDLER_H_ diff --git a/views/focus/external_focus_tracker.h b/views/focus/external_focus_tracker.h deleted file mode 100644 index b350c9c..0000000 --- a/views/focus/external_focus_tracker.h +++ /dev/null @@ -1,12 +0,0 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef VIEWS_FOCUS_EXTERNAL_FOCUS_TRACKER_H_ -#define VIEWS_FOCUS_EXTERNAL_FOCUS_TRACKER_H_ -#pragma once - -#include "ui/views/focus/external_focus_tracker.h" -// TODO(tfarina): remove this file once all includes have been updated. - -#endif // VIEWS_FOCUS_EXTERNAL_FOCUS_TRACKER_H_ diff --git a/views/focus/focus_manager.h b/views/focus/focus_manager.h deleted file mode 100644 index 5432cb5..0000000 --- a/views/focus/focus_manager.h +++ /dev/null @@ -1,12 +0,0 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef VIEWS_FOCUS_FOCUS_MANAGER_H_ -#define VIEWS_FOCUS_FOCUS_MANAGER_H_ -#pragma once - -#include "ui/views/focus/focus_manager.h" -// TODO(tfarina): remove this file once all includes have been updated. - -#endif // VIEWS_FOCUS_FOCUS_MANAGER_H_ diff --git a/views/focus/focus_manager_factory.h b/views/focus/focus_manager_factory.h deleted file mode 100644 index 825cc34..0000000 --- a/views/focus/focus_manager_factory.h +++ /dev/null @@ -1,12 +0,0 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef VIEWS_FOCUS_FOCUS_MANAGER_FACTORY_H_ -#define VIEWS_FOCUS_FOCUS_MANAGER_FACTORY_H_ -#pragma once - -#include "ui/views/focus/focus_manager_factory.h" -// TODO(tfarina): remove this file once all includes have been updated. - -#endif // VIEWS_FOCUS_FOCUS_MANAGER_FACTORY_H_ diff --git a/views/focus/focus_search.h b/views/focus/focus_search.h deleted file mode 100644 index 0ef2fc3..0000000 --- a/views/focus/focus_search.h +++ /dev/null @@ -1,12 +0,0 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef VIEWS_FOCUS_FOCUS_SEARCH_H_ -#define VIEWS_FOCUS_FOCUS_SEARCH_H_ -#pragma once - -#include "ui/views/focus/focus_search.h" -// TODO(tfarina): remove this file once all includes have been updated. - -#endif // VIEWS_FOCUS_FOCUS_SEARCH_H_ diff --git a/views/focus/view_storage.h b/views/focus/view_storage.h deleted file mode 100644 index 48037ed..0000000 --- a/views/focus/view_storage.h +++ /dev/null @@ -1,12 +0,0 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef VIEWS_FOCUS_VIEW_STORAGE_H_ -#define VIEWS_FOCUS_VIEW_STORAGE_H_ -#pragma once - -#include "ui/views/focus/view_storage.h" -// TODO(tfarina): remove this file once all includes have been updated. - -#endif // VIEWS_FOCUS_VIEW_STORAGE_H_ diff --git a/views/focus/widget_focus_manager.h b/views/focus/widget_focus_manager.h deleted file mode 100644 index b9f4e0a..0000000 --- a/views/focus/widget_focus_manager.h +++ /dev/null @@ -1,12 +0,0 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef VIEWS_FOCUS_WIDGET_FOCUS_MANAGER_H_ -#define VIEWS_FOCUS_WIDGET_FOCUS_MANAGER_H_ -#pragma once - -#include "ui/views/focus/widget_focus_manager.h" -// TODO(tfarina): remove this file once all includes have been updated. - -#endif // VIEWS_FOCUS_WIDGET_FOCUS_MANAGER_H_ diff --git a/views/layout/box_layout.h b/views/layout/box_layout.h deleted file mode 100644 index 88d7c24..0000000 --- a/views/layout/box_layout.h +++ /dev/null @@ -1,12 +0,0 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef VIEWS_LAYOUT_BOX_LAYOUT_H_ -#define VIEWS_LAYOUT_BOX_LAYOUT_H_ -#pragma once - -#include "ui/views/layout/box_layout.h" -// TODO(tfarina): remove this file once all includes have been updated. - -#endif // VIEWS_LAYOUT_BOX_LAYOUT_H_ diff --git a/views/layout/fill_layout.h b/views/layout/fill_layout.h deleted file mode 100644 index b3351b6..0000000 --- a/views/layout/fill_layout.h +++ /dev/null @@ -1,12 +0,0 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef VIEWS_LAYOUT_FILL_LAYOUT_H_ -#define VIEWS_LAYOUT_FILL_LAYOUT_H_ -#pragma once - -#include "ui/views/layout/fill_layout.h" -// TODO(tfarina): remove this file once all includes have been updated. - -#endif // VIEWS_LAYOUT_FILL_LAYOUT_H_ diff --git a/views/layout/grid_layout.h b/views/layout/grid_layout.h deleted file mode 100644 index 790030e..0000000 --- a/views/layout/grid_layout.h +++ /dev/null @@ -1,12 +0,0 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef VIEWS_LAYOUT_GRID_LAYOUT_H_ -#define VIEWS_LAYOUT_GRID_LAYOUT_H_ -#pragma once - -#include "ui/views/layout/grid_layout.h" -// TODO(tfarina): remove this file once all includes have been updated. - -#endif // VIEWS_LAYOUT_GRID_LAYOUT_H_ diff --git a/views/layout/layout_constants.h b/views/layout/layout_constants.h deleted file mode 100644 index 8e85bc0..0000000 --- a/views/layout/layout_constants.h +++ /dev/null @@ -1,12 +0,0 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef VIEWS_LAYOUT_LAYOUT_CONSTANTS_H_ -#define VIEWS_LAYOUT_LAYOUT_CONSTANTS_H_ -#pragma once - -#include "ui/views/layout/layout_constants.h" -// TODO(tfarina): remove this file once all includes have been updated. - -#endif // VIEWS_LAYOUT_LAYOUT_CONSTANTS_H_ diff --git a/views/layout/layout_manager.h b/views/layout/layout_manager.h deleted file mode 100644 index e1944f1..0000000 --- a/views/layout/layout_manager.h +++ /dev/null @@ -1,12 +0,0 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef VIEWS_LAYOUT_LAYOUT_MANAGER_H_ -#define VIEWS_LAYOUT_LAYOUT_MANAGER_H_ -#pragma once - -#include "ui/views/layout/layout_manager.h" -// TODO(tfarina): remove this file once all includes have been updated. - -#endif // VIEWS_LAYOUT_LAYOUT_MANAGER_H_ diff --git a/views/view.cc b/views/view.cc index e11b213..301138c 100644 --- a/views/view.cc +++ b/views/view.cc @@ -23,10 +23,10 @@ #include "ui/gfx/path.h" #include "ui/gfx/point3.h" #include "ui/gfx/transform.h" +#include "ui/views/layout/layout_manager.h" #include "views/background.h" #include "views/context_menu_controller.h" #include "views/drag_controller.h" -#include "views/layout/layout_manager.h" #include "views/views_delegate.h" #include "views/widget/native_widget_private.h" #include "views/widget/native_widget_views.h" diff --git a/views/view.h b/views/view.h index fa8c801..c4e286f 100644 --- a/views/view.h +++ b/views/view.h @@ -22,9 +22,9 @@ #include "ui/gfx/compositor/layer_delegate.h" #include "ui/gfx/native_widget_types.h" #include "ui/gfx/rect.h" +#include "ui/views/events/event.h" #include "views/background.h" #include "views/border.h" -#include "views/events/event.h" #if defined(OS_WIN) #include "base/win/scoped_comptr.h" diff --git a/views/view_unittest.cc b/views/view_unittest.cc index 140a03fa..cdcf545 100644 --- a/views/view_unittest.cc +++ b/views/view_unittest.cc @@ -21,6 +21,9 @@ #include "ui/gfx/compositor/test/test_texture.h" #include "ui/gfx/path.h" #include "ui/gfx/transform.h" +#include "ui/views/events/event.h" +#include "ui/views/focus/accelerator_handler.h" +#include "ui/views/focus/view_storage.h" #include "ui/views/test/views_test_base.h" #include "ui/views/touchui/gesture_manager.h" #include "ui/views/window/dialog_delegate.h" @@ -30,9 +33,6 @@ #include "views/controls/native/native_view_host.h" #include "views/controls/scroll_view.h" #include "views/controls/textfield/textfield.h" -#include "views/events/event.h" -#include "views/focus/accelerator_handler.h" -#include "views/focus/view_storage.h" #include "views/view.h" #include "views/views_delegate.h" #include "views/widget/native_widget.h" diff --git a/views/widget/gtk_views_window.cc b/views/widget/gtk_views_window.cc index dbb526a..1e5b48f 100644 --- a/views/widget/gtk_views_window.cc +++ b/views/widget/gtk_views_window.cc @@ -3,8 +3,9 @@ // found in the LICENSE file. #include <gtk/gtk.h> -#include "views/events/event.h" -#include "views/focus/focus_manager.h" + +#include "ui/views/events/event.h" +#include "ui/views/focus/focus_manager.h" #include "views/widget/gtk_views_window.h" #include "views/widget/widget.h" diff --git a/views/widget/native_widget_gtk.cc b/views/widget/native_widget_gtk.cc index 0ab6886..6d79ac2 100644 --- a/views/widget/native_widget_gtk.cc +++ b/views/widget/native_widget_gtk.cc @@ -32,10 +32,10 @@ #include "ui/gfx/gtk_util.h" #include "ui/gfx/path.h" #include "ui/gfx/screen.h" +#include "ui/views/bubble/bubble_delegate.h" +#include "ui/views/focus/view_storage.h" #include "ui/views/ime/input_method_gtk.h" -#include "views/bubble/bubble_delegate.h" #include "views/controls/textfield/native_textfield_views.h" -#include "views/focus/view_storage.h" #include "views/views_delegate.h" #include "views/widget/drop_target_gtk.h" #include "views/widget/gtk_views_fixed.h" diff --git a/views/widget/native_widget_gtk.h b/views/widget/native_widget_gtk.h index 965104e..1dcdace 100644 --- a/views/widget/native_widget_gtk.h +++ b/views/widget/native_widget_gtk.h @@ -15,7 +15,7 @@ #include "ui/base/x/active_window_watcher_x.h" #include "ui/gfx/compositor/compositor.h" #include "ui/gfx/size.h" -#include "views/focus/focus_manager.h" +#include "ui/views/focus/focus_manager.h" #include "views/widget/native_widget_private.h" #include "views/widget/widget.h" diff --git a/views/widget/native_widget_win.cc b/views/widget/native_widget_win.cc index b9bd491..2b512ea 100644 --- a/views/widget/native_widget_win.cc +++ b/views/widget/native_widget_win.cc @@ -33,12 +33,12 @@ #include "ui/gfx/path.h" #include "ui/gfx/screen.h" #include "ui/views/accessibility/native_view_accessibility_win.h" +#include "ui/views/focus/accelerator_handler.h" +#include "ui/views/focus/view_storage.h" #include "ui/views/ime/input_method_win.h" #include "ui/views/window/native_frame_view.h" #include "views/controls/native_control_win.h" #include "views/controls/textfield/native_textfield_views.h" -#include "views/focus/accelerator_handler.h" -#include "views/focus/view_storage.h" #include "views/views_delegate.h" #include "views/widget/aero_tooltip_manager.h" #include "views/widget/child_window_message_processor.h" diff --git a/views/widget/native_widget_win.h b/views/widget/native_widget_win.h index 82ae23f7..e145556 100644 --- a/views/widget/native_widget_win.h +++ b/views/widget/native_widget_win.h @@ -23,8 +23,8 @@ #include "base/win/win_util.h" #include "ui/base/win/window_impl.h" #include "ui/gfx/compositor/compositor.h" -#include "views/focus/focus_manager.h" -#include "views/layout/layout_manager.h" +#include "ui/views/focus/focus_manager.h" +#include "ui/views/layout/layout_manager.h" #include "views/widget/native_widget_private.h" namespace ui { diff --git a/views/widget/root_view.cc b/views/widget/root_view.cc index 3ac4b90..2682bfc 100644 --- a/views/widget/root_view.cc +++ b/views/widget/root_view.cc @@ -13,9 +13,9 @@ #include "ui/base/keycodes/keyboard_codes.h" #include "ui/gfx/canvas_skia.h" #include "ui/gfx/compositor/layer.h" +#include "ui/views/focus/view_storage.h" +#include "ui/views/layout/fill_layout.h" #include "ui/views/touchui/gesture_manager.h" -#include "views/focus/view_storage.h" -#include "views/layout/fill_layout.h" #include "views/widget/widget.h" namespace views { diff --git a/views/widget/root_view.h b/views/widget/root_view.h index 3a2afb9..1a17d38 100644 --- a/views/widget/root_view.h +++ b/views/widget/root_view.h @@ -9,8 +9,8 @@ #include <string> #include "base/memory/ref_counted.h" -#include "views/focus/focus_manager.h" -#include "views/focus/focus_search.h" +#include "ui/views/focus/focus_manager.h" +#include "ui/views/focus/focus_search.h" #include "views/view.h" namespace ui { diff --git a/views/widget/tooltip_manager_gtk.cc b/views/widget/tooltip_manager_gtk.cc index f9993196..82828fc 100644 --- a/views/widget/tooltip_manager_gtk.cc +++ b/views/widget/tooltip_manager_gtk.cc @@ -8,7 +8,7 @@ #include "base/utf_string_conversions.h" #include "ui/gfx/font.h" #include "ui/gfx/screen.h" -#include "views/focus/focus_manager.h" +#include "ui/views/focus/focus_manager.h" #include "views/view.h" #include "views/widget/native_widget_gtk.h" diff --git a/views/widget/tooltip_manager_views.cc b/views/widget/tooltip_manager_views.cc index ac9425a..904099a 100644 --- a/views/widget/tooltip_manager_views.cc +++ b/views/widget/tooltip_manager_views.cc @@ -26,10 +26,10 @@ #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/font.h" #include "ui/gfx/screen.h" +#include "ui/views/events/event.h" +#include "ui/views/focus/focus_manager.h" #include "views/background.h" #include "views/border.h" -#include "views/events/event.h" -#include "views/focus/focus_manager.h" #include "views/view.h" #include "views/widget/native_widget.h" diff --git a/views/widget/widget.cc b/views/widget/widget.cc index a3973c5..9394028 100644 --- a/views/widget/widget.cc +++ b/views/widget/widget.cc @@ -13,13 +13,13 @@ #include "ui/gfx/compositor/compositor.h" #include "ui/gfx/compositor/layer.h" #include "ui/gfx/screen.h" +#include "ui/views/focus/focus_manager.h" +#include "ui/views/focus/focus_manager_factory.h" +#include "ui/views/focus/view_storage.h" +#include "ui/views/focus/widget_focus_manager.h" #include "ui/views/ime/input_method.h" #include "ui/views/window/custom_frame_view.h" #include "views/controls/menu/menu_controller.h" -#include "views/focus/focus_manager.h" -#include "views/focus/focus_manager_factory.h" -#include "views/focus/view_storage.h" -#include "views/focus/widget_focus_manager.h" #include "views/views_delegate.h" #include "views/widget/default_theme_provider.h" #include "views/widget/native_widget_private.h" diff --git a/views/widget/widget.h b/views/widget/widget.h index f538a26..4faf12b 100644 --- a/views/widget/widget.h +++ b/views/widget/widget.h @@ -16,9 +16,9 @@ #include "ui/base/ui_base_types.h" #include "ui/gfx/native_widget_types.h" #include "ui/gfx/rect.h" +#include "ui/views/focus/focus_manager.h" #include "ui/views/window/client_view.h" #include "ui/views/window/non_client_view.h" -#include "views/focus/focus_manager.h" #include "views/widget/native_widget_delegate.h" #if defined(OS_WIN) diff --git a/views/widget/widget_delegate.cc b/views/widget/widget_delegate.cc index ee5d24f..c64f8e6 100644 --- a/views/widget/widget_delegate.cc +++ b/views/widget/widget_delegate.cc @@ -6,8 +6,8 @@ #include "base/utf_string_conversions.h" #include "third_party/skia/include/core/SkBitmap.h" +#include "ui/views/bubble/bubble_delegate.h" #include "ui/views/window/client_view.h" -#include "views/bubble/bubble_delegate.h" #include "views/view.h" #include "views/views_delegate.h" #include "views/widget/widget.h" diff --git a/views/widget/window_manager.cc b/views/widget/window_manager.cc index 679332d..7e5e7ca 100644 --- a/views/widget/window_manager.cc +++ b/views/widget/window_manager.cc @@ -5,7 +5,7 @@ #include "views/widget/window_manager.h" #include "base/compiler_specific.h" -#include "views/events/event.h" +#include "ui/views/events/event.h" #include "views/widget/widget.h" namespace { |