diff options
Diffstat (limited to 'chrome/browser/chromeos')
46 files changed, 56 insertions, 56 deletions
diff --git a/chrome/browser/chromeos/choose_mobile_network_dialog.cc b/chrome/browser/chromeos/choose_mobile_network_dialog.cc index 255f5c8..2886c6b 100644 --- a/chrome/browser/chromeos/choose_mobile_network_dialog.cc +++ b/chrome/browser/chromeos/choose_mobile_network_dialog.cc @@ -11,8 +11,8 @@ #include "chrome/browser/ui/browser_list.h" #include "chrome/browser/ui/views/html_dialog_view.h" #include "chrome/common/url_constants.h" +#include "ui/views/widget/widget.h" #include "views/view.h" -#include "views/widget/widget.h" namespace { diff --git a/chrome/browser/chromeos/external_protocol_dialog.cc b/chrome/browser/chromeos/external_protocol_dialog.cc index 867f192..ad2dfc7 100644 --- a/chrome/browser/chromeos/external_protocol_dialog.cc +++ b/chrome/browser/chromeos/external_protocol_dialog.cc @@ -18,8 +18,8 @@ #include "ui/base/l10n/l10n_util.h" #include "ui/base/message_box_flags.h" #include "ui/base/text/text_elider.h" +#include "ui/views/widget/widget.h" #include "views/controls/message_box_view.h" -#include "views/widget/widget.h" namespace { diff --git a/chrome/browser/chromeos/frame/browser_view.cc b/chrome/browser/chromeos/frame/browser_view.cc index 30ddc8e..0e1ac2c 100644 --- a/chrome/browser/chromeos/frame/browser_view.cc +++ b/chrome/browser/chromeos/frame/browser_view.cc @@ -38,13 +38,13 @@ #include "ui/base/theme_provider.h" #include "ui/gfx/canvas.h" #include "ui/gfx/screen.h" +#include "ui/views/widget/root_view.h" +#include "ui/views/widget/widget.h" #include "views/controls/button/button.h" #include "views/controls/button/image_button.h" #include "views/controls/menu/menu_delegate.h" #include "views/controls/menu/menu_item_view.h" #include "views/controls/menu/menu_runner.h" -#include "views/widget/root_view.h" -#include "views/widget/widget.h" #if defined(TOOLKIT_USES_GTK) #include "chrome/browser/chromeos/legacy_window_manager/wm_ipc.h" diff --git a/chrome/browser/chromeos/frame/bubble_frame_view.cc b/chrome/browser/chromeos/frame/bubble_frame_view.cc index dd41852..b7b768c 100644 --- a/chrome/browser/chromeos/frame/bubble_frame_view.cc +++ b/chrome/browser/chromeos/frame/bubble_frame_view.cc @@ -10,6 +10,8 @@ #include "chrome/browser/chromeos/frame/bubble_window.h" #include "chrome/browser/chromeos/login/helper.h" #include "grit/theme_resources_standard.h" +#include "third_party/skia/include/core/SkColor.h" +#include "third_party/skia/include/core/SkPaint.h" #include "ui/base/hit_test.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/canvas_skia.h" @@ -17,13 +19,11 @@ #include "ui/gfx/insets.h" #include "ui/gfx/path.h" #include "ui/gfx/rect.h" +#include "ui/views/widget/widget.h" +#include "ui/views/widget/widget_delegate.h" #include "views/controls/button/image_button.h" #include "views/controls/label.h" #include "views/controls/throbber.h" -#include "views/widget/widget.h" -#include "views/widget/widget_delegate.h" -#include "third_party/skia/include/core/SkColor.h" -#include "third_party/skia/include/core/SkPaint.h" namespace { diff --git a/chrome/browser/chromeos/frame/bubble_window.h b/chrome/browser/chromeos/frame/bubble_window.h index 5d3ca04a..33de290 100644 --- a/chrome/browser/chromeos/frame/bubble_window.h +++ b/chrome/browser/chromeos/frame/bubble_window.h @@ -13,7 +13,7 @@ // TODO(msw): While I dislike the includes and code to be mixed into the same // preprocessor conditional, this seems okay as I can hopefully fix this up // in a matter of days / crbug.com/98322. -#include "views/widget/native_widget_gtk.h" +#include "ui/views/widget/native_widget_gtk.h" #else // TOOLKIT_USES_GTK #include "views/view.h" #endif diff --git a/chrome/browser/chromeos/frame/layout_mode_button.cc b/chrome/browser/chromeos/frame/layout_mode_button.cc index 9c608ff..6da2ada 100644 --- a/chrome/browser/chromeos/frame/layout_mode_button.cc +++ b/chrome/browser/chromeos/frame/layout_mode_button.cc @@ -14,7 +14,7 @@ #include "third_party/cros_system_api/window_manager/chromeos_wm_ipc_enums.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" -#include "views/widget/widget.h" +#include "ui/views/widget/widget.h" #if defined(TOOLKIT_USES_GTK) #include "chrome/browser/chromeos/legacy_window_manager/wm_ipc.h" diff --git a/chrome/browser/chromeos/frame/panel_browser_view.cc b/chrome/browser/chromeos/frame/panel_browser_view.cc index de39b0e..8340dfc 100644 --- a/chrome/browser/chromeos/frame/panel_browser_view.cc +++ b/chrome/browser/chromeos/frame/panel_browser_view.cc @@ -7,7 +7,7 @@ #include "chrome/browser/chromeos/frame/browser_view.h" #include "chrome/browser/chromeos/frame/panel_controller.h" #include "third_party/cros_system_api/window_manager/chromeos_wm_ipc_enums.h" -#include "views/widget/widget.h" +#include "ui/views/widget/widget.h" namespace { diff --git a/chrome/browser/chromeos/frame/panel_controller.cc b/chrome/browser/chromeos/frame/panel_controller.cc index 9fe7278..44f22da 100644 --- a/chrome/browser/chromeos/frame/panel_controller.cc +++ b/chrome/browser/chromeos/frame/panel_controller.cc @@ -29,12 +29,12 @@ #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/canvas_skia.h" #include "ui/views/events/event.h" +#include "ui/views/widget/widget.h" #include "views/controls/button/image_button.h" #include "views/controls/image_view.h" #include "views/controls/label.h" #include "views/painter.h" #include "views/view.h" -#include "views/widget/widget.h" #if defined(TOOLKIT_USES_GTK) #include "chrome/browser/chromeos/legacy_window_manager/wm_ipc.h" diff --git a/chrome/browser/chromeos/input_method/candidate_window.cc b/chrome/browser/chromeos/input_method/candidate_window.cc index 067b20b..b60a92e 100644 --- a/chrome/browser/chromeos/input_method/candidate_window.cc +++ b/chrome/browser/chromeos/input_method/candidate_window.cc @@ -26,10 +26,10 @@ #include "ui/views/events/event.h" #include "ui/views/layout/fill_layout.h" #include "ui/views/layout/grid_layout.h" +#include "ui/views/widget/widget.h" #include "ui/views/window/non_client_view.h" #include "views/controls/label.h" #include "views/controls/textfield/textfield.h" -#include "views/widget/widget.h" namespace chromeos { namespace input_method { diff --git a/chrome/browser/chromeos/login/background_view.cc b/chrome/browser/chromeos/login/background_view.cc index 1535b38..9c65f2c 100644 --- a/chrome/browser/chromeos/login/background_view.cc +++ b/chrome/browser/chromeos/login/background_view.cc @@ -31,9 +31,9 @@ #include "ui/base/resource/resource_bundle.h" #include "ui/base/x/x11_util.h" #include "ui/gfx/gtk_util.h" +#include "ui/views/widget/widget.h" #include "views/controls/button/text_button.h" #include "views/controls/label.h" -#include "views/widget/widget.h" #if defined(TOOLKIT_USES_GTK) #include "chrome/browser/chromeos/legacy_window_manager/wm_ipc.h" diff --git a/chrome/browser/chromeos/login/captcha_view.cc b/chrome/browser/chromeos/login/captcha_view.cc index 9825daa..fa3211b 100644 --- a/chrome/browser/chromeos/login/captcha_view.cc +++ b/chrome/browser/chromeos/login/captcha_view.cc @@ -17,12 +17,12 @@ #include "ui/base/l10n/l10n_util.h" #include "ui/views/layout/grid_layout.h" #include "ui/views/layout/layout_constants.h" +#include "ui/views/widget/widget.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/widget/widget.h" using views::Label; using views::Textfield; diff --git a/chrome/browser/chromeos/login/existing_user_controller.cc b/chrome/browser/chromeos/login/existing_user_controller.cc index 60d2ea1..08a91e1 100644 --- a/chrome/browser/chromeos/login/existing_user_controller.cc +++ b/chrome/browser/chromeos/login/existing_user_controller.cc @@ -9,8 +9,8 @@ #include "base/command_line.h" #include "base/logging.h" #include "base/message_loop.h" -#include "base/stringprintf.h" #include "base/string_util.h" +#include "base/stringprintf.h" #include "base/utf_string_conversions.h" #include "base/values.h" #include "chrome/browser/browser_process.h" @@ -39,7 +39,7 @@ #include "content/public/browser/notification_types.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" -#include "views/widget/widget.h" +#include "ui/views/widget/widget.h" namespace chromeos { diff --git a/chrome/browser/chromeos/login/helper.cc b/chrome/browser/chromeos/login/helper.cc index 9dd9b2d..8638bc6 100644 --- a/chrome/browser/chromeos/login/helper.cc +++ b/chrome/browser/chromeos/login/helper.cc @@ -4,8 +4,8 @@ #include "chrome/browser/chromeos/login/helper.h" -#include "base/utf_string_conversions.h" #include "base/file_util.h" +#include "base/utf_string_conversions.h" #include "chrome/browser/chromeos/cros/network_library.h" #include "chrome/browser/google/google_util.h" #include "googleurl/src/gurl.h" @@ -16,12 +16,12 @@ #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/canvas_skia.h" #include "ui/gfx/screen.h" +#include "ui/views/widget/widget.h" #include "views/controls/button/menu_button.h" #include "views/controls/label.h" #include "views/controls/textfield/textfield.h" #include "views/controls/throbber.h" #include "views/painter.h" -#include "views/widget/widget.h" namespace chromeos { diff --git a/chrome/browser/chromeos/login/language_switch_menu.cc b/chrome/browser/chromeos/login/language_switch_menu.cc index 05cfbed..5dbced1 100644 --- a/chrome/browser/chromeos/login/language_switch_menu.cc +++ b/chrome/browser/chromeos/login/language_switch_menu.cc @@ -22,11 +22,11 @@ #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/platform_font_pango.h" +#include "ui/views/widget/widget.h" #include "views/controls/button/menu_button.h" #include "views/controls/menu/menu_item_view.h" #include "views/controls/menu/menu_runner.h" #include "views/controls/menu/submenu_view.h" -#include "views/widget/widget.h" namespace { diff --git a/chrome/browser/chromeos/login/login_html_dialog.cc b/chrome/browser/chromeos/login/login_html_dialog.cc index 6b1409c..cd0424b 100644 --- a/chrome/browser/chromeos/login/login_html_dialog.cc +++ b/chrome/browser/chromeos/login/login_html_dialog.cc @@ -15,7 +15,7 @@ #include "ui/gfx/native_widget_types.h" #include "ui/gfx/rect.h" #include "ui/gfx/size.h" -#include "views/widget/widget.h" +#include "ui/views/widget/widget.h" namespace chromeos { diff --git a/chrome/browser/chromeos/login/message_bubble.cc b/chrome/browser/chromeos/login/message_bubble.cc index 8a42517..d118905 100644 --- a/chrome/browser/chromeos/login/message_bubble.cc +++ b/chrome/browser/chromeos/login/message_bubble.cc @@ -13,11 +13,11 @@ #include "grit/theme_resources_standard.h" #include "ui/base/resource/resource_bundle.h" #include "ui/views/layout/grid_layout.h" +#include "ui/views/widget/widget.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/widget/widget.h" namespace chromeos { diff --git a/chrome/browser/chromeos/login/message_bubble.h b/chrome/browser/chromeos/login/message_bubble.h index 7e4a844..2501212 100644 --- a/chrome/browser/chromeos/login/message_bubble.h +++ b/chrome/browser/chromeos/login/message_bubble.h @@ -16,7 +16,7 @@ #include "views/view.h" #if defined(TOOLKIT_USES_GTK) -#include "views/widget/native_widget_gtk.h" +#include "ui/views/widget/native_widget_gtk.h" #endif class SkBitmap; diff --git a/chrome/browser/chromeos/login/password_changed_view.cc b/chrome/browser/chromeos/login/password_changed_view.cc index 5b8c9cd..5598075 100644 --- a/chrome/browser/chromeos/login/password_changed_view.cc +++ b/chrome/browser/chromeos/login/password_changed_view.cc @@ -15,10 +15,10 @@ #include "ui/base/resource/resource_bundle.h" #include "ui/views/layout/grid_layout.h" #include "ui/views/layout/layout_constants.h" +#include "ui/views/widget/widget.h" #include "views/controls/button/radio_button.h" #include "views/controls/label.h" #include "views/controls/textfield/textfield.h" -#include "views/widget/widget.h" using views::Button; using views::GridLayout; diff --git a/chrome/browser/chromeos/login/screen_lock_view.cc b/chrome/browser/chromeos/login/screen_lock_view.cc index da3b7bb..d80ab03 100644 --- a/chrome/browser/chromeos/login/screen_lock_view.cc +++ b/chrome/browser/chromeos/login/screen_lock_view.cc @@ -20,13 +20,13 @@ #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" #include "ui/views/layout/grid_layout.h" +#include "ui/views/widget/native_widget_gtk.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/widget/native_widget_gtk.h" namespace chromeos { diff --git a/chrome/browser/chromeos/login/screen_locker_browsertest.cc b/chrome/browser/chromeos/login/screen_locker_browsertest.cc index 9a6467c..50f53db 100644 --- a/chrome/browser/chromeos/login/screen_locker_browsertest.cc +++ b/chrome/browser/chromeos/login/screen_locker_browsertest.cc @@ -22,8 +22,8 @@ #include "content/public/browser/notification_service.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" +#include "ui/views/widget/native_widget_gtk.h" #include "views/controls/textfield/textfield.h" -#include "views/widget/native_widget_gtk.h" namespace { diff --git a/chrome/browser/chromeos/login/screen_locker_tester.cc b/chrome/browser/chromeos/login/screen_locker_tester.cc index 0899001..6e9c078 100644 --- a/chrome/browser/chromeos/login/screen_locker_tester.cc +++ b/chrome/browser/chromeos/login/screen_locker_tester.cc @@ -13,10 +13,10 @@ #include "chrome/browser/chromeos/login/screen_locker.h" #include "chrome/browser/chromeos/login/screen_locker_views.h" #include "ui/views/events/event.h" +#include "ui/views/widget/root_view.h" #include "views/controls/button/button.h" #include "views/controls/label.h" #include "views/controls/textfield/textfield.h" -#include "views/widget/root_view.h" namespace chromeos { diff --git a/chrome/browser/chromeos/login/webui_login_display.cc b/chrome/browser/chromeos/login/webui_login_display.cc index b6bc1c6..30e3ad0 100644 --- a/chrome/browser/chromeos/login/webui_login_display.cc +++ b/chrome/browser/chromeos/login/webui_login_display.cc @@ -13,7 +13,7 @@ #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" -#include "views/widget/widget.h" +#include "ui/views/widget/widget.h" #if defined(TOOLKIT_USES_GTK) #include "chrome/browser/chromeos/legacy_window_manager/wm_ipc.h" diff --git a/chrome/browser/chromeos/login/webui_login_display.h b/chrome/browser/chromeos/login/webui_login_display.h index 9d32e4f..a3dc06d 100644 --- a/chrome/browser/chromeos/login/webui_login_display.h +++ b/chrome/browser/chromeos/login/webui_login_display.h @@ -13,7 +13,7 @@ #include "chrome/browser/chromeos/login/login_display.h" #include "chrome/browser/chromeos/login/user.h" #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h" -#include "views/widget/widget.h" +#include "ui/views/widget/widget.h" namespace chromeos { // WebUI-based login UI implementation. diff --git a/chrome/browser/chromeos/login/webui_login_display_host.cc b/chrome/browser/chromeos/login/webui_login_display_host.cc index 5dbdf2d..e0d4298 100644 --- a/chrome/browser/chromeos/login/webui_login_display_host.cc +++ b/chrome/browser/chromeos/login/webui_login_display_host.cc @@ -10,7 +10,7 @@ #include "chrome/browser/chromeos/login/webui_login_view.h" #include "chrome/browser/chromeos/login/wizard_controller.h" #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h" -#include "views/widget/widget.h" +#include "ui/views/widget/widget.h" #if defined(USE_AURA) #include "ui/aura/window.h" diff --git a/chrome/browser/chromeos/login/webui_login_view.cc b/chrome/browser/chromeos/login/webui_login_view.cc index df13daa..d7a064d 100644 --- a/chrome/browser/chromeos/login/webui_login_view.cc +++ b/chrome/browser/chromeos/login/webui_login_view.cc @@ -24,11 +24,11 @@ #include "content/browser/tab_contents/tab_contents.h" #include "ui/gfx/rect.h" #include "ui/gfx/size.h" -#include "views/widget/widget.h" +#include "ui/views/widget/widget.h" #if defined(TOOLKIT_USES_GTK) #include "chrome/browser/chromeos/legacy_window_manager/wm_ipc.h" -#include "views/widget/native_widget_gtk.h" +#include "ui/views/widget/native_widget_gtk.h" #endif #if defined(USE_VIRTUAL_KEYBOARD) diff --git a/chrome/browser/chromeos/login/webui_login_view.h b/chrome/browser/chromeos/login/webui_login_view.h index 29349fa..2b470132 100644 --- a/chrome/browser/chromeos/login/webui_login_view.h +++ b/chrome/browser/chromeos/login/webui_login_view.h @@ -14,7 +14,7 @@ #include "chrome/browser/tab_first_render_watcher.h" #include "chrome/browser/ui/views/unhandled_keyboard_event_handler.h" #include "content/browser/tab_contents/tab_contents_delegate.h" -#include "views/widget/widget_delegate.h" +#include "ui/views/widget/widget_delegate.h" class DOMView; class GURL; diff --git a/chrome/browser/chromeos/login/webui_screen_locker.cc b/chrome/browser/chromeos/login/webui_screen_locker.cc index 6b64dc5..55e2f49 100644 --- a/chrome/browser/chromeos/login/webui_screen_locker.cc +++ b/chrome/browser/chromeos/login/webui_screen_locker.cc @@ -31,7 +31,7 @@ #include "ui/base/l10n/l10n_util.h" #include "ui/base/x/x11_util.h" #include "ui/gfx/screen.h" -#include "views/widget/native_widget_gtk.h" +#include "ui/views/widget/native_widget_gtk.h" namespace { diff --git a/chrome/browser/chromeos/login/webui_screen_locker.h b/chrome/browser/chromeos/login/webui_screen_locker.h index 9267221..05e9942 100644 --- a/chrome/browser/chromeos/login/webui_screen_locker.h +++ b/chrome/browser/chromeos/login/webui_screen_locker.h @@ -15,10 +15,10 @@ #include "chrome/browser/chromeos/login/webui_login_view.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" -#include "views/widget/widget.h" +#include "ui/views/widget/widget.h" #if defined(TOOLKIT_USES_GTK) -#include "views/widget/native_widget_gtk.h" +#include "ui/views/widget/native_widget_gtk.h" #endif namespace chromeos { diff --git a/chrome/browser/chromeos/native_dialog_window.cc b/chrome/browser/chromeos/native_dialog_window.cc index ff07cae..3bbf695 100644 --- a/chrome/browser/chromeos/native_dialog_window.cc +++ b/chrome/browser/chromeos/native_dialog_window.cc @@ -11,10 +11,10 @@ #include "chrome/browser/chromeos/frame/bubble_window.h" #include "chrome/browser/ui/views/window.h" #include "ui/base/gtk/gtk_signal.h" +#include "ui/views/widget/widget.h" #include "ui/views/window/dialog_delegate.h" #include "ui/views/window/non_client_view.h" #include "views/controls/native/native_view_host.h" -#include "views/widget/widget.h" namespace { diff --git a/chrome/browser/chromeos/network_login_observer.cc b/chrome/browser/chromeos/network_login_observer.cc index 7e7c44a..8118113 100644 --- a/chrome/browser/chromeos/network_login_observer.cc +++ b/chrome/browser/chromeos/network_login_observer.cc @@ -13,8 +13,8 @@ #include "chrome/browser/ui/browser_list.h" #include "chrome/browser/ui/browser_window.h" #include "chrome/browser/ui/views/window.h" -#include "views/widget/widget.h" -#include "views/widget/widget_delegate.h" +#include "ui/views/widget/widget.h" +#include "ui/views/widget/widget_delegate.h" namespace chromeos { diff --git a/chrome/browser/chromeos/notifications/balloon_view.cc b/chrome/browser/chromeos/notifications/balloon_view.cc index e513bff..47b346a 100644 --- a/chrome/browser/chromeos/notifications/balloon_view.cc +++ b/chrome/browser/chromeos/notifications/balloon_view.cc @@ -30,6 +30,7 @@ #include "ui/base/l10n/l10n_util.h" #include "ui/base/models/simple_menu_model.h" #include "ui/base/resource/resource_bundle.h" +#include "ui/views/widget/widget.h" #include "views/background.h" #include "views/controls/button/button.h" #include "views/controls/button/image_button.h" @@ -39,7 +40,6 @@ #include "views/controls/menu/menu_model_adapter.h" #include "views/controls/menu/menu_runner.h" #include "views/controls/menu/view_menu_delegate.h" -#include "views/widget/widget.h" namespace { // Menu commands diff --git a/chrome/browser/chromeos/notifications/notification_panel.cc b/chrome/browser/chromeos/notifications/notification_panel.cc index 2b6b62f..be62fc4 100644 --- a/chrome/browser/chromeos/notifications/notification_panel.cc +++ b/chrome/browser/chromeos/notifications/notification_panel.cc @@ -19,10 +19,10 @@ #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/canvas.h" +#include "ui/views/widget/native_widget_gtk.h" #include "views/background.h" #include "views/controls/native/native_view_host.h" #include "views/controls/scroll_view.h" -#include "views/widget/native_widget_gtk.h" #define SET_STATE(state) SetState(state, __PRETTY_FUNCTION__) diff --git a/chrome/browser/chromeos/options/network_config_view.cc b/chrome/browser/chromeos/options/network_config_view.cc index 63c15f1..b047420 100644 --- a/chrome/browser/chromeos/options/network_config_view.cc +++ b/chrome/browser/chromeos/options/network_config_view.cc @@ -18,8 +18,8 @@ #include "ui/gfx/rect.h" #include "ui/views/layout/grid_layout.h" #include "ui/views/layout/layout_constants.h" +#include "ui/views/widget/widget.h" #include "views/controls/button/text_button.h" -#include "views/widget/widget.h" namespace chromeos { diff --git a/chrome/browser/chromeos/panels/panel_scroller.cc b/chrome/browser/chromeos/panels/panel_scroller.cc index e40154b..5c5cfdce 100644 --- a/chrome/browser/chromeos/panels/panel_scroller.cc +++ b/chrome/browser/chromeos/panels/panel_scroller.cc @@ -12,7 +12,7 @@ #include "chrome/browser/chromeos/panels/panel_scroller_container.h" #include "chrome/browser/chromeos/panels/panel_scroller_header.h" #include "ui/gfx/canvas.h" -#include "views/widget/widget.h" +#include "ui/views/widget/widget.h" struct PanelScroller::Panel { PanelScrollerHeader* header; diff --git a/chrome/browser/chromeos/setting_level_bubble.cc b/chrome/browser/chromeos/setting_level_bubble.cc index f1052c5..532a592 100644 --- a/chrome/browser/chromeos/setting_level_bubble.cc +++ b/chrome/browser/chromeos/setting_level_bubble.cc @@ -19,7 +19,7 @@ #include "ui/gfx/screen.h" #include "ui/views/bubble/bubble_delegate.h" #include "ui/views/layout/fill_layout.h" -#include "views/widget/root_view.h" +#include "ui/views/widget/root_view.h" #if !defined(USE_AURA) #include "chrome/browser/chromeos/legacy_window_manager/wm_ipc.h" diff --git a/chrome/browser/chromeos/setting_level_bubble.h b/chrome/browser/chromeos/setting_level_bubble.h index 5e0861b..543a76d 100644 --- a/chrome/browser/chromeos/setting_level_bubble.h +++ b/chrome/browser/chromeos/setting_level_bubble.h @@ -11,7 +11,7 @@ #include "base/time.h" #include "base/timer.h" #include "ui/views/bubble/bubble_delegate.h" -#include "views/widget/widget.h" +#include "ui/views/widget/widget.h" class SkBitmap; diff --git a/chrome/browser/chromeos/sim_dialog_delegate.cc b/chrome/browser/chromeos/sim_dialog_delegate.cc index 35f5787..447c4cb 100644 --- a/chrome/browser/chromeos/sim_dialog_delegate.cc +++ b/chrome/browser/chromeos/sim_dialog_delegate.cc @@ -12,8 +12,8 @@ #include "chrome/browser/ui/browser_list.h" #include "chrome/browser/ui/views/html_dialog_view.h" #include "chrome/common/url_constants.h" +#include "ui/views/widget/widget.h" #include "views/view.h" -#include "views/widget/widget.h" namespace { diff --git a/chrome/browser/chromeos/status/accessibility_menu_button.cc b/chrome/browser/chromeos/status/accessibility_menu_button.cc index f8f59d7..4ac22e5 100644 --- a/chrome/browser/chromeos/status/accessibility_menu_button.cc +++ b/chrome/browser/chromeos/status/accessibility_menu_button.cc @@ -18,10 +18,10 @@ #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/image/image.h" +#include "ui/views/widget/widget.h" #include "views/controls/image_view.h" #include "views/controls/menu/menu_item_view.h" #include "views/controls/menu/menu_runner.h" -#include "views/widget/widget.h" namespace { diff --git a/chrome/browser/chromeos/status/caps_lock_menu_button.cc b/chrome/browser/chromeos/status/caps_lock_menu_button.cc index 5ac4351..c8c7c66 100644 --- a/chrome/browser/chromeos/status/caps_lock_menu_button.cc +++ b/chrome/browser/chromeos/status/caps_lock_menu_button.cc @@ -20,11 +20,11 @@ #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/image/image.h" +#include "ui/views/widget/widget.h" #include "views/controls/image_view.h" #include "views/controls/menu/menu_item_view.h" #include "views/controls/menu/menu_runner.h" #include "views/controls/menu/submenu_view.h" -#include "views/widget/widget.h" namespace { diff --git a/chrome/browser/chromeos/status/clock_menu_button.cc b/chrome/browser/chromeos/status/clock_menu_button.cc index a3ecb38..cf300ef 100644 --- a/chrome/browser/chromeos/status/clock_menu_button.cc +++ b/chrome/browser/chromeos/status/clock_menu_button.cc @@ -23,9 +23,9 @@ #include "ui/base/l10n/l10n_util.h" #include "ui/gfx/canvas.h" #include "ui/gfx/font.h" +#include "ui/views/widget/widget.h" #include "unicode/datefmt.h" #include "views/controls/menu/menu_runner.h" -#include "views/widget/widget.h" namespace { diff --git a/chrome/browser/chromeos/status/input_method_menu.cc b/chrome/browser/chromeos/status/input_method_menu.cc index a60305d..1a6771f 100644 --- a/chrome/browser/chromeos/status/input_method_menu.cc +++ b/chrome/browser/chromeos/status/input_method_menu.cc @@ -24,10 +24,10 @@ #include "ui/base/l10n/l10n_util.h" #include "ui/base/models/simple_menu_model.h" #include "ui/base/resource/resource_bundle.h" +#include "ui/views/widget/widget.h" #include "views/controls/menu/menu_model_adapter.h" #include "views/controls/menu/menu_runner.h" #include "views/controls/menu/submenu_view.h" -#include "views/widget/widget.h" // The language menu consists of 3 parts (in this order): // diff --git a/chrome/browser/chromeos/status/input_method_menu_button.cc b/chrome/browser/chromeos/status/input_method_menu_button.cc index de7a87f..2044cda 100644 --- a/chrome/browser/chromeos/status/input_method_menu_button.cc +++ b/chrome/browser/chromeos/status/input_method_menu_button.cc @@ -14,7 +14,7 @@ #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_list.h" #include "chrome/browser/ui/browser_window.h" -#include "views/widget/widget.h" +#include "ui/views/widget/widget.h" namespace { diff --git a/chrome/browser/chromeos/status/memory_menu_button.cc b/chrome/browser/chromeos/status/memory_menu_button.cc index ee90e78..c0e1d0b 100644 --- a/chrome/browser/chromeos/status/memory_menu_button.cc +++ b/chrome/browser/chromeos/status/memory_menu_button.cc @@ -7,11 +7,11 @@ #include "chrome/browser/chromeos/status/memory_menu_button.h" -#include "base/utf_string_conversions.h" #include "base/file_util.h" #include "base/process_util.h" // GetSystemMemoryInfo #include "base/stringprintf.h" #include "base/threading/thread_restrictions.h" +#include "base/utf_string_conversions.h" #include "chrome/browser/chromeos/view_ids.h" #include "chrome/browser/memory_purger.h" #include "chrome/common/render_messages.h" @@ -20,8 +20,8 @@ #include "content/public/browser/render_process_host.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" +#include "ui/views/widget/widget.h" #include "views/controls/menu/menu_runner.h" -#include "views/widget/widget.h" #if defined(USE_TCMALLOC) #include "third_party/tcmalloc/chromium/src/google/heap-profiler.h" diff --git a/chrome/browser/chromeos/status/network_menu.cc b/chrome/browser/chromeos/status/network_menu.cc index 68c1f91..4817962 100644 --- a/chrome/browser/chromeos/status/network_menu.cc +++ b/chrome/browser/chromeos/status/network_menu.cc @@ -32,11 +32,11 @@ #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/canvas_skia.h" #include "ui/gfx/skbitmap_operations.h" +#include "ui/views/widget/widget.h" #include "views/controls/menu/menu_item_view.h" #include "views/controls/menu/menu_model_adapter.h" #include "views/controls/menu/menu_runner.h" #include "views/controls/menu/submenu_view.h" -#include "views/widget/widget.h" using content::BrowserThread; diff --git a/chrome/browser/chromeos/status/network_menu_button.cc b/chrome/browser/chromeos/status/network_menu_button.cc index 72ba80e..96bbcf4 100644 --- a/chrome/browser/chromeos/status/network_menu_button.cc +++ b/chrome/browser/chromeos/status/network_menu_button.cc @@ -31,7 +31,7 @@ #include "grit/theme_resources.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" -#include "views/widget/widget.h" +#include "ui/views/widget/widget.h" namespace { diff --git a/chrome/browser/chromeos/status/power_menu_button.cc b/chrome/browser/chromeos/status/power_menu_button.cc index bd1782c..37418da 100644 --- a/chrome/browser/chromeos/status/power_menu_button.cc +++ b/chrome/browser/chromeos/status/power_menu_button.cc @@ -22,10 +22,10 @@ #include "ui/gfx/canvas_skia.h" #include "ui/gfx/font.h" #include "ui/gfx/image/image.h" +#include "ui/views/widget/widget.h" #include "views/controls/menu/menu_item_view.h" #include "views/controls/menu/menu_runner.h" #include "views/controls/menu/submenu_view.h" -#include "views/widget/widget.h" namespace { |