diff options
370 files changed, 652 insertions, 652 deletions
diff --git a/chrome/browser/accessibility/browser_views_accessibility_browsertest.cc b/chrome/browser/accessibility/browser_views_accessibility_browsertest.cc index 428fb20..d34f796 100644 --- a/chrome/browser/accessibility/browser_views_accessibility_browsertest.cc +++ b/chrome/browser/accessibility/browser_views_accessibility_browsertest.cc @@ -21,7 +21,7 @@ #include "ui/base/l10n/l10n_util.h" #include "ui/base/win/atl_module.h" #include "ui/views/accessibility/native_view_accessibility_win.h" -#include "views/widget/widget.h" +#include "ui/views/widget/widget.h" namespace { diff --git a/chrome/browser/aeropeek_manager.cc b/chrome/browser/aeropeek_manager.cc index b88de5d..129fe9c 100644 --- a/chrome/browser/aeropeek_manager.cc +++ b/chrome/browser/aeropeek_manager.cc @@ -38,7 +38,7 @@ #include "ui/base/win/window_impl.h" #include "ui/gfx/gdi_util.h" #include "ui/gfx/icon_util.h" -#include "views/widget/native_widget_win.h" +#include "ui/views/widget/native_widget_win.h" #pragma comment(lib, "dwmapi.lib") diff --git a/chrome/browser/automation/automation_provider_win.cc b/chrome/browser/automation/automation_provider_win.cc index 4fa7a9c..d3b3db2 100644 --- a/chrome/browser/automation/automation_provider_win.cc +++ b/chrome/browser/automation/automation_provider_win.cc @@ -27,7 +27,7 @@ #include "content/public/common/page_zoom.h" #include "ui/base/keycodes/keyboard_codes.h" #include "ui/views/focus/accelerator_handler.h" -#include "views/widget/root_view.h" +#include "ui/views/widget/root_view.h" // This task just adds another task to the event queue. This is useful if // you want to ensure that any tasks added to the event queue after this one diff --git a/chrome/browser/automation/testing_automation_provider_chromeos.cc b/chrome/browser/automation/testing_automation_provider_chromeos.cc index aec1f94..e4411cc7 100644 --- a/chrome/browser/automation/testing_automation_provider_chromeos.cc +++ b/chrome/browser/automation/testing_automation_provider_chromeos.cc @@ -39,7 +39,7 @@ #include "chrome/common/pref_names.h" #include "net/base/network_change_notifier.h" #include "policy/policy_constants.h" -#include "views/widget/widget.h" +#include "ui/views/widget/widget.h" using chromeos::CrosLibrary; using chromeos::NetworkLibrary; diff --git a/chrome/browser/automation/testing_automation_provider_views.cc b/chrome/browser/automation/testing_automation_provider_views.cc index 8abbf35..bc25412 100644 --- a/chrome/browser/automation/testing_automation_provider_views.cc +++ b/chrome/browser/automation/testing_automation_provider_views.cc @@ -5,8 +5,8 @@ #include "chrome/browser/automation/testing_automation_provider.h" #include "base/bind.h" -#include "base/memory/weak_ptr.h" #include "base/compiler_specific.h" +#include "base/memory/weak_ptr.h" #include "chrome/browser/automation/automation_browser_tracker.h" #include "chrome/browser/automation/automation_window_tracker.h" #include "chrome/browser/ui/browser_window.h" @@ -14,9 +14,9 @@ #include "chrome/browser/ui/views/toolbar_view.h" #include "chrome/common/automation_messages.h" #include "ui/gfx/point.h" +#include "ui/views/widget/widget.h" #include "views/controls/menu/menu_listener.h" #include "views/view.h" -#include "views/widget/widget.h" namespace { diff --git a/chrome/browser/automation/ui_controls_gtk.cc b/chrome/browser/automation/ui_controls_gtk.cc index 0ca2378..f72d9da 100644 --- a/chrome/browser/automation/ui_controls_gtk.cc +++ b/chrome/browser/automation/ui_controls_gtk.cc @@ -17,8 +17,8 @@ #include "ui/gfx/rect.h" #if defined(TOOLKIT_VIEWS) +#include "ui/views/widget/widget.h" #include "views/view.h" -#include "views/widget/widget.h" #endif namespace { diff --git a/chrome/browser/bookmarks/bookmark_utils.cc b/chrome/browser/bookmarks/bookmark_utils.cc index b09d314..99b7c9f 100644 --- a/chrome/browser/bookmarks/bookmark_utils.cc +++ b/chrome/browser/bookmarks/bookmark_utils.cc @@ -42,9 +42,9 @@ #if defined(TOOLKIT_VIEWS) #include "ui/base/dragdrop/os_exchange_data.h" #include "ui/views/events/event.h" +#include "ui/views/widget/native_widget.h" +#include "ui/views/widget/widget.h" #include "views/drag_utils.h" -#include "views/widget/native_widget.h" -#include "views/widget/widget.h" #endif #if defined(TOOLKIT_GTK) diff --git a/chrome/browser/chrome_browser_main_extra_parts_views.cc b/chrome/browser/chrome_browser_main_extra_parts_views.cc index af505df..879dc0f 100644 --- a/chrome/browser/chrome_browser_main_extra_parts_views.cc +++ b/chrome/browser/chrome_browser_main_extra_parts_views.cc @@ -9,7 +9,7 @@ #include "base/command_line.h" #include "chrome/browser/ui/views/chrome_views_delegate.h" #include "chrome/common/chrome_switches.h" -#include "views/widget/widget.h" +#include "ui/views/widget/widget.h" ChromeBrowserMainExtraPartsViews::ChromeBrowserMainExtraPartsViews() : ChromeBrowserMainExtraParts() { diff --git a/chrome/browser/chrome_browser_main_win.cc b/chrome/browser/chrome_browser_main_win.cc index 16dd72a..928315b 100644 --- a/chrome/browser/chrome_browser_main_win.cc +++ b/chrome/browser/chrome_browser_main_win.cc @@ -41,7 +41,7 @@ #include "ui/base/message_box_win.h" #include "ui/gfx/platform_font_win.h" #include "ui/views/focus/accelerator_handler.h" -#include "views/widget/widget.h" +#include "ui/views/widget/widget.h" namespace { 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 53ae5d0..df976b2 100644 --- a/chrome/browser/chromeos/frame/browser_view.cc +++ b/chrome/browser/chromeos/frame/browser_view.cc @@ -37,13 +37,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 cc25b9a..df95257 100644 --- a/chrome/browser/chromeos/frame/layout_mode_button.cc +++ b/chrome/browser/chromeos/frame/layout_mode_button.cc @@ -15,7 +15,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 { diff --git a/chrome/browser/download/download_util.cc b/chrome/browser/download/download_util.cc index 4680585..202c288 100644 --- a/chrome/browser/download/download_util.cc +++ b/chrome/browser/download/download_util.cc @@ -64,7 +64,7 @@ #if defined(TOOLKIT_USES_GTK) #if defined(TOOLKIT_VIEWS) #include "ui/base/dragdrop/drag_drop_types.h" -#include "views/widget/native_widget_gtk.h" +#include "ui/views/widget/native_widget_gtk.h" #elif defined(TOOLKIT_GTK) #include "chrome/browser/ui/gtk/custom_drag.h" #include "chrome/browser/ui/gtk/unity_service.h" diff --git a/chrome/browser/extensions/extension_host.cc b/chrome/browser/extensions/extension_host.cc index 36743e3..7ed5730 100644 --- a/chrome/browser/extensions/extension_host.cc +++ b/chrome/browser/extensions/extension_host.cc @@ -24,20 +24,20 @@ #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" #include "chrome/common/chrome_constants.h" #include "chrome/common/chrome_notification_types.h" +#include "chrome/common/chrome_view_types.h" #include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_constants.h" #include "chrome/common/extensions/extension_messages.h" #include "chrome/common/render_messages.h" #include "chrome/common/url_constants.h" -#include "chrome/common/chrome_view_types.h" #include "content/browser/browsing_instance.h" #include "content/browser/renderer_host/render_view_host.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/public/browser/render_process_host.h" #include "content/public/browser/content_browser_client.h" #include "content/public/browser/native_web_keyboard_event.h" +#include "content/public/browser/notification_service.h" +#include "content/public/browser/render_process_host.h" #include "grit/browser_resources.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" @@ -46,7 +46,7 @@ #include "ui/base/resource/resource_bundle.h" #if defined(TOOLKIT_VIEWS) -#include "views/widget/widget.h" +#include "ui/views/widget/widget.h" #endif using WebKit::WebDragOperation; diff --git a/chrome/browser/extensions/extension_input_api.cc b/chrome/browser/extensions/extension_input_api.cc index 4cd134a..a8bfc15 100644 --- a/chrome/browser/extensions/extension_input_api.cc +++ b/chrome/browser/extensions/extension_input_api.cc @@ -16,8 +16,8 @@ #include "chrome/common/chrome_notification_types.h" #include "ui/views/events/event.h" #include "ui/views/ime/input_method.h" +#include "ui/views/widget/widget.h" #include "views/views_delegate.h" -#include "views/widget/widget.h" #if defined(USE_VIRTUAL_KEYBOARD) #include "content/public/browser/notification_service.h" diff --git a/chrome/browser/external_tab_container_win.h b/chrome/browser/external_tab_container_win.h index 6b5583f..b28d20d 100644 --- a/chrome/browser/external_tab_container_win.h +++ b/chrome/browser/external_tab_container_win.h @@ -25,7 +25,7 @@ #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" #include "ui/base/models/accelerator.h" -#include "views/widget/native_widget_win.h" +#include "ui/views/widget/native_widget_win.h" class AutomationProvider; class Browser; diff --git a/chrome/browser/first_run/try_chrome_dialog_view.cc b/chrome/browser/first_run/try_chrome_dialog_view.cc index c9f76bd..56e817c 100644 --- a/chrome/browser/first_run/try_chrome_dialog_view.cc +++ b/chrome/browser/first_run/try_chrome_dialog_view.cc @@ -20,12 +20,12 @@ #include "ui/gfx/image/image.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/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/widget/widget.h" namespace { diff --git a/chrome/browser/google/google_update.cc b/chrome/browser/google/google_update.cc index 35b0491..dd6afd8 100644 --- a/chrome/browser/google/google_update.cc +++ b/chrome/browser/google/google_update.cc @@ -22,10 +22,10 @@ #include "chrome/installer/util/helper.h" #include "chrome/installer/util/install_util.h" #include "content/public/browser/browser_thread.h" -#include "grit/generated_resources.h" #include "google_update_idl_i.c" +#include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" -#include "views/widget/widget.h" +#include "ui/views/widget/widget.h" using content::BrowserThread; diff --git a/chrome/browser/instant/instant_controller.cc b/chrome/browser/instant/instant_controller.cc index c879b1d..62ed8e9 100644 --- a/chrome/browser/instant/instant_controller.cc +++ b/chrome/browser/instant/instant_controller.cc @@ -31,8 +31,8 @@ #if defined(TOOLKIT_VIEWS) #include "ui/views/focus/focus_manager.h" +#include "ui/views/widget/widget.h" #include "views/view.h" -#include "views/widget/widget.h" #endif InstantController::InstantController(Profile* profile, diff --git a/chrome/browser/tab_first_render_watcher_browsertest.cc b/chrome/browser/tab_first_render_watcher_browsertest.cc index a5c94af..1c81a5f 100644 --- a/chrome/browser/tab_first_render_watcher_browsertest.cc +++ b/chrome/browser/tab_first_render_watcher_browsertest.cc @@ -9,7 +9,7 @@ #include "chrome/common/url_constants.h" #include "chrome/test/base/in_process_browser_test.h" #include "testing/gtest/include/gtest/gtest.h" -#include "views/widget/widget.h" +#include "ui/views/widget/widget.h" namespace { diff --git a/chrome/browser/themes/theme_service.cc b/chrome/browser/themes/theme_service.cc index 8b96356..59d8a8b 100644 --- a/chrome/browser/themes/theme_service.cc +++ b/chrome/browser/themes/theme_service.cc @@ -21,7 +21,7 @@ #include "ui/base/resource/resource_bundle.h" #if defined(OS_WIN) && !defined(USE_AURA) -#include "views/widget/native_widget_win.h" +#include "ui/views/widget/native_widget_win.h" #endif using content::BrowserThread; diff --git a/chrome/browser/ui/browser_list_win.cc b/chrome/browser/ui/browser_list_win.cc index 9c8fe46..88a46b1 100644 --- a/chrome/browser/ui/browser_list_win.cc +++ b/chrome/browser/ui/browser_list_win.cc @@ -4,7 +4,7 @@ #include "chrome/browser/ui/browser_list.h" -#include "views/widget/widget.h" +#include "ui/views/widget/widget.h" // static void BrowserList::AllBrowsersClosedAndAppExiting() { diff --git a/chrome/browser/ui/confirm_bubble_model.cc b/chrome/browser/ui/confirm_bubble_model.cc index edc379f..5c4fad7 100644 --- a/chrome/browser/ui/confirm_bubble_model.cc +++ b/chrome/browser/ui/confirm_bubble_model.cc @@ -11,7 +11,7 @@ #if defined(TOOLKIT_VIEWS) #include "chrome/browser/ui/views/confirm_bubble_view.h" #include "ui/gfx/rect.h" -#include "views/widget/widget.h" +#include "ui/views/widget/widget.h" #endif ConfirmBubbleModel::ConfirmBubbleModel() { 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 2294daa..153ef35 100644 --- a/chrome/browser/ui/find_bar/find_bar_host_browsertest.cc +++ b/chrome/browser/ui/find_bar/find_bar_host_browsertest.cc @@ -30,7 +30,7 @@ #if defined(TOOLKIT_VIEWS) #include "chrome/browser/ui/views/find_bar_host.h" #include "ui/views/focus/focus_manager.h" -#include "views/widget/widget.h" +#include "ui/views/widget/widget.h" #elif defined(TOOLKIT_GTK) #include "chrome/browser/ui/gtk/slide_animator_gtk.h" #elif defined(OS_MACOSX) diff --git a/chrome/browser/ui/input_window_dialog_win.cc b/chrome/browser/ui/input_window_dialog_win.cc index 8e6ebbb..6dbd92c2 100644 --- a/chrome/browser/ui/input_window_dialog_win.cc +++ b/chrome/browser/ui/input_window_dialog_win.cc @@ -15,11 +15,11 @@ #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 "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/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 d88b6ba..372a36f 100644 --- a/chrome/browser/ui/omnibox/omnibox_view_browsertest.cc +++ b/chrome/browser/ui/omnibox/omnibox_view_browsertest.cc @@ -44,8 +44,8 @@ #if defined(TOOLKIT_VIEWS) #include "ui/views/events/event.h" +#include "ui/views/widget/widget.h" #include "views/controls/textfield/native_textfield_views.h" -#include "views/widget/widget.h" #endif using base::Time; diff --git a/chrome/browser/ui/panels/auto_hiding_desktop_bar_win.cc b/chrome/browser/ui/panels/auto_hiding_desktop_bar_win.cc index c20b2bc..06ae85a 100644 --- a/chrome/browser/ui/panels/auto_hiding_desktop_bar_win.cc +++ b/chrome/browser/ui/panels/auto_hiding_desktop_bar_win.cc @@ -7,7 +7,7 @@ #include <shellapi.h> #include "base/logging.h" -#include "views/widget/monitor_win.h" +#include "ui/views/widget/monitor_win.h" namespace { // The thickness of the area of an auto-hiding taskbar that is still visible diff --git a/chrome/browser/ui/panels/panel_browser_frame_view.cc b/chrome/browser/ui/panels/panel_browser_frame_view.cc index 7391e76..fde9b00 100644 --- a/chrome/browser/ui/panels/panel_browser_frame_view.cc +++ b/chrome/browser/ui/panels/panel_browser_frame_view.cc @@ -27,14 +27,14 @@ #include "ui/gfx/canvas_skia.h" #include "ui/gfx/path.h" #include "ui/gfx/screen.h" +#include "ui/views/widget/widget_delegate.h" #include "views/controls/button/image_button.h" #include "views/controls/button/menu_button.h" +#include "views/controls/label.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/label.h" #include "views/painter.h" -#include "views/widget/widget_delegate.h" namespace { diff --git a/chrome/browser/ui/panels/panel_browser_view.cc b/chrome/browser/ui/panels/panel_browser_view.cc index 9283f07..2097753 100644 --- a/chrome/browser/ui/panels/panel_browser_view.cc +++ b/chrome/browser/ui/panels/panel_browser_view.cc @@ -17,8 +17,8 @@ #include "grit/chromium_strings.h" #include "ui/base/animation/slide_animation.h" #include "ui/base/l10n/l10n_util.h" +#include "ui/views/widget/widget.h" #include "views/controls/label.h" -#include "views/widget/widget.h" namespace { // This value is experimental and subjective. diff --git a/chrome/browser/ui/touch/status_bubble_touch.h b/chrome/browser/ui/touch/status_bubble_touch.h index ab758be..15fc1f1 100644 --- a/chrome/browser/ui/touch/status_bubble_touch.h +++ b/chrome/browser/ui/touch/status_bubble_touch.h @@ -7,7 +7,7 @@ #pragma once #include "chrome/browser/ui/views/status_bubble_views.h" -#include "views/widget/widget.h" +#include "ui/views/widget/widget.h" // The touch version of the status bubble. This repositions itself as the // keyboard slides up/down. diff --git a/chrome/browser/ui/touch/tabs/touch_tab_strip.cc b/chrome/browser/ui/touch/tabs/touch_tab_strip.cc index c39fe23..08bce47 100644 --- a/chrome/browser/ui/touch/tabs/touch_tab_strip.cc +++ b/chrome/browser/ui/touch/tabs/touch_tab_strip.cc @@ -5,7 +5,7 @@ #include "chrome/browser/ui/touch/tabs/touch_tab_strip.h" #include "chrome/browser/ui/touch/tabs/touch_tab.h" -#include "views/widget/widget.h" +#include "ui/views/widget/widget.h" TouchTabStrip::TouchTabStrip(TabStripController* controller) : TabStrip(controller) { diff --git a/chrome/browser/ui/views/about_chrome_view.cc b/chrome/browser/ui/views/about_chrome_view.cc index a96e8bf..87074bd 100644 --- a/chrome/browser/ui/views/about_chrome_view.cc +++ b/chrome/browser/ui/views/about_chrome_view.cc @@ -35,12 +35,12 @@ #include "ui/gfx/canvas.h" #include "ui/gfx/color_utils.h" #include "ui/views/layout/layout_constants.h" +#include "ui/views/widget/widget.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/view_text_utils.h" -#include "views/widget/widget.h" #include "webkit/glue/webkit_glue.h" #if defined(OS_WIN) diff --git a/chrome/browser/ui/views/about_ipc_dialog.cc b/chrome/browser/ui/views/about_ipc_dialog.cc index 669893b..eb93436 100644 --- a/chrome/browser/ui/views/about_ipc_dialog.cc +++ b/chrome/browser/ui/views/about_ipc_dialog.cc @@ -32,9 +32,9 @@ #include "net/url_request/url_request_job.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/controls/native/native_view_host.h" -#include "views/widget/widget.h" namespace { diff --git a/chrome/browser/ui/views/accessibility_event_router_views.cc b/chrome/browser/ui/views/accessibility_event_router_views.cc index 798d030..97b161ffc 100644 --- a/chrome/browser/ui/views/accessibility_event_router_views.cc +++ b/chrome/browser/ui/views/accessibility_event_router_views.cc @@ -14,11 +14,11 @@ #include "chrome/browser/profiles/profile_manager.h" #include "chrome/common/chrome_notification_types.h" #include "ui/base/accessibility/accessible_view_state.h" +#include "ui/views/widget/widget.h" #include "views/controls/button/text_button.h" #include "views/controls/menu/menu_item_view.h" #include "views/controls/menu/submenu_view.h" #include "views/view.h" -#include "views/widget/widget.h" using views::FocusManager; 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 9d77a53..c77100b 100644 --- a/chrome/browser/ui/views/accessibility_event_router_views_unittest.cc +++ b/chrome/browser/ui/views/accessibility_event_router_views_unittest.cc @@ -15,12 +15,12 @@ #include "content/public/browser/notification_service.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/views/layout/grid_layout.h" +#include "ui/views/widget/native_widget.h" +#include "ui/views/widget/root_view.h" +#include "ui/views/widget/widget.h" +#include "ui/views/widget/widget_delegate.h" #include "views/controls/button/text_button.h" #include "views/views_delegate.h" -#include "views/widget/native_widget.h" -#include "views/widget/root_view.h" -#include "views/widget/widget.h" -#include "views/widget/widget_delegate.h" #if defined(TOOLKIT_VIEWS) diff --git a/chrome/browser/ui/views/app_menu_button_win.cc b/chrome/browser/ui/views/app_menu_button_win.cc index 0718cb8..6e26b11 100644 --- a/chrome/browser/ui/views/app_menu_button_win.cc +++ b/chrome/browser/ui/views/app_menu_button_win.cc @@ -5,7 +5,7 @@ #include "chrome/browser/ui/views/app_menu_button_win.h" #include "ui/base/win/hwnd_util.h" -#include "views/widget/widget.h" +#include "ui/views/widget/widget.h" AppMenuButtonWin::AppMenuButtonWin(views::ViewMenuDelegate* menu_delegate) : views::MenuButton(NULL, string16(), menu_delegate, false) { diff --git a/chrome/browser/ui/views/aura/app_list_window.cc b/chrome/browser/ui/views/aura/app_list_window.cc index 75dc673..f0aef7a 100644 --- a/chrome/browser/ui/views/aura/app_list_window.cc +++ b/chrome/browser/ui/views/aura/app_list_window.cc @@ -9,7 +9,7 @@ #include "chrome/common/url_constants.h" #include "content/browser/renderer_host/render_view_host.h" #include "content/browser/renderer_host/render_widget_host_view.h" -#include "views/widget/widget.h" +#include "ui/views/widget/widget.h" AppListWindow::AppListWindow( const aura_shell::ShellDelegate::SetWidgetCallback& callback) diff --git a/chrome/browser/ui/views/aura/app_list_window.h b/chrome/browser/ui/views/aura/app_list_window.h index 347028b..53f4f52 100644 --- a/chrome/browser/ui/views/aura/app_list_window.h +++ b/chrome/browser/ui/views/aura/app_list_window.h @@ -9,7 +9,7 @@ #include "base/memory/scoped_ptr.h" #include "chrome/browser/tab_first_render_watcher.h" #include "ui/aura_shell/shell_delegate.h" -#include "views/widget/widget_delegate.h" +#include "ui/views/widget/widget_delegate.h" class DOMView; diff --git a/chrome/browser/ui/views/aura/status_area_host_aura.cc b/chrome/browser/ui/views/aura/status_area_host_aura.cc index d2883d4..21e74ab 100644 --- a/chrome/browser/ui/views/aura/status_area_host_aura.cc +++ b/chrome/browser/ui/views/aura/status_area_host_aura.cc @@ -5,18 +5,18 @@ #include "chrome/browser/ui/views/aura/status_area_host_aura.h" #include "base/command_line.h" +#include "chrome/browser/chromeos/status/clock_menu_button.h" +#include "chrome/browser/chromeos/status/memory_menu_button.h" +#include "chrome/browser/chromeos/status/status_area_view.h" #include "chrome/browser/profiles/profile_manager.h" #include "chrome/browser/ui/browser_list.h" #include "chrome/browser/ui/view_ids.h" #include "chrome/browser/ui/views/aura/chrome_shell_delegate.h" -#include "chrome/browser/chromeos/status/clock_menu_button.h" -#include "chrome/browser/chromeos/status/memory_menu_button.h" -#include "chrome/browser/chromeos/status/status_area_view.h" #include "chrome/common/chrome_switches.h" #include "ui/aura/window.h" #include "ui/aura_shell/shell.h" #include "ui/aura_shell/shell_window_ids.h" -#include "views/widget/widget.h" +#include "ui/views/widget/widget.h" #if defined(OS_CHROMEOS) #include "chrome/browser/chromeos/status/status_area_view_chromeos.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 3d20eb3..726f39c 100644 --- a/chrome/browser/ui/views/autocomplete/autocomplete_popup_contents_view.cc +++ b/chrome/browser/ui/views/autocomplete/autocomplete_popup_contents_view.cc @@ -32,16 +32,16 @@ #include "ui/views/bubble/bubble_border.h" #include "ui/views/layout/grid_layout.h" #include "ui/views/layout/layout_constants.h" +#include "ui/views/widget/widget.h" #include "unicode/ubidi.h" #include "views/controls/button/text_button.h" #include "views/controls/label.h" #include "views/painter.h" -#include "views/widget/widget.h" #if defined(OS_WIN) #include "base/win/scoped_gdi_object.h" #if !defined(USE_AURA) -#include "views/widget/native_widget_win.h" +#include "ui/views/widget/native_widget_win.h" #endif #endif diff --git a/chrome/browser/ui/views/avatar_menu_button.cc b/chrome/browser/ui/views/avatar_menu_button.cc index a12c759..ba7738b 100644 --- a/chrome/browser/ui/views/avatar_menu_button.cc +++ b/chrome/browser/ui/views/avatar_menu_button.cc @@ -9,7 +9,7 @@ #include "chrome/browser/ui/views/avatar_menu_bubble_view.h" #include "chrome/browser/ui/views/frame/browser_view.h" #include "ui/gfx/canvas_skia.h" -#include "views/widget/widget.h" +#include "ui/views/widget/widget.h" #if defined(OS_WIN) diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc index ec950a4..0868c13 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc +++ b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc @@ -53,14 +53,14 @@ #include "ui/base/resource/resource_bundle.h" #include "ui/base/text/text_elider.h" #include "ui/gfx/canvas_skia.h" +#include "ui/views/widget/tooltip_manager.h" +#include "ui/views/widget/widget.h" #include "views/controls/button/menu_button.h" #include "views/controls/label.h" #include "views/controls/menu/menu_item_view.h" #include "views/drag_utils.h" #include "views/metrics.h" #include "views/view_constants.h" -#include "views/widget/tooltip_manager.h" -#include "views/widget/widget.h" using views::CustomButton; using views::DropTargetEvent; diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc b/chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc index 40cfe9a..afdabb9 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc +++ b/chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc @@ -28,13 +28,13 @@ #include "ui/base/accessibility/accessibility_types.h" #include "ui/base/clipboard/clipboard.h" #include "ui/base/keycodes/keyboard_codes.h" +#include "ui/views/widget/widget.h" #include "views/controls/button/menu_button.h" #include "views/controls/button/text_button.h" #include "views/controls/menu/menu_controller.h" #include "views/controls/menu/menu_item_view.h" #include "views/controls/menu/submenu_view.h" #include "views/views_delegate.h" -#include "views/widget/widget.h" using content::BrowserThread; diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc b/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc index 35cdd17..26b0649 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc +++ b/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc @@ -25,11 +25,11 @@ #include "ui/views/events/event.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/controls/label.h" #include "views/controls/link.h" #include "views/controls/textfield/textfield.h" -#include "views/widget/widget.h" using views::ColumnSet; using views::GridLayout; diff --git a/chrome/browser/ui/views/bookmarks/bookmark_context_menu.cc b/chrome/browser/ui/views/bookmarks/bookmark_context_menu.cc index db997b3..4064b37 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_context_menu.cc +++ b/chrome/browser/ui/views/bookmarks/bookmark_context_menu.cc @@ -13,9 +13,9 @@ #include "content/public/browser/notification_service.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" +#include "ui/views/widget/widget.h" #include "views/controls/menu/menu_item_view.h" #include "views/controls/menu/menu_runner.h" -#include "views/widget/widget.h" //////////////////////////////////////////////////////////////////////////////// // BookmarkContextMenu, public: diff --git a/chrome/browser/ui/views/bookmarks/bookmark_context_menu_controller_views.cc b/chrome/browser/ui/views/bookmarks/bookmark_context_menu_controller_views.cc index 2ba6851..5e6442b 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_context_menu_controller_views.cc +++ b/chrome/browser/ui/views/bookmarks/bookmark_context_menu_controller_views.cc @@ -18,7 +18,7 @@ #include "content/browser/tab_contents/page_navigator.h" #include "content/browser/user_metrics.h" #include "grit/generated_resources.h" -#include "views/widget/widget.h" +#include "ui/views/widget/widget.h" BookmarkContextMenuControllerViews::BookmarkContextMenuControllerViews( views::Widget* parent_widget, diff --git a/chrome/browser/ui/views/bookmarks/bookmark_editor_view.cc b/chrome/browser/ui/views/bookmarks/bookmark_editor_view.cc index 44087be..35c54d8 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_editor_view.cc +++ b/chrome/browser/ui/views/bookmarks/bookmark_editor_view.cc @@ -26,12 +26,12 @@ #include "ui/views/focus/focus_manager.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/label.h" #include "views/controls/menu/menu_2.h" #include "views/controls/textfield/textfield.h" -#include "views/widget/widget.h" using views::GridLayout; diff --git a/chrome/browser/ui/views/bookmarks/bookmark_menu_controller_views.cc b/chrome/browser/ui/views/bookmarks/bookmark_menu_controller_views.cc index b7ab56d..cb860da4 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_menu_controller_views.cc +++ b/chrome/browser/ui/views/bookmarks/bookmark_menu_controller_views.cc @@ -22,9 +22,9 @@ #include "grit/ui_resources.h" #include "ui/base/dragdrop/os_exchange_data.h" #include "ui/base/resource/resource_bundle.h" +#include "ui/views/widget/widget.h" #include "views/controls/button/menu_button.h" #include "views/controls/menu/menu_runner.h" -#include "views/widget/widget.h" using views::MenuItemView; diff --git a/chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.cc b/chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.cc index 02cd6a0..d72d310 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.cc +++ b/chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.cc @@ -21,10 +21,10 @@ #include "ui/base/dragdrop/os_exchange_data.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.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/submenu_view.h" -#include "views/widget/widget.h" using views::MenuItemView; diff --git a/chrome/browser/ui/views/browser_bubble.cc b/chrome/browser/ui/views/browser_bubble.cc index 5cafa9a..71a92765 100644 --- a/chrome/browser/ui/views/browser_bubble.cc +++ b/chrome/browser/ui/views/browser_bubble.cc @@ -6,7 +6,7 @@ #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/views/frame/browser_view.h" -#include "views/widget/widget.h" +#include "ui/views/widget/widget.h" BrowserBubble::BrowserBubble(Browser* browser, views::View* view, diff --git a/chrome/browser/ui/views/browser_bubble.h b/chrome/browser/ui/views/browser_bubble.h index e563572..f16e8d4 100644 --- a/chrome/browser/ui/views/browser_bubble.h +++ b/chrome/browser/ui/views/browser_bubble.h @@ -7,8 +7,8 @@ #pragma once #include "ui/views/bubble/bubble_border.h" +#include "ui/views/widget/widget.h" #include "views/view.h" -#include "views/widget/widget.h" class Browser; class BrowserBubbleHost; diff --git a/chrome/browser/ui/views/browser_bubble_gtk.cc b/chrome/browser/ui/views/browser_bubble_gtk.cc index fa06326..c4ef16a 100644 --- a/chrome/browser/ui/views/browser_bubble_gtk.cc +++ b/chrome/browser/ui/views/browser_bubble_gtk.cc @@ -8,8 +8,8 @@ #include "chrome/browser/ui/views/bubble/border_contents.h" #include "chrome/browser/ui/views/frame/browser_view.h" -#include "views/widget/root_view.h" -#include "views/widget/native_widget_gtk.h" +#include "ui/views/widget/native_widget_gtk.h" +#include "ui/views/widget/root_view.h" #if defined(OS_CHROMEOS) && defined(TOOLKIT_USES_GTK) #include "chrome/browser/chromeos/legacy_window_manager/wm_ipc.h" diff --git a/chrome/browser/ui/views/browser_bubble_win.cc b/chrome/browser/ui/views/browser_bubble_win.cc index e53b7aa..aa3de5a 100644 --- a/chrome/browser/ui/views/browser_bubble_win.cc +++ b/chrome/browser/ui/views/browser_bubble_win.cc @@ -7,9 +7,9 @@ #include "chrome/browser/ui/views/bubble/border_contents.h" #include "chrome/browser/ui/views/bubble/border_widget_win.h" #include "chrome/browser/ui/views/frame/browser_view.h" -#include "views/widget/root_view.h" -#include "views/widget/native_widget_win.h" -#include "views/widget/widget.h" +#include "ui/views/widget/native_widget_win.h" +#include "ui/views/widget/root_view.h" +#include "ui/views/widget/widget.h" class BubbleWidget : public views::NativeWidgetWin { public: diff --git a/chrome/browser/ui/views/bubble/border_widget_win.cc b/chrome/browser/ui/views/bubble/border_widget_win.cc index 528de19..1a5be37 100644 --- a/chrome/browser/ui/views/bubble/border_widget_win.cc +++ b/chrome/browser/ui/views/bubble/border_widget_win.cc @@ -7,7 +7,7 @@ #include <windows.h> #include "chrome/browser/ui/views/bubble/border_contents.h" -#include "views/widget/widget.h" +#include "ui/views/widget/widget.h" BorderWidgetWin::BorderWidgetWin() : views::NativeWidgetWin(new views::Widget), diff --git a/chrome/browser/ui/views/bubble/border_widget_win.h b/chrome/browser/ui/views/bubble/border_widget_win.h index ba75fb0..9179d67 100644 --- a/chrome/browser/ui/views/bubble/border_widget_win.h +++ b/chrome/browser/ui/views/bubble/border_widget_win.h @@ -7,7 +7,7 @@ #pragma once #include "ui/views/bubble/bubble_border.h" -#include "views/widget/native_widget_win.h" +#include "ui/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 8691fd7..9467604 100644 --- a/chrome/browser/ui/views/bubble/bubble.cc +++ b/chrome/browser/ui/views/bubble/bubble.cc @@ -12,8 +12,8 @@ #include "ui/base/keycodes/keyboard_codes.h" #include "ui/gfx/color_utils.h" #include "ui/views/layout/fill_layout.h" +#include "ui/views/widget/widget.h" #include "ui/views/window/client_view.h" -#include "views/widget/widget.h" #if defined(OS_CHROMEOS) && defined(TOOLKIT_USES_GTK) #include "chrome/browser/chromeos/legacy_window_manager/wm_ipc.h" diff --git a/chrome/browser/ui/views/bubble/bubble.h b/chrome/browser/ui/views/bubble/bubble.h index 0a045f15..c02a921 100644 --- a/chrome/browser/ui/views/bubble/bubble.h +++ b/chrome/browser/ui/views/bubble/bubble.h @@ -13,11 +13,11 @@ #include "views/view.h" #if defined(USE_AURA) -#include "views/widget/native_widget_aura.h" +#include "ui/views/widget/native_widget_aura.h" #elif defined(OS_WIN) -#include "views/widget/native_widget_win.h" +#include "ui/views/widget/native_widget_win.h" #elif defined(TOOLKIT_USES_GTK) -#include "views/widget/native_widget_gtk.h" +#include "ui/views/widget/native_widget_gtk.h" #endif // Bubble is used to display an arbitrary view above all other windows. diff --git a/chrome/browser/ui/views/chrome_views_delegate.cc b/chrome/browser/ui/views/chrome_views_delegate.cc index 4072dab..250bc9e 100644 --- a/chrome/browser/ui/views/chrome_views_delegate.cc +++ b/chrome/browser/ui/views/chrome_views_delegate.cc @@ -17,8 +17,8 @@ #include "chrome/common/pref_names.h" #include "ui/base/clipboard/clipboard.h" #include "ui/gfx/rect.h" -#include "views/widget/native_widget.h" -#include "views/widget/widget.h" +#include "ui/views/widget/native_widget.h" +#include "ui/views/widget/widget.h" #if defined(OS_WIN) #include "chrome/browser/app_icon_win.h" diff --git a/chrome/browser/ui/views/collected_cookies_win.cc b/chrome/browser/ui/views/collected_cookies_win.cc index 221c2e1..f22ef16 100644 --- a/chrome/browser/ui/views/collected_cookies_win.cc +++ b/chrome/browser/ui/views/collected_cookies_win.cc @@ -28,11 +28,11 @@ #include "ui/views/layout/box_layout.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/controls/image_view.h" #include "views/controls/label.h" #include "views/controls/tabbed_pane/tabbed_pane.h" -#include "views/widget/widget.h" namespace browser { diff --git a/chrome/browser/ui/views/constrained_html_delegate_gtk.cc b/chrome/browser/ui/views/constrained_html_delegate_gtk.cc index 35815f8..bbb7548d 100644 --- a/chrome/browser/ui/views/constrained_html_delegate_gtk.cc +++ b/chrome/browser/ui/views/constrained_html_delegate_gtk.cc @@ -13,7 +13,7 @@ #include "content/browser/tab_contents/tab_contents.h" #include "ui/base/gtk/gtk_hig_constants.h" #include "ui/gfx/rect.h" -#include "views/widget/native_widget_gtk.h" +#include "ui/views/widget/native_widget_gtk.h" // ConstrainedHtmlDelegateGtk works with ConstrainedWindowGtk to present // a TabContents in a ContraintedHtmlUI. diff --git a/chrome/browser/ui/views/constrained_html_delegate_views.cc b/chrome/browser/ui/views/constrained_html_delegate_views.cc index 7342879..bb7fdfc 100644 --- a/chrome/browser/ui/views/constrained_html_delegate_views.cc +++ b/chrome/browser/ui/views/constrained_html_delegate_views.cc @@ -13,8 +13,8 @@ #include "chrome/browser/ui/webui/html_dialog_ui.h" #include "content/browser/tab_contents/tab_contents.h" #include "ui/gfx/rect.h" +#include "ui/views/widget/widget_delegate.h" #include "views/view.h" -#include "views/widget/widget_delegate.h" class ConstrainedHtmlDelegateViews : public TabContentsContainer, public ConstrainedHtmlUIDelegate, diff --git a/chrome/browser/ui/views/constrained_window_views.cc b/chrome/browser/ui/views/constrained_window_views.cc index 6e19fb8..5d68c9c 100644 --- a/chrome/browser/ui/views/constrained_window_views.cc +++ b/chrome/browser/ui/views/constrained_window_views.cc @@ -32,16 +32,16 @@ #include "ui/gfx/path.h" #include "ui/gfx/rect.h" #include "ui/views/focus/focus_manager.h" +#include "ui/views/widget/widget.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/views_delegate.h" -#include "views/widget/widget.h" #if defined(OS_WIN) && !defined(USE_AURA) -#include "views/widget/native_widget_win.h" +#include "ui/views/widget/native_widget_win.h" #endif using base::TimeDelta; diff --git a/chrome/browser/ui/views/constrained_window_views.h b/chrome/browser/ui/views/constrained_window_views.h index fd3583f..f42a8b5 100644 --- a/chrome/browser/ui/views/constrained_window_views.h +++ b/chrome/browser/ui/views/constrained_window_views.h @@ -10,7 +10,7 @@ #include "chrome/browser/ui/constrained_window.h" #include "ui/gfx/native_widget_types.h" #include "ui/gfx/rect.h" -#include "views/widget/widget.h" +#include "ui/views/widget/widget.h" class TabContentsWrapper; diff --git a/chrome/browser/ui/views/create_application_shortcut_view.cc b/chrome/browser/ui/views/create_application_shortcut_view.cc index 6076084..e1d674e 100644 --- a/chrome/browser/ui/views/create_application_shortcut_view.cc +++ b/chrome/browser/ui/views/create_application_shortcut_view.cc @@ -36,10 +36,10 @@ #include "ui/gfx/codec/png_codec.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/checkbox.h" #include "views/controls/image_view.h" #include "views/controls/label.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 0f4f2ba..d943d0a 100644 --- a/chrome/browser/ui/views/critical_notification_bubble_view.cc +++ b/chrome/browser/ui/views/critical_notification_bubble_view.cc @@ -21,10 +21,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/text_button.h" #include "views/controls/image_view.h" #include "views/controls/label.h" -#include "views/widget/widget.h" namespace { diff --git a/chrome/browser/ui/views/default_search_view.cc b/chrome/browser/ui/views/default_search_view.cc index 716b021..8208a52 100644 --- a/chrome/browser/ui/views/default_search_view.cc +++ b/chrome/browser/ui/views/default_search_view.cc @@ -24,11 +24,11 @@ #include "ui/gfx/canvas.h" #include "ui/views/layout/grid_layout.h" #include "ui/views/layout/layout_constants.h" +#include "ui/views/widget/widget.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/widget/widget.h" namespace { diff --git a/chrome/browser/ui/views/dom_view_browsertest.cc b/chrome/browser/ui/views/dom_view_browsertest.cc index 9781993..7f3c791 100644 --- a/chrome/browser/ui/views/dom_view_browsertest.cc +++ b/chrome/browser/ui/views/dom_view_browsertest.cc @@ -8,7 +8,7 @@ #include "chrome/test/base/ui_test_utils.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/notification_types.h" -#include "views/widget/widget.h" +#include "ui/views/widget/widget.h" using views::Widget; 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 e4c8171..f28635d9 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 @@ -20,9 +20,9 @@ #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/size.h" #include "ui/views/layout/grid_layout.h" +#include "ui/views/widget/widget.h" #include "views/border.h" #include "views/controls/label.h" -#include "views/widget/widget.h" DownloadInProgressDialogView::DownloadInProgressDialogView(Browser* browser) : browser_(browser), diff --git a/chrome/browser/ui/views/download/download_item_view.cc b/chrome/browser/ui/views/download/download_item_view.cc index d90f31c..986ee63 100644 --- a/chrome/browser/ui/views/download/download_item_view.cc +++ b/chrome/browser/ui/views/download/download_item_view.cc @@ -34,11 +34,11 @@ #include "ui/gfx/canvas_skia.h" #include "ui/gfx/color_utils.h" #include "ui/gfx/image/image.h" +#include "ui/views/widget/root_view.h" +#include "ui/views/widget/widget.h" #include "unicode/uchar.h" #include "views/controls/button/text_button.h" #include "views/controls/label.h" -#include "views/widget/root_view.h" -#include "views/widget/widget.h" // TODO(paulg): These may need to be adjusted when download progress // animation is added, and also possibly to take into account diff --git a/chrome/browser/ui/views/download/download_started_animation_views.cc b/chrome/browser/ui/views/download/download_started_animation_views.cc index 9af05d9..caef753 100644 --- a/chrome/browser/ui/views/download/download_started_animation_views.cc +++ b/chrome/browser/ui/views/download/download_started_animation_views.cc @@ -13,8 +13,8 @@ #include "ui/base/animation/linear_animation.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/rect.h" +#include "ui/views/widget/widget.h" #include "views/controls/image_view.h" -#include "views/widget/widget.h" // How long to spend moving downwards and fading out after waiting. static const int kMoveTimeMs = 600; diff --git a/chrome/browser/ui/views/dropdown_bar_host.cc b/chrome/browser/ui/views/dropdown_bar_host.cc index b66d70f..856ec68 100644 --- a/chrome/browser/ui/views/dropdown_bar_host.cc +++ b/chrome/browser/ui/views/dropdown_bar_host.cc @@ -16,7 +16,7 @@ #include "ui/gfx/scrollbar_size.h" #include "ui/views/focus/external_focus_tracker.h" #include "ui/views/focus/view_storage.h" -#include "views/widget/widget.h" +#include "ui/views/widget/widget.h" #if defined(USE_AURA) #include "ui/gfx/scoped_sk_region.h" diff --git a/chrome/browser/ui/views/dropdown_bar_host_aura.cc b/chrome/browser/ui/views/dropdown_bar_host_aura.cc index bfeee0f..3c21a8e 100644 --- a/chrome/browser/ui/views/dropdown_bar_host_aura.cc +++ b/chrome/browser/ui/views/dropdown_bar_host_aura.cc @@ -6,7 +6,7 @@ #include "base/logging.h" #include "ui/aura/window.h" -#include "views/widget/widget.h" +#include "ui/views/widget/widget.h" NativeWebKeyboardEvent DropdownBarHost::GetKeyboardEvent( const TabContents* contents, diff --git a/chrome/browser/ui/views/dropdown_bar_host_gtk.cc b/chrome/browser/ui/views/dropdown_bar_host_gtk.cc index cb53155..a064f3f 100644 --- a/chrome/browser/ui/views/dropdown_bar_host_gtk.cc +++ b/chrome/browser/ui/views/dropdown_bar_host_gtk.cc @@ -8,7 +8,7 @@ #include "chrome/browser/ui/views/frame/browser_view.h" #include "content/browser/tab_contents/tab_contents.h" -#include "views/widget/widget.h" +#include "ui/views/widget/widget.h" #include "views/controls/textfield/textfield.h" #if defined(TOUCH_UI) diff --git a/chrome/browser/ui/views/dropdown_bar_view.cc b/chrome/browser/ui/views/dropdown_bar_view.cc index 192f7e2..2c5aa56 100644 --- a/chrome/browser/ui/views/dropdown_bar_view.cc +++ b/chrome/browser/ui/views/dropdown_bar_view.cc @@ -11,8 +11,8 @@ #include "grit/theme_resources_standard.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/canvas.h" +#include "ui/views/widget/widget.h" #include "views/background.h" -#include "views/widget/widget.h" namespace { diff --git a/chrome/browser/ui/views/edit_search_engine_dialog.cc b/chrome/browser/ui/views/edit_search_engine_dialog.cc index 568dcf9..f19ad08 100644 --- a/chrome/browser/ui/views/edit_search_engine_dialog.cc +++ b/chrome/browser/ui/views/edit_search_engine_dialog.cc @@ -17,11 +17,11 @@ #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/image_view.h" #include "views/controls/label.h" #include "views/controls/table/table_view.h" #include "views/controls/textfield/textfield.h" -#include "views/widget/widget.h" using views::GridLayout; using views::ImageView; diff --git a/chrome/browser/ui/views/extensions/browser_action_overflow_menu_controller.cc b/chrome/browser/ui/views/extensions/browser_action_overflow_menu_controller.cc index 5bb9733..2703e4d 100644 --- a/chrome/browser/ui/views/extensions/browser_action_overflow_menu_controller.cc +++ b/chrome/browser/ui/views/extensions/browser_action_overflow_menu_controller.cc @@ -13,11 +13,11 @@ #include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_action.h" #include "ui/gfx/canvas_skia.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" BrowserActionOverflowMenuController::BrowserActionOverflowMenuController( BrowserActionsContainer* owner, diff --git a/chrome/browser/ui/views/extensions/extension_dialog.cc b/chrome/browser/ui/views/extensions/extension_dialog.cc index 693e058..32bc344 100644 --- a/chrome/browser/ui/views/extensions/extension_dialog.cc +++ b/chrome/browser/ui/views/extensions/extension_dialog.cc @@ -18,7 +18,7 @@ #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_source.h" #include "googleurl/src/gurl.h" -#include "views/widget/widget.h" +#include "ui/views/widget/widget.h" #if defined(OS_CHROMEOS) #include "chrome/browser/chromeos/frame/bubble_window.h" diff --git a/chrome/browser/ui/views/extensions/extension_dialog.h b/chrome/browser/ui/views/extensions/extension_dialog.h index dbcdae0..aa34abc 100644 --- a/chrome/browser/ui/views/extensions/extension_dialog.h +++ b/chrome/browser/ui/views/extensions/extension_dialog.h @@ -9,7 +9,7 @@ #include "base/memory/ref_counted.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" -#include "views/widget/widget_delegate.h" +#include "ui/views/widget/widget_delegate.h" class Browser; class ExtensionDialogObserver; 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 81cc726..6b1dc8e 100644 --- a/chrome/browser/ui/views/extensions/extension_install_dialog_view.cc +++ b/chrome/browser/ui/views/extensions/extension_install_dialog_view.cc @@ -18,6 +18,7 @@ #include "ui/views/layout/box_layout.h" #include "ui/views/layout/grid_layout.h" #include "ui/views/layout/layout_constants.h" +#include "ui/views/widget/widget.h" #include "ui/views/window/dialog_delegate.h" #include "views/border.h" #include "views/controls/image_view.h" @@ -26,7 +27,6 @@ #include "views/controls/link_listener.h" #include "views/controls/separator.h" #include "views/view.h" -#include "views/widget/widget.h" namespace { diff --git a/chrome/browser/ui/views/extensions/extension_popup.cc b/chrome/browser/ui/views/extensions/extension_popup.cc index 16bc057..8b111fe 100644 --- a/chrome/browser/ui/views/extensions/extension_popup.cc +++ b/chrome/browser/ui/views/extensions/extension_popup.cc @@ -20,8 +20,8 @@ #include "content/browser/tab_contents/tab_contents.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_source.h" -#include "views/widget/root_view.h" -#include "views/widget/widget.h" +#include "ui/views/widget/root_view.h" +#include "ui/views/widget/widget.h" #if defined(OS_CHROMEOS) && defined(TOOLKIT_USES_GTK) #include "chrome/browser/chromeos/legacy_window_manager/wm_ipc.h" 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 93c1282..b203b21 100644 --- a/chrome/browser/ui/views/extensions/extension_uninstall_dialog_view.cc +++ b/chrome/browser/ui/views/extensions/extension_uninstall_dialog_view.cc @@ -17,11 +17,11 @@ #include "ui/gfx/compositor/compositor.h" #include "ui/gfx/compositor/layer.h" #include "ui/views/layout/layout_constants.h" +#include "ui/views/widget/widget.h" #include "ui/views/window/dialog_delegate.h" #include "views/controls/image_view.h" #include "views/controls/label.h" #include "views/view.h" -#include "views/widget/widget.h" namespace { diff --git a/chrome/browser/ui/views/extensions/extension_view.cc b/chrome/browser/ui/views/extensions/extension_view.cc index 01ae823..ad3eee4 100644 --- a/chrome/browser/ui/views/extensions/extension_view.cc +++ b/chrome/browser/ui/views/extensions/extension_view.cc @@ -11,7 +11,7 @@ #include "content/browser/tab_contents/tab_contents.h" #include "content/browser/tab_contents/tab_contents_view.h" #include "content/public/browser/content_browser_client.h" -#include "views/widget/widget.h" +#include "ui/views/widget/widget.h" ExtensionView::ExtensionView(ExtensionHost* host, Browser* browser) : host_(host), diff --git a/chrome/browser/ui/views/external_protocol_dialog.cc b/chrome/browser/ui/views/external_protocol_dialog.cc index ff78453..f328b81 100644 --- a/chrome/browser/ui/views/external_protocol_dialog.cc +++ b/chrome/browser/ui/views/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/ui/views/find_bar_host.cc b/chrome/browser/ui/views/find_bar_host.cc index 066b016..b4d214e 100644 --- a/chrome/browser/ui/views/find_bar_host.cc +++ b/chrome/browser/ui/views/find_bar_host.cc @@ -18,8 +18,8 @@ #include "ui/base/keycodes/keyboard_codes.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" +#include "ui/views/widget/root_view.h" +#include "ui/views/widget/widget.h" namespace browser { diff --git a/chrome/browser/ui/views/find_bar_host_win.cc b/chrome/browser/ui/views/find_bar_host_win.cc index d63a111..8a9cac8e 100644 --- a/chrome/browser/ui/views/find_bar_host_win.cc +++ b/chrome/browser/ui/views/find_bar_host_win.cc @@ -10,8 +10,8 @@ #include "content/browser/renderer_host/render_view_host.h" #include "content/browser/tab_contents/tab_contents.h" #include "content/browser/tab_contents/tab_contents_view.h" +#include "ui/views/widget/widget.h" #include "views/controls/scrollbar/native_scroll_bar.h" -#include "views/widget/widget.h" void FindBarHost::AudibleAlert() { MessageBeep(MB_OK); diff --git a/chrome/browser/ui/views/find_bar_view.cc b/chrome/browser/ui/views/find_bar_view.cc index 3793d59..9c245f5 100644 --- a/chrome/browser/ui/views/find_bar_view.cc +++ b/chrome/browser/ui/views/find_bar_view.cc @@ -26,11 +26,11 @@ #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/canvas.h" +#include "ui/views/widget/widget.h" #include "views/background.h" #include "views/controls/button/image_button.h" #include "views/controls/label.h" #include "views/controls/textfield/textfield.h" -#include "views/widget/widget.h" // The amount of whitespace to have before the find button. static const int kWhiteSpaceAfterMatchCountLabel = 1; diff --git a/chrome/browser/ui/views/first_run_bubble.cc b/chrome/browser/ui/views/first_run_bubble.cc index 606bc44..67de475 100644 --- a/chrome/browser/ui/views/first_run_bubble.cc +++ b/chrome/browser/ui/views/first_run_bubble.cc @@ -22,9 +22,9 @@ #include "ui/views/events/event.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/image_button.h" #include "views/controls/label.h" -#include "views/widget/widget.h" namespace { const int kAnchorVerticalOffset = -4; diff --git a/chrome/browser/ui/views/first_run_bubble_unittest.cc b/chrome/browser/ui/views/first_run_bubble_unittest.cc index ffdb766..d6bd67a 100644 --- a/chrome/browser/ui/views/first_run_bubble_unittest.cc +++ b/chrome/browser/ui/views/first_run_bubble_unittest.cc @@ -9,8 +9,8 @@ #include "chrome/test/base/testing_profile.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/views/test/views_test_base.h" +#include "ui/views/widget/widget.h" #include "views/view.h" -#include "views/widget/widget.h" class FirstRunBubbleTest : public views::ViewsTestBase { public: 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 7e33241..9e2f719 100644 --- a/chrome/browser/ui/views/first_run_search_engine_view.cc +++ b/chrome/browser/ui/views/first_run_search_engine_view.cc @@ -32,11 +32,11 @@ #include "ui/gfx/font.h" #include "ui/views/focus/accelerator_handler.h" #include "ui/views/layout/layout_constants.h" +#include "ui/views/widget/widget.h" #include "views/controls/button/button.h" #include "views/controls/image_view.h" #include "views/controls/label.h" #include "views/view_text_utils.h" -#include "views/widget/widget.h" namespace { diff --git a/chrome/browser/ui/views/first_run_search_engine_view.h b/chrome/browser/ui/views/first_run_search_engine_view.h index 2770167..647b8b5 100644 --- a/chrome/browser/ui/views/first_run_search_engine_view.h +++ b/chrome/browser/ui/views/first_run_search_engine_view.h @@ -10,9 +10,9 @@ #include "chrome/browser/search_engines/template_url_service_observer.h" #include "ui/gfx/size.h" +#include "ui/views/widget/widget_delegate.h" #include "views/controls/button/text_button.h" #include "views/view.h" -#include "views/widget/widget_delegate.h" class Profile; class TemplateURL; diff --git a/chrome/browser/ui/views/frame/app_panel_browser_frame_view.cc b/chrome/browser/ui/views/frame/app_panel_browser_frame_view.cc index f1200dd..42e10b1 100644 --- a/chrome/browser/ui/views/frame/app_panel_browser_frame_view.cc +++ b/chrome/browser/ui/views/frame/app_panel_browser_frame_view.cc @@ -19,9 +19,9 @@ #include "ui/gfx/canvas.h" #include "ui/gfx/font.h" #include "ui/gfx/path.h" +#include "ui/views/widget/widget.h" +#include "ui/views/widget/widget_delegate.h" #include "views/controls/button/image_button.h" -#include "views/widget/widget.h" -#include "views/widget/widget_delegate.h" namespace { // The frame border is only visible in restored mode and is hardcoded to 1 px on diff --git a/chrome/browser/ui/views/frame/browser_frame.cc b/chrome/browser/ui/views/frame/browser_frame.cc index 666bdbf..b3fc5e5 100644 --- a/chrome/browser/ui/views/frame/browser_frame.cc +++ b/chrome/browser/ui/views/frame/browser_frame.cc @@ -14,7 +14,7 @@ #include "chrome/browser/ui/views/frame/native_browser_frame.h" #include "chrome/common/chrome_switches.h" #include "ui/base/theme_provider.h" -#include "views/widget/native_widget.h" +#include "ui/views/widget/native_widget.h" #if defined(OS_WIN) && !defined(USE_AURA) #include "chrome/browser/ui/views/frame/glass_browser_frame_view.h" diff --git a/chrome/browser/ui/views/frame/browser_frame.h b/chrome/browser/ui/views/frame/browser_frame.h index d9d2c53..8b35be5 100644 --- a/chrome/browser/ui/views/frame/browser_frame.h +++ b/chrome/browser/ui/views/frame/browser_frame.h @@ -10,7 +10,7 @@ #include "base/logging.h" #include "build/build_config.h" #include "chrome/browser/ui/views/frame/native_browser_frame_delegate.h" -#include "views/widget/widget.h" +#include "ui/views/widget/widget.h" class AvatarMenuButton; class BrowserNonClientFrameView; diff --git a/chrome/browser/ui/views/frame/browser_frame_aura.h b/chrome/browser/ui/views/frame/browser_frame_aura.h index 1a8088c..8512eb4 100644 --- a/chrome/browser/ui/views/frame/browser_frame_aura.h +++ b/chrome/browser/ui/views/frame/browser_frame_aura.h @@ -9,7 +9,7 @@ #include "base/basictypes.h" #include "chrome/browser/ui/views/frame/browser_frame.h" #include "chrome/browser/ui/views/frame/native_browser_frame.h" -#include "views/widget/native_widget_aura.h" +#include "ui/views/widget/native_widget_aura.h" class BrowserView; diff --git a/chrome/browser/ui/views/frame/browser_frame_gtk.cc b/chrome/browser/ui/views/frame/browser_frame_gtk.cc index 9d81c18..a9fb6e5 100644 --- a/chrome/browser/ui/views/frame/browser_frame_gtk.cc +++ b/chrome/browser/ui/views/frame/browser_frame_gtk.cc @@ -14,9 +14,9 @@ #include "chrome/browser/ui/views/frame/browser_view.h" #include "ui/base/hit_test.h" #include "ui/gfx/font.h" +#include "ui/views/widget/root_view.h" +#include "ui/views/widget/widget.h" #include "views/views_delegate.h" -#include "views/widget/root_view.h" -#include "views/widget/widget.h" // static const gfx::Font& BrowserFrame::GetTitleFont() { diff --git a/chrome/browser/ui/views/frame/browser_frame_gtk.h b/chrome/browser/ui/views/frame/browser_frame_gtk.h index 369aa22..696e7c5 100644 --- a/chrome/browser/ui/views/frame/browser_frame_gtk.h +++ b/chrome/browser/ui/views/frame/browser_frame_gtk.h @@ -9,7 +9,7 @@ #include "base/basictypes.h" #include "chrome/browser/ui/views/frame/browser_frame.h" #include "chrome/browser/ui/views/frame/native_browser_frame.h" -#include "views/widget/native_widget_gtk.h" +#include "ui/views/widget/native_widget_gtk.h" class BrowserFrameGtk : public views::NativeWidgetGtk, public NativeBrowserFrame { diff --git a/chrome/browser/ui/views/frame/browser_frame_win.cc b/chrome/browser/ui/views/frame/browser_frame_win.cc index 68348ef..bdff2b4 100644 --- a/chrome/browser/ui/views/frame/browser_frame_win.cc +++ b/chrome/browser/ui/views/frame/browser_frame_win.cc @@ -15,10 +15,10 @@ #include "grit/theme_resources.h" #include "ui/base/theme_provider.h" #include "ui/gfx/font.h" +#include "ui/views/widget/native_widget_win.h" +#include "ui/views/widget/widget.h" #include "ui/views/window/non_client_view.h" #include "views/views_delegate.h" -#include "views/widget/native_widget_win.h" -#include "views/widget/widget.h" #pragma comment(lib, "dwmapi.lib") diff --git a/chrome/browser/ui/views/frame/browser_frame_win.h b/chrome/browser/ui/views/frame/browser_frame_win.h index b0365c0..9a18cd1 100644 --- a/chrome/browser/ui/views/frame/browser_frame_win.h +++ b/chrome/browser/ui/views/frame/browser_frame_win.h @@ -9,7 +9,7 @@ #include "base/basictypes.h" #include "chrome/browser/ui/views/frame/browser_frame.h" #include "chrome/browser/ui/views/frame/native_browser_frame.h" -#include "views/widget/native_widget_win.h" +#include "ui/views/widget/native_widget_win.h" class BrowserView; diff --git a/chrome/browser/ui/views/frame/browser_non_client_frame_view_aura.cc b/chrome/browser/ui/views/frame/browser_non_client_frame_view_aura.cc index ad03def..1aa93da 100644 --- a/chrome/browser/ui/views/frame/browser_non_client_frame_view_aura.cc +++ b/chrome/browser/ui/views/frame/browser_non_client_frame_view_aura.cc @@ -18,9 +18,9 @@ #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/canvas.h" #include "ui/gfx/compositor/layer.h" +#include "ui/views/widget/widget.h" +#include "ui/views/widget/widget_delegate.h" #include "views/controls/button/custom_button.h" -#include "views/widget/widget.h" -#include "views/widget/widget_delegate.h" namespace { // Our window is larger than it appears, as it includes space around the edges diff --git a/chrome/browser/ui/views/frame/browser_non_client_frame_view_aura.h b/chrome/browser/ui/views/frame/browser_non_client_frame_view_aura.h index e991da6..b4578d4 100644 --- a/chrome/browser/ui/views/frame/browser_non_client_frame_view_aura.h +++ b/chrome/browser/ui/views/frame/browser_non_client_frame_view_aura.h @@ -6,11 +6,11 @@ #define CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_NON_CLIENT_FRAME_VIEW_AURA_H_ #pragma once -#include "ui/aura_shell/window_frame.h" #include "base/memory/scoped_ptr.h" #include "chrome/browser/ui/views/frame/browser_non_client_frame_view.h" +#include "ui/aura_shell/window_frame.h" +#include "ui/views/widget/widget.h" #include "views/controls/button/button.h" -#include "views/widget/widget.h" class BrowserFrame; class BrowserView; diff --git a/chrome/browser/ui/views/frame/browser_root_view.h b/chrome/browser/ui/views/frame/browser_root_view.h index c1f3d77..3ace8d0 100644 --- a/chrome/browser/ui/views/frame/browser_root_view.h +++ b/chrome/browser/ui/views/frame/browser_root_view.h @@ -6,7 +6,7 @@ #define CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_ROOT_VIEW_H_ #pragma once -#include "views/widget/root_view.h" +#include "ui/views/widget/root_view.h" class AbstractTabStripView; class BrowserView; diff --git a/chrome/browser/ui/views/frame/browser_view.cc b/chrome/browser/ui/views/frame/browser_view.cc index 6de93aa..d82d478 100644 --- a/chrome/browser/ui/views/frame/browser_view.cc +++ b/chrome/browser/ui/views/frame/browser_view.cc @@ -99,11 +99,11 @@ #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/widget/native_widget.h" +#include "ui/views/widget/root_view.h" +#include "ui/views/widget/widget.h" #include "ui/views/window/dialog_delegate.h" #include "views/controls/single_split_view.h" -#include "views/widget/native_widget.h" -#include "views/widget/root_view.h" -#include "views/widget/widget.h" #if defined(USE_AURA) #include "chrome/browser/ui/views/accelerator_table.h" @@ -117,7 +117,7 @@ #include "chrome/browser/aeropeek_manager.h" #include "chrome/browser/jumplist_win.h" #include "ui/base/message_box_win.h" -#include "views/widget/native_widget_win.h" +#include "ui/views/widget/native_widget_win.h" #elif defined(TOOLKIT_USES_GTK) #include "chrome/browser/ui/views/accelerator_table.h" #if !defined(TOUCH_UI) diff --git a/chrome/browser/ui/views/frame/browser_view.h b/chrome/browser/ui/views/frame/browser_view.h index 9422a42..db0eda9 100644 --- a/chrome/browser/ui/views/frame/browser_view.h +++ b/chrome/browser/ui/views/frame/browser_view.h @@ -25,9 +25,9 @@ #include "content/public/browser/notification_registrar.h" #include "ui/base/models/simple_menu_model.h" #include "ui/gfx/native_widget_types.h" +#include "ui/views/widget/widget_delegate.h" #include "ui/views/window/client_view.h" #include "views/controls/single_split_view_listener.h" -#include "views/widget/widget_delegate.h" #if defined(OS_WIN) #include "chrome/browser/hang_monitor/hung_plugin_action.h" diff --git a/chrome/browser/ui/views/frame/opaque_browser_frame_view.cc b/chrome/browser/ui/views/frame/opaque_browser_frame_view.cc index 870376c..e7cb0e2 100644 --- a/chrome/browser/ui/views/frame/opaque_browser_frame_view.cc +++ b/chrome/browser/ui/views/frame/opaque_browser_frame_view.cc @@ -36,10 +36,10 @@ #include "ui/gfx/font.h" #include "ui/gfx/image/image.h" #include "ui/gfx/path.h" +#include "ui/views/widget/root_view.h" #include "ui/views/window/window_shape.h" #include "views/controls/button/image_button.h" #include "views/controls/image_view.h" -#include "views/widget/root_view.h" #if defined(USE_VIRTUAL_KEYBOARD) #include "chrome/browser/ui/virtual_keyboard/virtual_keyboard_manager.h" diff --git a/chrome/browser/ui/views/fullscreen_exit_bubble_views.cc b/chrome/browser/ui/views/fullscreen_exit_bubble_views.cc index 3bc7051..7a31185 100644 --- a/chrome/browser/ui/views/fullscreen_exit_bubble_views.cc +++ b/chrome/browser/ui/views/fullscreen_exit_bubble_views.cc @@ -16,9 +16,9 @@ #include "ui/gfx/canvas_skia.h" #include "ui/gfx/screen.h" #include "ui/views/bubble/bubble_border.h" +#include "ui/views/widget/widget.h" #include "views/controls/button/text_button.h" #include "views/controls/link.h" -#include "views/widget/widget.h" #if defined(OS_WIN) #include "ui/base/l10n/l10n_util_win.h" diff --git a/chrome/browser/ui/views/generic_info_view_unittest.cc b/chrome/browser/ui/views/generic_info_view_unittest.cc index 88a5897..26d78a7 100644 --- a/chrome/browser/ui/views/generic_info_view_unittest.cc +++ b/chrome/browser/ui/views/generic_info_view_unittest.cc @@ -9,9 +9,9 @@ #include "grit/generated_resources.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/base/l10n/l10n_util.h" +#include "ui/views/widget/widget.h" #include "views/controls/label.h" #include "views/controls/textfield/textfield.h" -#include "views/widget/widget.h" // This class is only used on windows for now. #if defined(OS_WIN) diff --git a/chrome/browser/ui/views/handle_web_keyboard_event_aura.cc b/chrome/browser/ui/views/handle_web_keyboard_event_aura.cc index 6ee1485..76795e0 100644 --- a/chrome/browser/ui/views/handle_web_keyboard_event_aura.cc +++ b/chrome/browser/ui/views/handle_web_keyboard_event_aura.cc @@ -4,7 +4,7 @@ #include "chrome/browser/ui/views/handle_web_keyboard_event.h" -#include "views/widget/widget.h" +#include "ui/views/widget/widget.h" void HandleWebKeyboardEvent(views::Widget* widget, const NativeWebKeyboardEvent& event) { diff --git a/chrome/browser/ui/views/handle_web_keyboard_event_gtk.cc b/chrome/browser/ui/views/handle_web_keyboard_event_gtk.cc index 3422abe..c20f873 100644 --- a/chrome/browser/ui/views/handle_web_keyboard_event_gtk.cc +++ b/chrome/browser/ui/views/handle_web_keyboard_event_gtk.cc @@ -5,7 +5,7 @@ #include "chrome/browser/ui/views/handle_web_keyboard_event.h" #include "content/public/browser/native_web_keyboard_event.h" -#include "views/widget/native_widget_gtk.h" +#include "ui/views/widget/native_widget_gtk.h" void HandleWebKeyboardEvent(views::Widget* widget, const NativeWebKeyboardEvent& event) { diff --git a/chrome/browser/ui/views/html_dialog_view.cc b/chrome/browser/ui/views/html_dialog_view.cc index e6995c2..5936d04 100644 --- a/chrome/browser/ui/views/html_dialog_view.cc +++ b/chrome/browser/ui/views/html_dialog_view.cc @@ -17,11 +17,11 @@ #include "content/public/browser/notification_types.h" #include "ui/base/keycodes/keyboard_codes.h" #include "ui/views/events/event.h" -#include "views/widget/root_view.h" -#include "views/widget/widget.h" +#include "ui/views/widget/root_view.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 class RenderWidgetHost; diff --git a/chrome/browser/ui/views/html_dialog_view.h b/chrome/browser/ui/views/html_dialog_view.h index 34742a8..6802aa8 100644 --- a/chrome/browser/ui/views/html_dialog_view.h +++ b/chrome/browser/ui/views/html_dialog_view.h @@ -16,7 +16,7 @@ #include "chrome/browser/ui/webui/html_dialog_tab_contents_delegate.h" #include "chrome/browser/ui/webui/html_dialog_ui.h" #include "ui/gfx/size.h" -#include "views/widget/widget_delegate.h" +#include "ui/views/widget/widget_delegate.h" class Browser; diff --git a/chrome/browser/ui/views/html_dialog_view_browsertest.cc b/chrome/browser/ui/views/html_dialog_view_browsertest.cc index 8c4027d..7116011 100644 --- a/chrome/browser/ui/views/html_dialog_view_browsertest.cc +++ b/chrome/browser/ui/views/html_dialog_view_browsertest.cc @@ -18,7 +18,7 @@ #include "content/browser/tab_contents/tab_contents.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" -#include "views/widget/widget.h" +#include "ui/views/widget/widget.h" using testing::Eq; diff --git a/chrome/browser/ui/views/hung_renderer_view.cc b/chrome/browser/ui/views/hung_renderer_view.cc index 1320f6b..11922ad 100644 --- a/chrome/browser/ui/views/hung_renderer_view.cc +++ b/chrome/browser/ui/views/hung_renderer_view.cc @@ -24,13 +24,13 @@ #include "ui/gfx/canvas.h" #include "ui/views/layout/grid_layout.h" #include "ui/views/layout/layout_constants.h" +#include "ui/views/widget/widget.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/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 375ed0e..1190752 100644 --- a/chrome/browser/ui/views/importer/import_lock_dialog_view.cc +++ b/chrome/browser/ui/views/importer/import_lock_dialog_view.cc @@ -15,8 +15,8 @@ #include "grit/locale_settings.h" #include "ui/base/l10n/l10n_util.h" #include "ui/views/layout/layout_constants.h" +#include "ui/views/widget/widget.h" #include "views/controls/label.h" -#include "views/widget/widget.h" // Default size of the dialog window. static const int kDefaultWindowWidth = 320; 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 b5d58f0..638ec33 100644 --- a/chrome/browser/ui/views/importer/import_progress_dialog_view.cc +++ b/chrome/browser/ui/views/importer/import_progress_dialog_view.cc @@ -14,9 +14,9 @@ #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/controls/label.h" #include "views/controls/throbber.h" -#include "views/widget/widget.h" ImportProgressDialogView::ImportProgressDialogView( HWND parent_window, diff --git a/chrome/browser/ui/views/infobars/extension_infobar.cc b/chrome/browser/ui/views/infobars/extension_infobar.cc index 56e0ea0..28e6d35 100644 --- a/chrome/browser/ui/views/infobars/extension_infobar.cc +++ b/chrome/browser/ui/views/infobars/extension_infobar.cc @@ -16,9 +16,9 @@ #include "ui/base/animation/slide_animation.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/canvas_skia.h" +#include "ui/views/widget/widget.h" #include "views/controls/button/menu_button.h" #include "views/controls/menu/menu_item_view.h" -#include "views/widget/widget.h" // ExtensionInfoBarDelegate ---------------------------------------------------- diff --git a/chrome/browser/ui/views/infobars/infobar_view.cc b/chrome/browser/ui/views/infobars/infobar_view.cc index cce51ed..b72c3a3 100644 --- a/chrome/browser/ui/views/infobars/infobar_view.cc +++ b/chrome/browser/ui/views/infobars/infobar_view.cc @@ -25,6 +25,7 @@ #include "ui/gfx/canvas_skia_paint.h" #include "ui/gfx/image/image.h" #include "ui/views/focus/external_focus_tracker.h" +#include "ui/views/widget/widget.h" #include "ui/views/window/non_client_view.h" #include "views/controls/button/image_button.h" #include "views/controls/button/menu_button.h" @@ -34,7 +35,6 @@ #include "views/controls/link.h" #include "views/controls/menu/menu_model_adapter.h" #include "views/controls/menu/menu_runner.h" -#include "views/widget/widget.h" #if defined(OS_WIN) #include "base/win/win_util.h" diff --git a/chrome/browser/ui/views/instant_confirm_view.cc b/chrome/browser/ui/views/instant_confirm_view.cc index b6ade51a..00bcd80 100644 --- a/chrome/browser/ui/views/instant_confirm_view.cc +++ b/chrome/browser/ui/views/instant_confirm_view.cc @@ -16,9 +16,9 @@ #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/controls/label.h" #include "views/controls/link.h" -#include "views/widget/widget.h" InstantConfirmView::InstantConfirmView(Profile* profile) : profile_(profile) { views::Label* description_label = new views::Label( diff --git a/chrome/browser/ui/views/js_modal_dialog_views.cc b/chrome/browser/ui/views/js_modal_dialog_views.cc index cfe40ee8..3b76003 100644 --- a/chrome/browser/ui/views/js_modal_dialog_views.cc +++ b/chrome/browser/ui/views/js_modal_dialog_views.cc @@ -11,9 +11,9 @@ #include "ui/base/keycodes/keyboard_codes.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/message_box_flags.h" +#include "ui/views/widget/widget.h" #include "views/controls/message_box_view.h" #include "views/controls/textfield/textfield.h" -#include "views/widget/widget.h" //////////////////////////////////////////////////////////////////////////////// // JSModalDialogViews, public: diff --git a/chrome/browser/ui/views/keyboard_overlay_dialog_view.cc b/chrome/browser/ui/views/keyboard_overlay_dialog_view.cc index d8c2752..a32d725 100644 --- a/chrome/browser/ui/views/keyboard_overlay_dialog_view.cc +++ b/chrome/browser/ui/views/keyboard_overlay_dialog_view.cc @@ -18,8 +18,8 @@ #include "ui/base/keycodes/keyboard_codes.h" #include "ui/base/l10n/l10n_util.h" #include "ui/views/events/event.h" -#include "views/widget/root_view.h" -#include "views/widget/widget.h" +#include "ui/views/widget/root_view.h" +#include "ui/views/widget/widget.h" namespace { struct Accelerator { diff --git a/chrome/browser/ui/views/login_view.cc b/chrome/browser/ui/views/login_view.cc index 40373ff..7117658 100644 --- a/chrome/browser/ui/views/login_view.cc +++ b/chrome/browser/ui/views/login_view.cc @@ -13,9 +13,9 @@ #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/root_view.h" #include "views/controls/label.h" #include "views/controls/textfield/textfield.h" -#include "views/widget/root_view.h" static const int kMessageWidth = 320; static const int kTextfieldStackHorizontalSpacing = 30; diff --git a/chrome/browser/ui/views/menu_item_view_test.cc b/chrome/browser/ui/views/menu_item_view_test.cc index aa6ff42..1ec710e 100644 --- a/chrome/browser/ui/views/menu_item_view_test.cc +++ b/chrome/browser/ui/views/menu_item_view_test.cc @@ -6,14 +6,14 @@ #include "base/utf_string_conversions.h" #include "chrome/browser/automation/ui_controls.h" #include "chrome/test/base/view_event_test_base.h" +#include "ui/views/widget/root_view.h" +#include "ui/views/widget/widget.h" #include "views/controls/button/menu_button.h" #include "views/controls/menu/menu_controller.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/controls/menu/view_menu_delegate.h" -#include "views/widget/root_view.h" -#include "views/widget/widget.h" // This is a convenience base class for all tests to provide some // common functionality. It sets up a MenuButton and a MenuItemView diff --git a/chrome/browser/ui/views/menu_model_adapter_test.cc b/chrome/browser/ui/views/menu_model_adapter_test.cc index 82026cd..2fb0fb6 100644 --- a/chrome/browser/ui/views/menu_model_adapter_test.cc +++ b/chrome/browser/ui/views/menu_model_adapter_test.cc @@ -8,6 +8,8 @@ #include "chrome/test/base/view_event_test_base.h" #include "ui/base/models/menu_model.h" #include "ui/views/test/test_views_delegate.h" +#include "ui/views/widget/root_view.h" +#include "ui/views/widget/widget.h" #include "views/controls/button/menu_button.h" #include "views/controls/menu/menu_controller.h" #include "views/controls/menu/menu_item_view.h" @@ -16,8 +18,6 @@ #include "views/controls/menu/submenu_view.h" #include "views/controls/menu/view_menu_delegate.h" #include "views/views_delegate.h" -#include "views/widget/root_view.h" -#include "views/widget/widget.h" namespace { diff --git a/chrome/browser/ui/views/native_constrained_window_aura.cc b/chrome/browser/ui/views/native_constrained_window_aura.cc index 5f26c05..3106b03 100644 --- a/chrome/browser/ui/views/native_constrained_window_aura.cc +++ b/chrome/browser/ui/views/native_constrained_window_aura.cc @@ -4,7 +4,7 @@ #include "chrome/browser/ui/views/constrained_window_views.h" -#include "views/widget/native_widget_aura.h" +#include "ui/views/widget/native_widget_aura.h" class NativeConstrainedWindowAura : public NativeConstrainedWindow, public views::NativeWidgetAura { diff --git a/chrome/browser/ui/views/native_constrained_window_win.cc b/chrome/browser/ui/views/native_constrained_window_win.cc index 1602e21..41f003c 100644 --- a/chrome/browser/ui/views/native_constrained_window_win.cc +++ b/chrome/browser/ui/views/native_constrained_window_win.cc @@ -4,7 +4,7 @@ #include "chrome/browser/ui/views/constrained_window_views.h" -#include "views/widget/native_widget_win.h" +#include "ui/views/widget/native_widget_win.h" namespace { bool IsNonClientHitTestCode(UINT hittest) { diff --git a/chrome/browser/ui/views/notifications/balloon_view.cc b/chrome/browser/ui/views/notifications/balloon_view.cc index 24cfb81..ea23c95 100644 --- a/chrome/browser/ui/views/notifications/balloon_view.cc +++ b/chrome/browser/ui/views/notifications/balloon_view.cc @@ -33,6 +33,7 @@ #include "ui/gfx/insets.h" #include "ui/gfx/native_widget_types.h" #include "ui/views/bubble/bubble_border.h" +#include "ui/views/widget/widget.h" #include "views/controls/button/button.h" #include "views/controls/button/image_button.h" #include "views/controls/button/text_button.h" @@ -41,7 +42,6 @@ #include "views/controls/menu/menu_runner.h" #include "views/controls/native/native_view_host.h" #include "views/painter.h" -#include "views/widget/widget.h" using views::Widget; diff --git a/chrome/browser/ui/views/notifications/balloon_view.h b/chrome/browser/ui/views/notifications/balloon_view.h index de82806..28e4280 100644 --- a/chrome/browser/ui/views/notifications/balloon_view.h +++ b/chrome/browser/ui/views/notifications/balloon_view.h @@ -19,11 +19,11 @@ #include "ui/gfx/point.h" #include "ui/gfx/rect.h" #include "ui/gfx/size.h" +#include "ui/views/widget/widget_delegate.h" #include "views/controls/button/menu_button.h" #include "views/controls/label.h" #include "views/controls/menu/view_menu_delegate.h" #include "views/view.h" -#include "views/widget/widget_delegate.h" class BalloonCollection; class NotificationOptionsMenuModel; diff --git a/chrome/browser/ui/views/notifications/balloon_view_host.cc b/chrome/browser/ui/views/notifications/balloon_view_host.cc index 46c3f27..0b88a11 100644 --- a/chrome/browser/ui/views/notifications/balloon_view_host.cc +++ b/chrome/browser/ui/views/notifications/balloon_view_host.cc @@ -9,7 +9,7 @@ #include "content/browser/renderer_host/render_widget_host_view.h" #include "content/browser/tab_contents/tab_contents.h" #include "content/public/browser/content_browser_client.h" -#include "views/widget/widget.h" +#include "ui/views/widget/widget.h" #if defined(TOUCH_UI) && !defined(USE_AURA) #include "chrome/browser/renderer_host/render_widget_host_view_views.h" diff --git a/chrome/browser/ui/views/omnibox/omnibox_view_win.cc b/chrome/browser/ui/views/omnibox/omnibox_view_win.cc index f05a8f1..9c1723d 100644 --- a/chrome/browser/ui/views/omnibox/omnibox_view_win.cc +++ b/chrome/browser/ui/views/omnibox/omnibox_view_win.cc @@ -52,9 +52,9 @@ #include "ui/base/win/mouse_wheel_util.h" #include "ui/gfx/canvas.h" #include "ui/gfx/canvas_skia.h" +#include "ui/views/widget/widget.h" #include "views/controls/textfield/native_textfield_win.h" #include "views/drag_utils.h" -#include "views/widget/widget.h" #pragma comment(lib, "oleacc.lib") // Needed for accessibility support. #pragma comment(lib, "riched20.lib") // Needed for the richedit control. diff --git a/chrome/browser/ui/views/page_info_bubble_view.cc b/chrome/browser/ui/views/page_info_bubble_view.cc index 43d185c..64d839f 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_skia.h" #include "ui/gfx/image/image.h" #include "ui/views/layout/grid_layout.h" +#include "ui/views/widget/widget.h" #include "views/controls/image_view.h" #include "views/controls/label.h" #include "views/controls/link.h" #include "views/controls/separator.h" -#include "views/widget/widget.h" namespace { diff --git a/chrome/browser/ui/views/restart_message_box.cc b/chrome/browser/ui/views/restart_message_box.cc index fd40269..97af8635d 100644 --- a/chrome/browser/ui/views/restart_message_box.cc +++ b/chrome/browser/ui/views/restart_message_box.cc @@ -9,8 +9,8 @@ #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/message_box_flags.h" +#include "ui/views/widget/widget.h" #include "views/controls/message_box_view.h" -#include "views/widget/widget.h" //////////////////////////////////////////////////////////////////////////////// // RestartMessageBox, public: diff --git a/chrome/browser/ui/views/simple_message_box_views.cc b/chrome/browser/ui/views/simple_message_box_views.cc index 9f9a604..cddfd6e 100644 --- a/chrome/browser/ui/views/simple_message_box_views.cc +++ b/chrome/browser/ui/views/simple_message_box_views.cc @@ -11,8 +11,8 @@ #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/message_box_flags.h" +#include "ui/views/widget/widget.h" #include "views/controls/message_box_view.h" -#include "views/widget/widget.h" #if defined(TOUCH_UI) || defined(USE_AURA) #include "ui/views/focus/accelerator_handler.h" diff --git a/chrome/browser/ui/views/status_bubble_views.cc b/chrome/browser/ui/views/status_bubble_views.cc index 5a3d847..14e951a 100644 --- a/chrome/browser/ui/views/status_bubble_views.cc +++ b/chrome/browser/ui/views/status_bubble_views.cc @@ -26,10 +26,10 @@ #include "ui/gfx/canvas_skia.h" #include "ui/gfx/point.h" #include "ui/gfx/screen.h" +#include "ui/views/widget/root_view.h" +#include "ui/views/widget/widget.h" #include "views/controls/label.h" #include "views/controls/scrollbar/native_scroll_bar.h" -#include "views/widget/root_view.h" -#include "views/widget/widget.h" using views::Widget; diff --git a/chrome/browser/ui/views/tab_contents/native_tab_contents_view_aura.cc b/chrome/browser/ui/views/tab_contents/native_tab_contents_view_aura.cc index 7315011..5084ddb 100644 --- a/chrome/browser/ui/views/tab_contents/native_tab_contents_view_aura.cc +++ b/chrome/browser/ui/views/tab_contents/native_tab_contents_view_aura.cc @@ -10,8 +10,8 @@ #include "content/browser/tab_contents/tab_contents_view.h" #include "ui/aura/event.h" #include "ui/aura/window.h" +#include "ui/views/widget/widget.h" #include "views/views_delegate.h" -#include "views/widget/widget.h" //////////////////////////////////////////////////////////////////////////////// // NativeTabContentsViewAura, public: diff --git a/chrome/browser/ui/views/tab_contents/native_tab_contents_view_aura.h b/chrome/browser/ui/views/tab_contents/native_tab_contents_view_aura.h index 45d994ae..7b118c0 100644 --- a/chrome/browser/ui/views/tab_contents/native_tab_contents_view_aura.h +++ b/chrome/browser/ui/views/tab_contents/native_tab_contents_view_aura.h @@ -7,7 +7,7 @@ #pragma once #include "chrome/browser/ui/views/tab_contents/native_tab_contents_view.h" -#include "views/widget/native_widget_aura.h" +#include "ui/views/widget/native_widget_aura.h" class TabContents; diff --git a/chrome/browser/ui/views/tab_contents/native_tab_contents_view_gtk.h b/chrome/browser/ui/views/tab_contents/native_tab_contents_view_gtk.h index 8d8f829..51f451a 100644 --- a/chrome/browser/ui/views/tab_contents/native_tab_contents_view_gtk.h +++ b/chrome/browser/ui/views/tab_contents/native_tab_contents_view_gtk.h @@ -7,7 +7,7 @@ #pragma once #include "chrome/browser/ui/views/tab_contents/native_tab_contents_view.h" -#include "views/widget/native_widget_gtk.h" +#include "ui/views/widget/native_widget_gtk.h" class ConstrainedWindowGtk; class TabContents; diff --git a/chrome/browser/ui/views/tab_contents/native_tab_contents_view_win.cc b/chrome/browser/ui/views/tab_contents/native_tab_contents_view_win.cc index b26673f..1f7bb59 100644 --- a/chrome/browser/ui/views/tab_contents/native_tab_contents_view_win.cc +++ b/chrome/browser/ui/views/tab_contents/native_tab_contents_view_win.cc @@ -10,8 +10,8 @@ #include "content/browser/renderer_host/render_widget_host_view_win.h" #include "content/browser/tab_contents/tab_contents.h" #include "content/browser/tab_contents/tab_contents_view.h" +#include "ui/views/widget/widget.h" #include "views/views_delegate.h" -#include "views/widget/widget.h" namespace { diff --git a/chrome/browser/ui/views/tab_contents/native_tab_contents_view_win.h b/chrome/browser/ui/views/tab_contents/native_tab_contents_view_win.h index 6339a9e..42bd959 100644 --- a/chrome/browser/ui/views/tab_contents/native_tab_contents_view_win.h +++ b/chrome/browser/ui/views/tab_contents/native_tab_contents_view_win.h @@ -7,7 +7,7 @@ #pragma once #include "chrome/browser/ui/views/tab_contents/native_tab_contents_view.h" -#include "views/widget/native_widget_win.h" +#include "ui/views/widget/native_widget_win.h" class WebDropTarget; class TabContents; 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 9a96f1b..2ae1535 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 @@ -22,8 +22,8 @@ #include "ui/gfx/screen.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" +#include "ui/views/widget/native_widget.h" +#include "ui/views/widget/widget.h" #if defined(OS_WIN) #include <windows.h> diff --git a/chrome/browser/ui/views/tab_contents/tab_contents_view_views.h b/chrome/browser/ui/views/tab_contents/tab_contents_view_views.h index b11f1d3..0e6a766 100644 --- a/chrome/browser/ui/views/tab_contents/tab_contents_view_views.h +++ b/chrome/browser/ui/views/tab_contents/tab_contents_view_views.h @@ -11,7 +11,7 @@ #include "chrome/browser/tab_contents/render_view_host_delegate_helper.h" #include "chrome/browser/ui/views/tab_contents/native_tab_contents_view_delegate.h" #include "content/browser/tab_contents/tab_contents_view.h" -#include "views/widget/widget.h" +#include "ui/views/widget/widget.h" class ConstrainedWindowGtk; class NativeTabContentsView; diff --git a/chrome/browser/ui/views/tabs/base_tab_strip.cc b/chrome/browser/ui/views/tabs/base_tab_strip.cc index c4136de..5e9e70f 100644 --- a/chrome/browser/ui/views/tabs/base_tab_strip.cc +++ b/chrome/browser/ui/views/tabs/base_tab_strip.cc @@ -9,8 +9,8 @@ #include "chrome/browser/ui/view_ids.h" #include "chrome/browser/ui/views/tabs/dragged_tab_controller.h" #include "chrome/browser/ui/views/tabs/tab_strip_controller.h" -#include "views/widget/root_view.h" -#include "views/widget/widget.h" +#include "ui/views/widget/root_view.h" +#include "ui/views/widget/widget.h" #if defined(OS_WIN) // GET_X_LPARAM, et al. diff --git a/chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc b/chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc index 2631515..1ea450f 100644 --- a/chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc +++ b/chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc @@ -24,10 +24,10 @@ #include "content/browser/tab_contents/tab_contents.h" #include "content/browser/user_metrics.h" #include "content/public/browser/notification_service.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/widget/widget.h" static TabRendererData::NetworkState TabContentsNetworkState( TabContents* contents) { diff --git a/chrome/browser/ui/views/tabs/dragged_tab_controller.cc b/chrome/browser/ui/views/tabs/dragged_tab_controller.cc index a95ea47..01790b4 100644 --- a/chrome/browser/ui/views/tabs/dragged_tab_controller.cc +++ b/chrome/browser/ui/views/tabs/dragged_tab_controller.cc @@ -36,7 +36,7 @@ #include "ui/gfx/canvas_skia.h" #include "ui/gfx/screen.h" #include "ui/views/events/event.h" -#include "views/widget/widget.h" +#include "ui/views/widget/widget.h" #if defined(TOOLKIT_USES_GTK) #include <gdk/gdk.h> // NOLINT diff --git a/chrome/browser/ui/views/tabs/dragged_tab_view.cc b/chrome/browser/ui/views/tabs/dragged_tab_view.cc index 70a1a6a..cce2f3e 100644 --- a/chrome/browser/ui/views/tabs/dragged_tab_view.cc +++ b/chrome/browser/ui/views/tabs/dragged_tab_view.cc @@ -8,14 +8,14 @@ #include "chrome/browser/ui/views/tabs/native_view_photobooth.h" #include "third_party/skia/include/core/SkShader.h" #include "ui/gfx/canvas_skia.h" -#include "views/widget/widget.h" +#include "ui/views/widget/widget.h" #if defined(USE_AURA) -#include "views/widget/native_widget_aura.h" +#include "ui/views/widget/native_widget_aura.h" #elif defined(OS_WIN) -#include "views/widget/native_widget_win.h" +#include "ui/views/widget/native_widget_win.h" #elif defined(TOOLKIT_USES_GTK) -#include "views/widget/native_widget_gtk.h" +#include "ui/views/widget/native_widget_gtk.h" #endif static const int kTransparentAlpha = 200; diff --git a/chrome/browser/ui/views/tabs/native_view_photobooth_win.cc b/chrome/browser/ui/views/tabs/native_view_photobooth_win.cc index 550acb8..25d603c 100644 --- a/chrome/browser/ui/views/tabs/native_view_photobooth_win.cc +++ b/chrome/browser/ui/views/tabs/native_view_photobooth_win.cc @@ -9,7 +9,7 @@ #include "ui/gfx/canvas_skia.h" #include "ui/gfx/point.h" #include "ui/gfx/rect.h" -#include "views/widget/widget.h" +#include "ui/views/widget/widget.h" namespace { diff --git a/chrome/browser/ui/views/tabs/tab.cc b/chrome/browser/ui/views/tabs/tab.cc index 56c89a0..10f02b0 100644 --- a/chrome/browser/ui/views/tabs/tab.cc +++ b/chrome/browser/ui/views/tabs/tab.cc @@ -24,10 +24,10 @@ #include "ui/gfx/font.h" #include "ui/gfx/path.h" #include "ui/gfx/skbitmap_operations.h" +#include "ui/views/widget/tooltip_manager.h" +#include "ui/views/widget/widget.h" #include "ui/views/window/non_client_view.h" #include "views/controls/button/image_button.h" -#include "views/widget/tooltip_manager.h" -#include "views/widget/widget.h" static const int kLeftPadding = 16; static const int kTopPadding = 6; diff --git a/chrome/browser/ui/views/tabs/tab_strip.cc b/chrome/browser/ui/views/tabs/tab_strip.cc index dc23105..1897721 100644 --- a/chrome/browser/ui/views/tabs/tab_strip.cc +++ b/chrome/browser/ui/views/tabs/tab_strip.cc @@ -28,14 +28,14 @@ #include "ui/gfx/canvas_skia.h" #include "ui/gfx/path.h" #include "ui/gfx/size.h" +#include "ui/views/widget/default_theme_provider.h" +#include "ui/views/widget/widget.h" #include "ui/views/window/non_client_view.h" #include "views/controls/image_view.h" -#include "views/widget/default_theme_provider.h" -#include "views/widget/widget.h" #if defined(OS_WIN) #include "ui/base/win/hwnd_util.h" -#include "views/widget/monitor_win.h" +#include "ui/views/widget/monitor_win.h" #endif using views::DropTargetEvent; diff --git a/chrome/browser/ui/views/task_manager_view.cc b/chrome/browser/ui/views/task_manager_view.cc index 0e04d35..ca6b567 100644 --- a/chrome/browser/ui/views/task_manager_view.cc +++ b/chrome/browser/ui/views/task_manager_view.cc @@ -25,6 +25,7 @@ #include "ui/base/models/accelerator.h" #include "ui/base/models/table_model_observer.h" #include "ui/views/layout/layout_constants.h" +#include "ui/views/widget/widget.h" #include "ui/views/window/dialog_delegate.h" #include "views/background.h" #include "views/context_menu_controller.h" @@ -34,7 +35,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/widget/widget.h" // The task manager window default size. static const int kDefaultWidth = 460; diff --git a/chrome/browser/ui/views/toolbar_view.cc b/chrome/browser/ui/views/toolbar_view.cc index 0208973..123bbf0 100644 --- a/chrome/browser/ui/views/toolbar_view.cc +++ b/chrome/browser/ui/views/toolbar_view.cc @@ -36,10 +36,10 @@ #include "ui/gfx/canvas_skia.h" #include "ui/gfx/skbitmap_operations.h" #include "ui/views/focus/view_storage.h" +#include "ui/views/widget/tooltip_manager.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/widget/tooltip_manager.h" #if defined(OS_WIN) #include "chrome/browser/enumerate_modules_model_win.h" diff --git a/chrome/browser/ui/views/update_recommended_message_box.cc b/chrome/browser/ui/views/update_recommended_message_box.cc index 24169e0..b440c12 100644 --- a/chrome/browser/ui/views/update_recommended_message_box.cc +++ b/chrome/browser/ui/views/update_recommended_message_box.cc @@ -12,8 +12,8 @@ #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/message_box_flags.h" +#include "ui/views/widget/widget.h" #include "views/controls/message_box_view.h" -#include "views/widget/widget.h" #if defined(OS_CHROMEOS) #include "chrome/browser/chromeos/cros/cros_library.h" diff --git a/chrome/browser/ui/views/user_data_dir_dialog.cc b/chrome/browser/ui/views/user_data_dir_dialog.cc index 4167552..cb1e178 100644 --- a/chrome/browser/ui/views/user_data_dir_dialog.cc +++ b/chrome/browser/ui/views/user_data_dir_dialog.cc @@ -9,8 +9,8 @@ #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/message_box_flags.h" +#include "ui/views/widget/widget.h" #include "views/controls/message_box_view.h" -#include "views/widget/widget.h" // static FilePath UserDataDirDialog::RunUserDataDirDialog( diff --git a/chrome/browser/ui/views/window.cc b/chrome/browser/ui/views/window.cc index 6199ecf..9b13c0f 100644 --- a/chrome/browser/ui/views/window.cc +++ b/chrome/browser/ui/views/window.cc @@ -4,7 +4,7 @@ #include "chrome/browser/ui/views/window.h" -#include "views/widget/widget.h" +#include "ui/views/widget/widget.h" #if defined(OS_CHROMEOS) && defined(TOOLKIT_USES_GTK) #include "chrome/browser/chromeos/frame/bubble_window.h" diff --git a/chrome/browser/ui/views/wrench_menu.cc b/chrome/browser/ui/views/wrench_menu.cc index e098423..9e48eb3 100644 --- a/chrome/browser/ui/views/wrench_menu.cc +++ b/chrome/browser/ui/views/wrench_menu.cc @@ -32,6 +32,7 @@ #include "ui/gfx/canvas.h" #include "ui/gfx/canvas_skia.h" #include "ui/gfx/skia_util.h" +#include "ui/views/widget/widget.h" #include "views/background.h" #include "views/controls/button/image_button.h" #include "views/controls/button/menu_button.h" @@ -42,7 +43,6 @@ #include "views/controls/menu/menu_runner.h" #include "views/controls/menu/menu_scroll_view_container.h" #include "views/controls/menu/submenu_view.h" -#include "views/widget/widget.h" using ui::MenuModel; using views::CustomButton; diff --git a/chrome/browser/ui/virtual_keyboard/virtual_keyboard_manager.cc b/chrome/browser/ui/virtual_keyboard/virtual_keyboard_manager.cc index aeee117..b0b8ed1 100644 --- a/chrome/browser/ui/virtual_keyboard/virtual_keyboard_manager.cc +++ b/chrome/browser/ui/virtual_keyboard/virtual_keyboard_manager.cc @@ -29,7 +29,7 @@ #include "ui/gfx/interpolated_transform.h" #include "ui/gfx/screen.h" #include "ui/views/ime/text_input_type_tracker.h" -#include "views/widget/widget.h" +#include "ui/views/widget/widget.h" #if defined(OS_CHROMEOS) #include "chrome/browser/chromeos/input_method/input_method_manager.h" diff --git a/chrome/browser/ui/virtual_keyboard/virtual_keyboard_manager.h b/chrome/browser/ui/virtual_keyboard/virtual_keyboard_manager.h index d6f5268..fb84892 100644 --- a/chrome/browser/ui/virtual_keyboard/virtual_keyboard_manager.h +++ b/chrome/browser/ui/virtual_keyboard/virtual_keyboard_manager.h @@ -8,7 +8,7 @@ #include "base/memory/singleton.h" #include "ui/views/desktop/desktop_window_view.h" -#include "views/widget/widget.h" +#include "ui/views/widget/widget.h" class KeyboardWidget; diff --git a/chrome/browser/ui/virtual_keyboard/virtual_keyboard_manager_browsertest.cc b/chrome/browser/ui/virtual_keyboard/virtual_keyboard_manager_browsertest.cc index 7cdbe0a..060cf70 100644 --- a/chrome/browser/ui/virtual_keyboard/virtual_keyboard_manager_browsertest.cc +++ b/chrome/browser/ui/virtual_keyboard/virtual_keyboard_manager_browsertest.cc @@ -11,7 +11,7 @@ #include "content/public/browser/notification_service.h" #include "content/public/browser/notification_types.h" #include "net/base/mock_host_resolver.h" -#include "views/widget/widget.h" +#include "ui/views/widget/widget.h" class VirtualKeyboardManagerTest : public InProcessBrowserTest, public content::NotificationObserver { diff --git a/chrome/browser/ui/webui/chrome_web_ui.cc b/chrome/browser/ui/webui/chrome_web_ui.cc index 2c01d33..ea37886 100644 --- a/chrome/browser/ui/webui/chrome_web_ui.cc +++ b/chrome/browser/ui/webui/chrome_web_ui.cc @@ -10,7 +10,7 @@ #include "content/browser/tab_contents/tab_contents.h" #if defined(TOOLKIT_VIEWS) -#include "views/widget/widget.h" +#include "ui/views/widget/widget.h" #endif namespace { diff --git a/chrome/browser/ui/webui/chromeos/login/eula_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/eula_screen_handler.cc index 2d6a1684..b8fa2d4 100644 --- a/chrome/browser/ui/webui/chromeos/login/eula_screen_handler.cc +++ b/chrome/browser/ui/webui/chromeos/login/eula_screen_handler.cc @@ -16,7 +16,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" 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 f02ecb8..4096fa2 100644 --- a/chrome/browser/ui/webui/chromeos/login/network_screen_handler.cc +++ b/chrome/browser/ui/webui/chromeos/login/network_screen_handler.cc @@ -25,7 +25,7 @@ #include "ui/base/l10n/l10n_util.h" #include "ui/gfx/rect.h" #include "ui/views/layout/fill_layout.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/ui/webui/chromeos/login/user_image_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/user_image_screen_handler.cc index 4272747..5f22218 100644 --- a/chrome/browser/ui/webui/chromeos/login/user_image_screen_handler.cc +++ b/chrome/browser/ui/webui/chromeos/login/user_image_screen_handler.cc @@ -19,7 +19,7 @@ #include "chrome/common/url_constants.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 { diff --git a/chrome/browser/ui/webui/options/chromeos/change_picture_options_handler.cc b/chrome/browser/ui/webui/options/chromeos/change_picture_options_handler.cc index c9b6f6d..fd0bdeb 100644 --- a/chrome/browser/ui/webui/options/chromeos/change_picture_options_handler.cc +++ b/chrome/browser/ui/webui/options/chromeos/change_picture_options_handler.cc @@ -29,7 +29,7 @@ #include "third_party/skia/include/core/SkBitmap.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 chromeos { diff --git a/chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc b/chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc index 0e8cbd0..ec3e26c 100644 --- a/chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc +++ b/chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc @@ -50,7 +50,7 @@ #include "third_party/skia/include/core/SkBitmap.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" static const char kOtherNetworksFakePath[] = "?"; diff --git a/chrome/browser/ui/webui/task_manager_dialog.cc b/chrome/browser/ui/webui/task_manager_dialog.cc index 3f5c9e7..4070c3e 100644 --- a/chrome/browser/ui/webui/task_manager_dialog.cc +++ b/chrome/browser/ui/webui/task_manager_dialog.cc @@ -17,7 +17,7 @@ #include "ui/base/l10n/l10n_util.h" #if defined(OS_CHROMEOS) -#include "views/widget/widget.h" +#include "ui/views/widget/widget.h" #endif using content::BrowserThread; diff --git a/chrome/test/base/view_event_test_base.cc b/chrome/test/base/view_event_test_base.cc index af68770..cc414b2 100644 --- a/chrome/test/base/view_event_test_base.cc +++ b/chrome/test/base/view_event_test_base.cc @@ -15,8 +15,8 @@ #include "base/string_number_conversions.h" #include "chrome/browser/automation/ui_controls.h" #include "chrome/test/base/ui_test_utils.h" +#include "ui/views/widget/widget.h" #include "views/view.h" -#include "views/widget/widget.h" namespace { diff --git a/chrome/test/base/view_event_test_base.h b/chrome/test/base/view_event_test_base.h index b4b0027..15e5abd 100644 --- a/chrome/test/base/view_event_test_base.h +++ b/chrome/test/base/view_event_test_base.h @@ -16,7 +16,7 @@ #include "base/message_loop.h" #include "base/threading/thread.h" #include "testing/gtest/include/gtest/gtest.h" -#include "views/widget/widget_delegate.h" +#include "ui/views/widget/widget_delegate.h" namespace gfx { class Size; diff --git a/ui/aura_shell/app_list.h b/ui/aura_shell/app_list.h index eb2b886..398eea3 100644 --- a/ui/aura_shell/app_list.h +++ b/ui/aura_shell/app_list.h @@ -11,7 +11,7 @@ #include "base/memory/weak_ptr.h" #include "ui/aura/event_filter.h" #include "ui/gfx/compositor/layer_animation_observer.h" -#include "views/widget/widget.h" +#include "ui/views/widget/widget.h" namespace aura_shell { namespace internal { diff --git a/ui/aura_shell/default_container_layout_manager.cc b/ui/aura_shell/default_container_layout_manager.cc index 8deb9fb..6e80d49 100644 --- a/ui/aura_shell/default_container_layout_manager.cc +++ b/ui/aura_shell/default_container_layout_manager.cc @@ -7,17 +7,17 @@ #include "ui/aura/client/aura_constants.h" #include "ui/aura/desktop.h" #include "ui/aura/event.h" -#include "ui/aura/window.h" #include "ui/aura/screen_aura.h" -#include "ui/aura/window_types.h" +#include "ui/aura/window.h" #include "ui/aura/window_observer.h" +#include "ui/aura/window_types.h" #include "ui/aura_shell/property_util.h" #include "ui/aura_shell/show_state_controller.h" #include "ui/aura_shell/workspace/workspace.h" #include "ui/aura_shell/workspace/workspace_manager.h" #include "ui/base/ui_base_types.h" #include "ui/gfx/rect.h" -#include "views/widget/native_widget_aura.h" +#include "ui/views/widget/native_widget_aura.h" namespace aura_shell { namespace internal { diff --git a/ui/aura_shell/default_container_layout_manager_unittest.cc b/ui/aura_shell/default_container_layout_manager_unittest.cc index 9d6ec24..73c22f0 100644 --- a/ui/aura_shell/default_container_layout_manager_unittest.cc +++ b/ui/aura_shell/default_container_layout_manager_unittest.cc @@ -12,11 +12,11 @@ #include "ui/aura/screen_aura.h" #include "ui/aura/test/aura_test_base.h" #include "ui/aura/window.h" -#include "ui/aura_shell/workspace_controller.h" #include "ui/aura_shell/workspace/workspace.h" #include "ui/aura_shell/workspace/workspace_manager.h" +#include "ui/aura_shell/workspace_controller.h" #include "ui/base/ui_base_types.h" -#include "views/widget/native_widget_aura.h" +#include "ui/views/widget/native_widget_aura.h" namespace aura_shell { namespace test { diff --git a/ui/aura_shell/desktop_background_view.cc b/ui/aura_shell/desktop_background_view.cc index 9b5ce7e..3f26f36 100644 --- a/ui/aura_shell/desktop_background_view.cc +++ b/ui/aura_shell/desktop_background_view.cc @@ -12,7 +12,7 @@ #include "ui/aura_shell/shell_window_ids.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/canvas.h" -#include "views/widget/widget.h" +#include "ui/views/widget/widget.h" namespace aura_shell { namespace internal { diff --git a/ui/aura_shell/desktop_background_view.h b/ui/aura_shell/desktop_background_view.h index 09020ae..25b61f8 100644 --- a/ui/aura_shell/desktop_background_view.h +++ b/ui/aura_shell/desktop_background_view.h @@ -6,9 +6,9 @@ #define UI_AURA_SHELL_DESKTOP_BACKGROUND_VIEW_H_ #pragma once -#include "views/view.h" -#include "views/widget/widget_delegate.h" #include "third_party/skia/include/core/SkBitmap.h" +#include "ui/views/widget/widget_delegate.h" +#include "views/view.h" namespace aura_shell { namespace internal { diff --git a/ui/aura_shell/desktop_layout_manager.cc b/ui/aura_shell/desktop_layout_manager.cc index 90626ab..d54e186 100644 --- a/ui/aura_shell/desktop_layout_manager.cc +++ b/ui/aura_shell/desktop_layout_manager.cc @@ -4,9 +4,9 @@ #include "ui/aura_shell/desktop_layout_manager.h" -#include "ui/aura_shell/shelf_layout_controller.h" #include "ui/aura/window.h" -#include "views/widget/widget.h" +#include "ui/aura_shell/shelf_layout_controller.h" +#include "ui/views/widget/widget.h" namespace aura_shell { namespace internal { diff --git a/ui/aura_shell/drag_drop_controller.cc b/ui/aura_shell/drag_drop_controller.cc index b5977de..1de646a 100644 --- a/ui/aura_shell/drag_drop_controller.cc +++ b/ui/aura_shell/drag_drop_controller.cc @@ -15,7 +15,7 @@ #include "ui/base/dragdrop/os_exchange_data_provider_aura.h" #include "ui/gfx/point.h" #include "ui/gfx/rect.h" -#include "views/widget/native_widget_aura.h" +#include "ui/views/widget/native_widget_aura.h" namespace aura_shell { namespace internal { diff --git a/ui/aura_shell/drag_drop_controller_unittest.cc b/ui/aura_shell/drag_drop_controller_unittest.cc index 36d3170..c5a2142 100644 --- a/ui/aura_shell/drag_drop_controller_unittest.cc +++ b/ui/aura_shell/drag_drop_controller_unittest.cc @@ -14,8 +14,8 @@ #include "ui/base/dragdrop/drag_drop_types.h" #include "ui/base/dragdrop/os_exchange_data.h" #include "ui/views/events/event.h" +#include "ui/views/widget/widget.h" #include "views/view.h" -#include "views/widget/widget.h" namespace aura_shell { namespace test { diff --git a/ui/aura_shell/drag_image_view.cc b/ui/aura_shell/drag_image_view.cc index db807f0..afc4ca7 100644 --- a/ui/aura_shell/drag_image_view.cc +++ b/ui/aura_shell/drag_image_view.cc @@ -4,7 +4,7 @@ #include "ui/aura_shell/drag_image_view.h" -#include "views/widget/widget.h" +#include "ui/views/widget/widget.h" namespace aura_shell { namespace internal { diff --git a/ui/aura_shell/examples/aura_shell_main.cc b/ui/aura_shell/examples/aura_shell_main.cc index 17e3923..31ce3fe 100644 --- a/ui/aura_shell/examples/aura_shell_main.cc +++ b/ui/aura_shell/examples/aura_shell_main.cc @@ -17,8 +17,8 @@ #include "ui/base/ui_base_paths.h" #include "ui/gfx/canvas.h" #include "ui/gfx/compositor/test/compositor_test_support.h" -#include "views/widget/widget_delegate.h" -#include "views/widget/widget.h" +#include "ui/views/widget/widget.h" +#include "ui/views/widget/widget_delegate.h" namespace { diff --git a/ui/aura_shell/examples/bubble.cc b/ui/aura_shell/examples/bubble.cc index 03cdfc1..2bfcd6b 100644 --- a/ui/aura_shell/examples/bubble.cc +++ b/ui/aura_shell/examples/bubble.cc @@ -6,8 +6,8 @@ #include "ui/views/bubble/bubble_border.h" #include "ui/views/bubble/bubble_delegate.h" #include "ui/views/layout/fill_layout.h" +#include "ui/views/widget/widget.h" #include "views/controls/label.h" -#include "views/widget/widget.h" namespace aura_shell { namespace examples { diff --git a/ui/aura_shell/examples/lock_view.cc b/ui/aura_shell/examples/lock_view.cc index 3283a2d..68bb333 100644 --- a/ui/aura_shell/examples/lock_view.cc +++ b/ui/aura_shell/examples/lock_view.cc @@ -10,8 +10,8 @@ #include "ui/aura_shell/shell_window_ids.h" #include "ui/gfx/canvas.h" #include "ui/gfx/font.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 aura_shell { namespace examples { diff --git a/ui/aura_shell/examples/toplevel_window.cc b/ui/aura_shell/examples/toplevel_window.cc index 57dda48..f823c77 100644 --- a/ui/aura_shell/examples/toplevel_window.cc +++ b/ui/aura_shell/examples/toplevel_window.cc @@ -8,7 +8,7 @@ #include "ui/aura/window.h" #include "ui/aura_shell/toplevel_frame_view.h" #include "ui/gfx/canvas.h" -#include "views/widget/widget.h" +#include "ui/views/widget/widget.h" namespace aura_shell { namespace examples { diff --git a/ui/aura_shell/examples/toplevel_window.h b/ui/aura_shell/examples/toplevel_window.h index 49757ce..b3fbd55 100644 --- a/ui/aura_shell/examples/toplevel_window.h +++ b/ui/aura_shell/examples/toplevel_window.h @@ -6,7 +6,7 @@ #define UI_AURA_SHELL_EXAMPLES_TOPLEVEL_WINDOW_H_ #pragma once -#include "views/widget/widget_delegate.h" +#include "ui/views/widget/widget_delegate.h" namespace aura_shell { namespace examples { diff --git a/ui/aura_shell/examples/widgets.cc b/ui/aura_shell/examples/widgets.cc index 3aef092..202c3b9 100644 --- a/ui/aura_shell/examples/widgets.cc +++ b/ui/aura_shell/examples/widgets.cc @@ -6,11 +6,11 @@ #include "ui/aura/window.h" #include "ui/aura_shell/toplevel_frame_view.h" #include "ui/gfx/canvas.h" +#include "ui/views/widget/widget.h" +#include "ui/views/widget/widget_delegate.h" #include "views/controls/button/checkbox.h" #include "views/controls/button/radio_button.h" #include "views/controls/button/text_button.h" -#include "views/widget/widget.h" -#include "views/widget/widget_delegate.h" namespace { diff --git a/ui/aura_shell/examples/window_type_launcher.cc b/ui/aura_shell/examples/window_type_launcher.cc index 00c6f57..6da51be 100644 --- a/ui/aura_shell/examples/window_type_launcher.cc +++ b/ui/aura_shell/examples/window_type_launcher.cc @@ -13,10 +13,10 @@ #include "ui/aura_shell/toplevel_frame_view.h" #include "ui/gfx/canvas.h" #include "ui/gfx/compositor/layer.h" +#include "ui/views/widget/widget.h" #include "views/controls/button/text_button.h" #include "views/controls/menu/menu_item_view.h" #include "views/controls/menu/menu_runner.h" -#include "views/widget/widget.h" using views::MenuItemView; using views::MenuRunner; diff --git a/ui/aura_shell/examples/window_type_launcher.h b/ui/aura_shell/examples/window_type_launcher.h index 0644513..a18349b 100644 --- a/ui/aura_shell/examples/window_type_launcher.h +++ b/ui/aura_shell/examples/window_type_launcher.h @@ -6,10 +6,10 @@ #define UI_AURA_SHELL_EXAMPLES_WINDOW_TYPE_LAUNCHER_H_ #pragma once +#include "ui/views/widget/widget_delegate.h" #include "views/context_menu_controller.h" #include "views/controls/button/button.h" #include "views/controls/menu/menu_delegate.h" -#include "views/widget/widget_delegate.h" namespace views { class MenuRunner; diff --git a/ui/aura_shell/launcher/launcher.cc b/ui/aura_shell/launcher/launcher.cc index 1adde4c..64a6c88 100644 --- a/ui/aura_shell/launcher/launcher.cc +++ b/ui/aura_shell/launcher/launcher.cc @@ -11,7 +11,7 @@ #include "ui/aura_shell/shell_delegate.h" #include "ui/aura_shell/shell_window_ids.h" #include "ui/gfx/compositor/layer.h" -#include "views/widget/widget.h" +#include "ui/views/widget/widget.h" namespace aura_shell { diff --git a/ui/aura_shell/launcher/launcher_view.cc b/ui/aura_shell/launcher/launcher_view.cc index 46a0b07..117b300 100644 --- a/ui/aura_shell/launcher/launcher_view.cc +++ b/ui/aura_shell/launcher/launcher_view.cc @@ -21,10 +21,10 @@ #include "ui/gfx/compositor/layer.h" #include "ui/gfx/image/image.h" #include "ui/views/animation/bounds_animator.h" +#include "ui/views/widget/widget.h" #include "views/controls/button/image_button.h" #include "views/controls/menu/menu_model_adapter.h" #include "views/controls/menu/menu_runner.h" -#include "views/widget/widget.h" using ui::Animation; using views::View; diff --git a/ui/aura_shell/launcher/launcher_view.h b/ui/aura_shell/launcher/launcher_view.h index a2f63b3..c4279aa0 100644 --- a/ui/aura_shell/launcher/launcher_view.h +++ b/ui/aura_shell/launcher/launcher_view.h @@ -10,8 +10,8 @@ #include "ui/aura_shell/launcher/launcher_button_host.h" #include "ui/aura_shell/launcher/launcher_model_observer.h" +#include "ui/views/widget/widget_delegate.h" #include "views/controls/button/button.h" -#include "views/widget/widget_delegate.h" namespace views { class BoundsAnimator; diff --git a/ui/aura_shell/modal_container_layout_manager.cc b/ui/aura_shell/modal_container_layout_manager.cc index c16df01..3d0aae1 100644 --- a/ui/aura_shell/modal_container_layout_manager.cc +++ b/ui/aura_shell/modal_container_layout_manager.cc @@ -15,8 +15,8 @@ #include "ui/gfx/canvas.h" #include "ui/gfx/compositor/layer.h" #include "ui/gfx/compositor/layer_animator.h" +#include "ui/views/widget/widget.h" #include "views/view.h" -#include "views/widget/widget.h" namespace aura_shell { namespace internal { diff --git a/ui/aura_shell/modal_container_layout_manager_unittest.cc b/ui/aura_shell/modal_container_layout_manager_unittest.cc index 0baf9d3..aad19c6 100644 --- a/ui/aura_shell/modal_container_layout_manager_unittest.cc +++ b/ui/aura_shell/modal_container_layout_manager_unittest.cc @@ -11,8 +11,8 @@ #include "ui/aura_shell/shell.h" #include "ui/aura_shell/shell_window_ids.h" #include "ui/aura_shell/test/aura_shell_test_base.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 aura_shell { namespace test { diff --git a/ui/aura_shell/shelf_layout_controller.cc b/ui/aura_shell/shelf_layout_controller.cc index 9e8d01a..7e7f851 100644 --- a/ui/aura_shell/shelf_layout_controller.cc +++ b/ui/aura_shell/shelf_layout_controller.cc @@ -8,7 +8,7 @@ #include "ui/aura/screen_aura.h" #include "ui/gfx/compositor/layer.h" #include "ui/gfx/compositor/layer_animator.h" -#include "views/widget/widget.h" +#include "ui/views/widget/widget.h" namespace aura_shell { namespace internal { diff --git a/ui/aura_shell/shell.cc b/ui/aura_shell/shell.cc index ddd08b5..0e1fb45 100644 --- a/ui/aura_shell/shell.cc +++ b/ui/aura_shell/shell.cc @@ -31,8 +31,8 @@ #include "ui/aura_shell/workspace_controller.h" #include "ui/gfx/compositor/layer.h" #include "ui/gfx/compositor/layer_animator.h" -#include "views/widget/native_widget_aura.h" -#include "views/widget/widget.h" +#include "ui/views/widget/native_widget_aura.h" +#include "ui/views/widget/widget.h" namespace aura_shell { diff --git a/ui/aura_shell/shell_unittest.cc b/ui/aura_shell/shell_unittest.cc index a9a18e2..9fecd88 100644 --- a/ui/aura_shell/shell_unittest.cc +++ b/ui/aura_shell/shell_unittest.cc @@ -7,7 +7,7 @@ #include "ui/aura_shell/shell.h" #include "ui/aura_shell/shell_window_ids.h" #include "ui/aura_shell/test/aura_shell_test_base.h" -#include "views/widget/widget.h" +#include "ui/views/widget/widget.h" namespace aura_shell { namespace test { diff --git a/ui/aura_shell/status_area_view.cc b/ui/aura_shell/status_area_view.cc index 1746ba7..94d73ab 100644 --- a/ui/aura_shell/status_area_view.cc +++ b/ui/aura_shell/status_area_view.cc @@ -12,7 +12,7 @@ #include "ui/aura_shell/shell_window_ids.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/canvas.h" -#include "views/widget/widget.h" +#include "ui/views/widget/widget.h" namespace aura_shell { namespace internal { diff --git a/ui/aura_shell/status_area_view.h b/ui/aura_shell/status_area_view.h index 68d0799..1d07b15 100644 --- a/ui/aura_shell/status_area_view.h +++ b/ui/aura_shell/status_area_view.h @@ -7,7 +7,7 @@ #pragma once #include "third_party/skia/include/core/SkBitmap.h" -#include "views/widget/widget_delegate.h" +#include "ui/views/widget/widget_delegate.h" namespace aura_shell { namespace internal { diff --git a/ui/aura_shell/toplevel_frame_view.cc b/ui/aura_shell/toplevel_frame_view.cc index f707675..ab891a6 100644 --- a/ui/aura_shell/toplevel_frame_view.cc +++ b/ui/aura_shell/toplevel_frame_view.cc @@ -10,9 +10,9 @@ #include "ui/base/hit_test.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/canvas.h" +#include "ui/views/widget/widget.h" +#include "ui/views/widget/widget_delegate.h" #include "views/controls/button/custom_button.h" -#include "views/widget/widget.h" -#include "views/widget/widget_delegate.h" namespace aura_shell { namespace internal { diff --git a/ui/views/accessibility/native_view_accessibility_win.cc b/ui/views/accessibility/native_view_accessibility_win.cc index 45490e5..75d8655 100644 --- a/ui/views/accessibility/native_view_accessibility_win.cc +++ b/ui/views/accessibility/native_view_accessibility_win.cc @@ -14,8 +14,8 @@ #include "ui/base/accessibility/accessible_view_state.h" #include "ui/base/view_prop.h" #include "ui/base/win/atl_module.h" -#include "views/widget/native_widget_win.h" -#include "views/widget/widget.h" +#include "ui/views/widget/native_widget_win.h" +#include "ui/views/widget/widget.h" using ui::AccessibilityTypes; diff --git a/ui/views/bubble/bubble_delegate.cc b/ui/views/bubble/bubble_delegate.cc index bffe755..32124b2 100644 --- a/ui/views/bubble/bubble_delegate.cc +++ b/ui/views/bubble/bubble_delegate.cc @@ -6,7 +6,7 @@ #include "ui/base/animation/slide_animation.h" #include "ui/views/bubble/bubble_frame_view.h" -#include "views/widget/widget.h" +#include "ui/views/widget/widget.h" // The duration of the fade animation in milliseconds. static const int kHideFadeDurationMS = 200; diff --git a/ui/views/bubble/bubble_delegate.h b/ui/views/bubble/bubble_delegate.h index b31c77d..ddf9785 100644 --- a/ui/views/bubble/bubble_delegate.h +++ b/ui/views/bubble/bubble_delegate.h @@ -9,8 +9,8 @@ #include "base/gtest_prod_util.h" #include "ui/base/animation/animation_delegate.h" #include "ui/views/bubble/bubble_border.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 ui { class SlideAnimation; diff --git a/ui/views/bubble/bubble_delegate_unittest.cc b/ui/views/bubble/bubble_delegate_unittest.cc index 6e61b5e..7cfda58 100644 --- a/ui/views/bubble/bubble_delegate_unittest.cc +++ b/ui/views/bubble/bubble_delegate_unittest.cc @@ -5,7 +5,7 @@ #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/widget/widget.h" +#include "ui/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 cc35496..11d1b20 100644 --- a/ui/views/bubble/bubble_frame_view.cc +++ b/ui/views/bubble/bubble_frame_view.cc @@ -9,8 +9,8 @@ #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/widget/widget.h" #include "ui/views/window/client_view.h" -#include "views/widget/widget.h" namespace views { diff --git a/ui/views/bubble/bubble_frame_view_unittest.cc b/ui/views/bubble/bubble_frame_view_unittest.cc index bde9f7c..088fde2 100644 --- a/ui/views/bubble/bubble_frame_view_unittest.cc +++ b/ui/views/bubble/bubble_frame_view_unittest.cc @@ -8,7 +8,7 @@ #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/widget/widget.h" +#include "ui/views/widget/widget.h" namespace views { diff --git a/ui/views/events/event.cc b/ui/views/events/event.cc index 433098e..3d1ebb8 100644 --- a/ui/views/events/event.cc +++ b/ui/views/events/event.cc @@ -6,8 +6,8 @@ #include "base/logging.h" #include "ui/base/keycodes/keyboard_code_conversion.h" +#include "ui/views/widget/root_view.h" #include "views/view.h" -#include "views/widget/root_view.h" namespace views { diff --git a/ui/views/events/event_x.cc b/ui/views/events/event_x.cc index 48e7bea..a50cc85 100644 --- a/ui/views/events/event_x.cc +++ b/ui/views/events/event_x.cc @@ -15,7 +15,7 @@ #include "ui/base/keycodes/keyboard_code_conversion.h" #include "ui/base/keycodes/keyboard_code_conversion_x.h" #include "ui/base/touch/touch_factory.h" -#include "views/widget/root_view.h" +#include "ui/views/widget/root_view.h" namespace views { diff --git a/ui/views/examples/bubble_example.cc b/ui/views/examples/bubble_example.cc index 70b4357..8f591e1 100644 --- a/ui/views/examples/bubble_example.cc +++ b/ui/views/examples/bubble_example.cc @@ -8,9 +8,9 @@ #include "ui/views/bubble/bubble_delegate.h" #include "ui/views/layout/box_layout.h" #include "ui/views/layout/fill_layout.h" +#include "ui/views/widget/widget.h" #include "views/controls/button/text_button.h" #include "views/controls/label.h" -#include "views/widget/widget.h" namespace examples { diff --git a/ui/views/examples/examples_main.cc b/ui/views/examples/examples_main.cc index 819e6f0..f687d28 100644 --- a/ui/views/examples/examples_main.cc +++ b/ui/views/examples/examples_main.cc @@ -34,10 +34,10 @@ #include "ui/views/focus/accelerator_handler.h" #include "ui/views/layout/grid_layout.h" #include "ui/views/test/test_views_delegate.h" +#include "ui/views/widget/widget.h" #include "views/controls/button/text_button.h" #include "views/controls/label.h" #include "views/controls/tabbed_pane/tabbed_pane.h" -#include "views/widget/widget.h" #if defined(OS_WIN) // TableView is not yet ported to Linux. diff --git a/ui/views/examples/examples_main.h b/ui/views/examples/examples_main.h index a4278937..a1f4d87 100644 --- a/ui/views/examples/examples_main.h +++ b/ui/views/examples/examples_main.h @@ -11,7 +11,7 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" -#include "views/widget/widget_delegate.h" +#include "ui/views/widget/widget_delegate.h" namespace views { class Label; diff --git a/ui/views/examples/native_widget_views_example.cc b/ui/views/examples/native_widget_views_example.cc index 72cdab7..588257f 100644 --- a/ui/views/examples/native_widget_views_example.cc +++ b/ui/views/examples/native_widget_views_example.cc @@ -8,10 +8,10 @@ #include "ui/gfx/canvas.h" #include "ui/views/examples/example_base.h" #include "ui/views/test/test_views_delegate.h" +#include "ui/views/widget/native_widget_views.h" +#include "ui/views/widget/widget.h" #include "views/controls/button/text_button.h" #include "views/view.h" -#include "views/widget/native_widget_views.h" -#include "views/widget/widget.h" namespace examples { diff --git a/ui/views/examples/widget_example.cc b/ui/views/examples/widget_example.cc index e1d542e..0aea09a 100644 --- a/ui/views/examples/widget_example.cc +++ b/ui/views/examples/widget_example.cc @@ -7,9 +7,9 @@ #include "base/utf_string_conversions.h" #include "ui/views/layout/box_layout.h" #include "ui/views/layout/layout_manager.h" +#include "ui/views/widget/widget.h" #include "views/controls/button/text_button.h" #include "views/view.h" -#include "views/widget/widget.h" namespace { diff --git a/ui/views/examples/widget_example.h b/ui/views/examples/widget_example.h index ab802e3..4011c48 100644 --- a/ui/views/examples/widget_example.h +++ b/ui/views/examples/widget_example.h @@ -11,8 +11,8 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" #include "ui/views/examples/example_base.h" +#include "ui/views/widget/widget.h" #include "views/controls/button/text_button.h" -#include "views/widget/widget.h" namespace examples { diff --git a/ui/views/focus/accelerator_handler_gtk_unittest.cc b/ui/views/focus/accelerator_handler_gtk_unittest.cc index f549b9c..f52a256 100644 --- a/ui/views/focus/accelerator_handler_gtk_unittest.cc +++ b/ui/views/focus/accelerator_handler_gtk_unittest.cc @@ -9,9 +9,9 @@ #include "ui/gfx/rect.h" #include "ui/views/focus/accelerator_handler.h" #include "ui/views/focus/focus_manager.h" +#include "ui/views/widget/widget.h" +#include "ui/views/widget/widget_delegate.h" #include "views/view.h" -#include "views/widget/widget.h" -#include "views/widget/widget_delegate.h" namespace views { diff --git a/ui/views/focus/accelerator_handler_win.cc b/ui/views/focus/accelerator_handler_win.cc index f923cd0..13c3081 100644 --- a/ui/views/focus/accelerator_handler_win.cc +++ b/ui/views/focus/accelerator_handler_win.cc @@ -8,7 +8,7 @@ #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" +#include "ui/views/widget/widget.h" namespace views { diff --git a/ui/views/focus/focus_manager.cc b/ui/views/focus/focus_manager.cc index 268623b..1c98a12 100644 --- a/ui/views/focus/focus_manager.cc +++ b/ui/views/focus/focus_manager.cc @@ -15,9 +15,9 @@ #include "ui/views/focus/focus_search.h" #include "ui/views/focus/view_storage.h" #include "ui/views/focus/widget_focus_manager.h" +#include "ui/views/widget/root_view.h" +#include "ui/views/widget/widget.h" #include "views/view.h" -#include "views/widget/root_view.h" -#include "views/widget/widget.h" namespace views { diff --git a/ui/views/focus/focus_manager_unittest.cc b/ui/views/focus/focus_manager_unittest.cc index a0420e9..46c629a 100644 --- a/ui/views/focus/focus_manager_unittest.cc +++ b/ui/views/focus/focus_manager_unittest.cc @@ -14,6 +14,9 @@ #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/widget/root_view.h" +#include "ui/views/widget/widget.h" +#include "ui/views/widget/widget_delegate.h" #include "ui/views/window/non_client_view.h" #include "views/background.h" #include "views/border.h" @@ -28,9 +31,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/widget/root_view.h" -#include "views/widget/widget.h" -#include "views/widget/widget_delegate.h" #if defined(OS_LINUX) #include "ui/base/keycodes/keyboard_code_conversion_gtk.h" diff --git a/ui/views/ime/input_method_base.cc b/ui/views/ime/input_method_base.cc index 4b53ff5..cb9573c 100644 --- a/ui/views/ime/input_method_base.cc +++ b/ui/views/ime/input_method_base.cc @@ -5,8 +5,8 @@ #include "ui/base/ime/text_input_client.h" #include "ui/views/ime/input_method_base.h" #include "ui/views/ime/text_input_type_tracker.h" +#include "ui/views/widget/widget.h" #include "views/view.h" -#include "views/widget/widget.h" #include "base/logging.h" diff --git a/ui/views/ime/input_method_gtk.cc b/ui/views/ime/input_method_gtk.cc index 9de362b..8b8c97a 100644 --- a/ui/views/ime/input_method_gtk.cc +++ b/ui/views/ime/input_method_gtk.cc @@ -20,7 +20,7 @@ #include "ui/base/keycodes/keyboard_code_conversion_gtk.h" #include "ui/base/keycodes/keyboard_codes.h" #include "ui/views/events/event.h" -#include "views/widget/widget.h" +#include "ui/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 82b1455..f9ffe6c 100644 --- a/ui/views/ime/input_method_ibus.cc +++ b/ui/views/ime/input_method_ibus.cc @@ -26,7 +26,7 @@ #include "ui/gfx/point.h" #include "ui/gfx/rect.h" #include "ui/views/events/event.h" -#include "views/widget/widget.h" +#include "ui/views/widget/widget.h" #if defined(USE_AURA) || defined(TOUCH_UI) #include "ui/base/keycodes/keyboard_code_conversion_x.h" diff --git a/ui/views/ime/input_method_win.h b/ui/views/ime/input_method_win.h index 6c4455f..5a34673 100644 --- a/ui/views/ime/input_method_win.h +++ b/ui/views/ime/input_method_win.h @@ -14,8 +14,8 @@ #include "base/compiler_specific.h" #include "ui/base/win/ime_input.h" #include "ui/views/ime/input_method_base.h" +#include "ui/views/widget/widget.h" #include "views/view.h" -#include "views/widget/widget.h" namespace views { diff --git a/ui/views/ime/mock_input_method.cc b/ui/views/ime/mock_input_method.cc index 8365f74..af5bb18 100644 --- a/ui/views/ime/mock_input_method.cc +++ b/ui/views/ime/mock_input_method.cc @@ -9,7 +9,7 @@ #include "ui/base/ime/text_input_client.h" #include "ui/base/keycodes/keyboard_codes.h" #include "ui/views/events/event.h" -#include "views/widget/widget.h" +#include "ui/views/widget/widget.h" namespace views { diff --git a/ui/views/touchui/gesture_manager.cc b/ui/views/touchui/gesture_manager.cc index 51b2c79..8aba2a31 100644 --- a/ui/views/touchui/gesture_manager.cc +++ b/ui/views/touchui/gesture_manager.cc @@ -10,8 +10,8 @@ #include "base/logging.h" #include "ui/views/events/event.h" +#include "ui/views/widget/widget.h" #include "views/view.h" -#include "views/widget/widget.h" namespace views { diff --git a/ui/views/touchui/touch_selection_controller_impl.cc b/ui/views/touchui/touch_selection_controller_impl.cc index 30f94cc..d297fa7 100644 --- a/ui/views/touchui/touch_selection_controller_impl.cc +++ b/ui/views/touchui/touch_selection_controller_impl.cc @@ -18,13 +18,13 @@ #include "ui/gfx/size.h" #include "ui/gfx/transform.h" #include "ui/views/layout/box_layout.h" +#include "ui/views/widget/widget.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/widget/widget.h" namespace { diff --git a/ui/views/touchui/touch_selection_controller_impl_unittest.cc b/ui/views/touchui/touch_selection_controller_impl_unittest.cc index 62fc00f..64c9ab1 100644 --- a/ui/views/touchui/touch_selection_controller_impl_unittest.cc +++ b/ui/views/touchui/touch_selection_controller_impl_unittest.cc @@ -9,9 +9,9 @@ #include "ui/views/test/views_test_base.h" #include "ui/views/touchui/touch_selection_controller.h" #include "ui/views/touchui/touch_selection_controller_impl.h" +#include "ui/views/widget/widget.h" #include "views/controls/textfield/native_textfield_views.h" #include "views/controls/textfield/textfield.h" -#include "views/widget/widget.h" namespace views { diff --git a/views/widget/aero_tooltip_manager.cc b/ui/views/widget/aero_tooltip_manager.cc index 0a93687..daac357 100644 --- a/views/widget/aero_tooltip_manager.cc +++ b/ui/views/widget/aero_tooltip_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/widget/aero_tooltip_manager.h" +#include "ui/views/widget/aero_tooltip_manager.h" #include <windows.h> #include <commctrl.h> diff --git a/views/widget/aero_tooltip_manager.h b/ui/views/widget/aero_tooltip_manager.h index 9f322fd..db77fc3 100644 --- a/views/widget/aero_tooltip_manager.h +++ b/ui/views/widget/aero_tooltip_manager.h @@ -2,12 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef VIEWS_WIDGET_AERO_TOOLTIP_MANAGER_H_ -#define VIEWS_WIDGET_AERO_TOOLTIP_MANAGER_H_ +#ifndef UI_VIEWS_WIDGET_AERO_TOOLTIP_MANAGER_H_ +#define UI_VIEWS_WIDGET_AERO_TOOLTIP_MANAGER_H_ #pragma once #include "base/memory/ref_counted.h" -#include "views/widget/tooltip_manager_win.h" +#include "ui/views/widget/tooltip_manager_win.h" namespace views { @@ -57,4 +57,4 @@ class AeroTooltipManager : public TooltipManagerWin { } // namespace views -#endif // #ifndef VIEWS_WIDGET_AERO_TOOLTIP_MANAGER_H_ +#endif // UI_VIEWS_WIDGET_AERO_TOOLTIP_MANAGER_H_ diff --git a/views/widget/child_window_message_processor.cc b/ui/views/widget/child_window_message_processor.cc index e1cfa31..dc49756 100644 --- a/views/widget/child_window_message_processor.cc +++ b/ui/views/widget/child_window_message_processor.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2010 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. -#include "views/widget/child_window_message_processor.h" +#include "ui/views/widget/child_window_message_processor.h" #include "base/logging.h" #include "ui/base/view_prop.h" diff --git a/views/widget/child_window_message_processor.h b/ui/views/widget/child_window_message_processor.h index a11b187..92e4847 100644 --- a/views/widget/child_window_message_processor.h +++ b/ui/views/widget/child_window_message_processor.h @@ -1,9 +1,9 @@ -// Copyright (c) 2010 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. -#ifndef VIEWS_WIDGET_CHILD_WINDOW_MESSAGE_PROCESSOR_H_ -#define VIEWS_WIDGET_CHILD_WINDOW_MESSAGE_PROCESSOR_H_ +#ifndef UI_VIEWS_WIDGET_CHILD_WINDOW_MESSAGE_PROCESSOR_H_ +#define UI_VIEWS_WIDGET_CHILD_WINDOW_MESSAGE_PROCESSOR_H_ #pragma once #include <windows.h> @@ -45,4 +45,4 @@ class ChildWindowMessageProcessor { } // namespace views -#endif // VIEWS_WIDGET_CHILD_WINDOW_MESSAGE_PROCESSOR_H_ +#endif // UI_VIEWS_WIDGET_CHILD_WINDOW_MESSAGE_PROCESSOR_H_ diff --git a/views/widget/default_theme_provider.cc b/ui/views/widget/default_theme_provider.cc index 6fdbb86..8ad2cfb 100644 --- a/views/widget/default_theme_provider.cc +++ b/ui/views/widget/default_theme_provider.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/widget/default_theme_provider.h" +#include "ui/views/widget/default_theme_provider.h" #include "ui/base/resource/resource_bundle.h" #if defined(OS_WIN) && !defined(USE_AURA) -#include "views/widget/native_widget_win.h" +#include "ui/views/widget/native_widget_win.h" #endif namespace views { diff --git a/views/widget/default_theme_provider.h b/ui/views/widget/default_theme_provider.h index 9303e83..7119c59 100644 --- a/views/widget/default_theme_provider.h +++ b/ui/views/widget/default_theme_provider.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef VIEWS_DEFAULT_THEME_PROVIDER_H_ -#define VIEWS_DEFAULT_THEME_PROVIDER_H_ +#ifndef UI_VIEWS_WIDGET_DEFAULT_THEME_PROVIDER_H_ +#define UI_VIEWS_WIDGET_DEFAULT_THEME_PROVIDER_H_ #pragma once #include <vector> @@ -41,4 +41,4 @@ class VIEWS_EXPORT DefaultThemeProvider : public ui::ThemeProvider { } // namespace views -#endif // VIEWS_DEFAULT_THEME_PROVIDER_H_ +#endif // UI_VIEWS_WIDGET_DEFAULT_THEME_PROVIDER_H_ diff --git a/views/widget/drop_helper.cc b/ui/views/widget/drop_helper.cc index 4e5ce109..a351090 100644 --- a/views/widget/drop_helper.cc +++ b/ui/views/widget/drop_helper.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/widget/drop_helper.h" +#include "ui/views/widget/drop_helper.h" #include "ui/base/dragdrop/drag_drop_types.h" +#include "ui/views/widget/widget.h" #include "views/view.h" -#include "views/widget/widget.h" namespace views { diff --git a/views/widget/drop_helper.h b/ui/views/widget/drop_helper.h index cc62bfc..38627d3 100644 --- a/views/widget/drop_helper.h +++ b/ui/views/widget/drop_helper.h @@ -1,9 +1,9 @@ -// 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. -#ifndef VIEWS_WIDGET_DROP_HELPER_H_ -#define VIEWS_WIDGET_DROP_HELPER_H_ +#ifndef UI_VIEWS_WIDGET_DROP_HELPER_H_ +#define UI_VIEWS_WIDGET_DROP_HELPER_H_ #pragma once #include "base/basictypes.h" @@ -105,4 +105,4 @@ class DropHelper { } // namespace views -#endif // VIEWS_WIDGET_DROP_HELPER_H_ +#endif // UI_VIEWS_WIDGET_DROP_HELPER_H_ diff --git a/views/widget/drop_target_gtk.cc b/ui/views/widget/drop_target_gtk.cc index 8d8e760..f5b3102 100644 --- a/views/widget/drop_target_gtk.cc +++ b/ui/views/widget/drop_target_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/widget/drop_target_gtk.h" +#include "ui/views/widget/drop_target_gtk.h" #include <algorithm> #include <iterator> @@ -16,8 +16,8 @@ #include "ui/base/dragdrop/gtk_dnd_util.h" #include "ui/base/dragdrop/os_exchange_data_provider_gtk.h" #include "ui/gfx/point.h" -#include "views/widget/root_view.h" -#include "views/widget/native_widget_gtk.h" +#include "ui/views/widget/native_widget_gtk.h" +#include "ui/views/widget/root_view.h" using ui::OSExchangeData; diff --git a/views/widget/drop_target_gtk.h b/ui/views/widget/drop_target_gtk.h index daa08f2..bf324af 100644 --- a/views/widget/drop_target_gtk.h +++ b/ui/views/widget/drop_target_gtk.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef VIEWS_WIDGET_DROP_TARGET_GTK_H_ -#define VIEWS_WIDGET_DROP_TARGET_GTK_H_ +#ifndef UI_VIEWS_WIDGET_DROP_TARGET_GTK_H_ +#define UI_VIEWS_WIDGET_DROP_TARGET_GTK_H_ #pragma once #include <gtk/gtk.h> @@ -11,7 +11,7 @@ #include "base/memory/scoped_ptr.h" #include "ui/base/dragdrop/os_exchange_data.h" -#include "views/widget/drop_helper.h" +#include "ui/views/widget/drop_helper.h" namespace ui { class OSExchangeDataProviderGtk; @@ -117,4 +117,4 @@ class DropTargetGtk { } // namespace views -#endif // VIEWS_WIDGET_DROP_TARGET_GTK_H_ +#endif // UI_VIEWS_WIDGET_DROP_TARGET_GTK_H_ diff --git a/views/widget/drop_target_win.cc b/ui/views/widget/drop_target_win.cc index c4c8e2c..6ddeb1e 100644 --- a/views/widget/drop_target_win.cc +++ b/ui/views/widget/drop_target_win.cc @@ -1,15 +1,15 @@ -// Copyright (c) 2010 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. -#include "views/widget/drop_target_win.h" +#include "ui/views/widget/drop_target_win.h" #include "ui/base/dragdrop/drag_drop_types.h" #include "ui/base/dragdrop/os_exchange_data.h" #include "ui/base/dragdrop/os_exchange_data_provider_win.h" #include "ui/gfx/point.h" -#include "views/widget/root_view.h" -#include "views/widget/widget.h" +#include "ui/views/widget/root_view.h" +#include "ui/views/widget/widget.h" using ui::OSExchangeData; using ui::OSExchangeDataProviderWin; diff --git a/views/widget/drop_target_win.h b/ui/views/widget/drop_target_win.h index 966bbc2..3249ec5 100644 --- a/views/widget/drop_target_win.h +++ b/ui/views/widget/drop_target_win.h @@ -1,13 +1,13 @@ -// Copyright (c) 2010 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. -#ifndef VIEWS_WIDGET_DROP_TARGET_WIN_H_ -#define VIEWS_WIDGET_DROP_TARGET_WIN_H_ +#ifndef UI_VIEWS_WIDGET_DROP_TARGET_WIN_H_ +#define UI_VIEWS_WIDGET_DROP_TARGET_WIN_H_ #pragma once #include "ui/base/dragdrop/drop_target.h" -#include "views/widget/drop_helper.h" +#include "ui/views/widget/drop_helper.h" namespace views { @@ -53,4 +53,4 @@ class DropTargetWin : public ui::DropTarget { } // namespace views -#endif // VIEWS_WIDGET_DROP_TARGET_WIN_H_ +#endif // UI_VIEWS_WIDGET_DROP_TARGET_WIN_H_ diff --git a/views/widget/gtk_views_fixed.cc b/ui/views/widget/gtk_views_fixed.cc index 6ab70df8..60aed5c 100644 --- a/views/widget/gtk_views_fixed.cc +++ b/ui/views/widget/gtk_views_fixed.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/widget/gtk_views_fixed.h" +#include "ui/views/widget/gtk_views_fixed.h" #include "base/logging.h" diff --git a/views/widget/gtk_views_fixed.h b/ui/views/widget/gtk_views_fixed.h index e9f3fe7..4fadbbd 100644 --- a/views/widget/gtk_views_fixed.h +++ b/ui/views/widget/gtk_views_fixed.h @@ -1,9 +1,9 @@ -// Copyright (c) 2009 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. -#ifndef VIEWS_WIDGET_GTK_VIEWS_FIXED_H_ -#define VIEWS_WIDGET_GTK_VIEWS_FIXED_H_ +#ifndef UI_VIEWS_WIDGET_GTK_VIEWS_FIXED_H_ +#define UI_VIEWS_WIDGET_GTK_VIEWS_FIXED_H_ #pragma once #include <gdk/gdk.h> @@ -53,4 +53,4 @@ bool gtk_views_fixed_get_widget_size(GtkWidget* widget, G_END_DECLS -#endif // VIEWS_WIDGET_GTK_VIEWS_FIXED_H +#endif // UI_VIEWS_WIDGET_GTK_VIEWS_FIXED_H_ diff --git a/views/widget/gtk_views_window.cc b/ui/views/widget/gtk_views_window.cc index 1e5b48f..6470850 100644 --- a/views/widget/gtk_views_window.cc +++ b/ui/views/widget/gtk_views_window.cc @@ -6,8 +6,8 @@ #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" +#include "ui/views/widget/gtk_views_window.h" +#include "ui/views/widget/widget.h" G_BEGIN_DECLS diff --git a/views/widget/gtk_views_window.h b/ui/views/widget/gtk_views_window.h index 8557db0..9c397c7 100644 --- a/views/widget/gtk_views_window.h +++ b/ui/views/widget/gtk_views_window.h @@ -1,9 +1,9 @@ -// Copyright (c) 2010 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. -#ifndef VIEWS_WIDGET_GTK_VIEWS_WINDOW_H_ -#define VIEWS_WIDGET_GTK_VIEWS_WINDOW_H_ +#ifndef UI_VIEWS_WIDGET_GTK_VIEWS_WINDOW_H_ +#define UI_VIEWS_WIDGET_GTK_VIEWS_WINDOW_H_ #pragma once #include <gtk/gtkwindow.h> @@ -41,4 +41,4 @@ GtkWidget* gtk_views_window_new(GtkWindowType type); G_END_DECLS -#endif // VIEWS_WIDGET_GTK_VIEWS_WINDOW_H +#endif // UI_VIEWS_WIDGET_GTK_VIEWS_WINDOW_H_ diff --git a/views/widget/monitor_win.cc b/ui/views/widget/monitor_win.cc index d840893..dea232a 100644 --- a/views/widget/monitor_win.cc +++ b/ui/views/widget/monitor_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/widget/monitor_win.h" +#include "ui/views/widget/monitor_win.h" #include <shellapi.h> diff --git a/views/widget/monitor_win.h b/ui/views/widget/monitor_win.h index 7ceacfa..627c6ee 100644 --- a/views/widget/monitor_win.h +++ b/ui/views/widget/monitor_win.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef VIEWS_WIDGET_MONITOR_WIN_H_ -#define VIEWS_WIDGET_MONITOR_WIN_H_ +#ifndef UI_VIEWS_WIDGET_MONITOR_WIN_H_ +#define UI_VIEWS_WIDGET_MONITOR_WIN_H_ #pragma once #include <windows.h> @@ -26,4 +26,4 @@ VIEWS_EXPORT HWND GetTopmostAutoHideTaskbarForEdge(UINT edge, HMONITOR monitor); } // namespace views -#endif // VIEWS_WIDGET_MONITOR_WIN_H_ +#endif // UI_VIEWS_WIDGET_MONITOR_WIN_H_ diff --git a/views/widget/native_widget.h b/ui/views/widget/native_widget.h index 9289fde..1e1a2a8 100644 --- a/views/widget/native_widget.h +++ b/ui/views/widget/native_widget.h @@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef VIEWS_WIDGET_NATIVE_WIDGET_H_ -#define VIEWS_WIDGET_NATIVE_WIDGET_H_ +#ifndef UI_VIEWS_WIDGET_NATIVE_WIDGET_H_ +#define UI_VIEWS_WIDGET_NATIVE_WIDGET_H_ #pragma once -#include "views/widget/widget.h" +#include "ui/views/widget/widget.h" namespace views { namespace internal { @@ -35,4 +35,4 @@ class VIEWS_EXPORT NativeWidget { } // namespace views -#endif // VIEWS_WIDGET_NATIVE_WIDGET_H_ +#endif // UI_VIEWS_WIDGET_NATIVE_WIDGET_H_ diff --git a/views/widget/native_widget_aura.cc b/ui/views/widget/native_widget_aura.cc index 48450b7b..a0f87e2 100644 --- a/views/widget/native_widget_aura.cc +++ b/ui/views/widget/native_widget_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/widget/native_widget_aura.h" +#include "ui/views/widget/native_widget_aura.h" #include "base/bind.h" #include "base/string_util.h" @@ -20,9 +20,9 @@ #include "ui/gfx/compositor/layer.h" #include "ui/gfx/font.h" #include "ui/gfx/screen.h" -#include "views/widget/drop_helper.h" -#include "views/widget/native_widget_delegate.h" -#include "views/widget/tooltip_manager_views.h" +#include "ui/views/widget/drop_helper.h" +#include "ui/views/widget/native_widget_delegate.h" +#include "ui/views/widget/tooltip_manager_views.h" #if defined(OS_WIN) #include "base/win/scoped_gdi_object.h" diff --git a/views/widget/native_widget_aura.h b/ui/views/widget/native_widget_aura.h index 8f1383a..90d0562 100644 --- a/views/widget/native_widget_aura.h +++ b/ui/views/widget/native_widget_aura.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef VIEWS_WIDGET_NATIVE_WIDGET_AURA_H_ -#define VIEWS_WIDGET_NATIVE_WIDGET_AURA_H_ +#ifndef UI_VIEWS_WIDGET_NATIVE_WIDGET_AURA_H_ +#define UI_VIEWS_WIDGET_NATIVE_WIDGET_AURA_H_ #pragma once #include "base/memory/scoped_vector.h" @@ -11,8 +11,8 @@ #include "ui/aura/client/window_drag_drop_delegate.h" #include "ui/aura/window_delegate.h" #include "ui/base/events.h" +#include "ui/views/widget/native_widget_private.h" #include "views/views_export.h" -#include "views/widget/native_widget_private.h" namespace aura { class Window; @@ -183,4 +183,4 @@ class VIEWS_EXPORT NativeWidgetAura : public internal::NativeWidgetPrivate, } // namespace views -#endif // VIEWS_WIDGET_NATIVE_WIDGET_AURA_H_ +#endif // UI_VIEWS_WIDGET_NATIVE_WIDGET_AURA_H_ diff --git a/views/widget/native_widget_delegate.h b/ui/views/widget/native_widget_delegate.h index 3732e97..3c33581 100644 --- a/views/widget/native_widget_delegate.h +++ b/ui/views/widget/native_widget_delegate.h @@ -2,12 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef VIEWS_WIDGET_NATIVE_WIDGET_DELEGATE_H_ -#define VIEWS_WIDGET_NATIVE_WIDGET_DELEGATE_H_ +#ifndef UI_VIEWS_WIDGET_NATIVE_WIDGET_DELEGATE_H_ +#define UI_VIEWS_WIDGET_NATIVE_WIDGET_DELEGATE_H_ #pragma once -#include "views/views_export.h" #include "ui/base/events.h" +#include "views/views_export.h" namespace gfx { class Canvas; @@ -113,4 +113,4 @@ class VIEWS_EXPORT NativeWidgetDelegate { } // namespace internal } // namespace views -#endif // VIEWS_WIDGET_NATIVE_WIDGET_DELEGATE_H_ +#endif // UI_VIEWS_WIDGET_NATIVE_WIDGET_DELEGATE_H_ diff --git a/views/widget/native_widget_gtk.cc b/ui/views/widget/native_widget_gtk.cc index c7ef5e2..a8ed357 100644 --- a/views/widget/native_widget_gtk.cc +++ b/ui/views/widget/native_widget_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/widget/native_widget_gtk.h" +#include "ui/views/widget/native_widget_gtk.h" #include <X11/Xatom.h> #include <X11/Xlib.h> @@ -37,17 +37,17 @@ #include "ui/views/ime/input_method_gtk.h" #include "views/controls/textfield/native_textfield_views.h" #include "views/views_delegate.h" -#include "views/widget/drop_target_gtk.h" -#include "views/widget/gtk_views_fixed.h" -#include "views/widget/gtk_views_window.h" -#include "views/widget/root_view.h" -#include "views/widget/widget_delegate.h" +#include "ui/views/widget/drop_target_gtk.h" +#include "ui/views/widget/gtk_views_fixed.h" +#include "ui/views/widget/gtk_views_window.h" +#include "ui/views/widget/root_view.h" +#include "ui/views/widget/widget_delegate.h" #if defined(TOUCH_UI) #include "ui/base/touch/touch_factory.h" -#include "views/widget/tooltip_manager_views.h" +#include "ui/views/widget/tooltip_manager_views.h" #else -#include "views/widget/tooltip_manager_gtk.h" +#include "ui/views/widget/tooltip_manager_gtk.h" #endif #if defined(HAVE_IBUS) diff --git a/views/widget/native_widget_gtk.h b/ui/views/widget/native_widget_gtk.h index 1dcdace..4427aa8 100644 --- a/views/widget/native_widget_gtk.h +++ b/ui/views/widget/native_widget_gtk.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef VIEWS_WIDGET_NATIVE_WIDGET_GTK_H_ -#define VIEWS_WIDGET_NATIVE_WIDGET_GTK_H_ +#ifndef UI_VIEWS_WIDGET_NATIVE_WIDGET_GTK_H_ +#define UI_VIEWS_WIDGET_NATIVE_WIDGET_GTK_H_ #pragma once #include <gtk/gtk.h> @@ -16,8 +16,8 @@ #include "ui/gfx/compositor/compositor.h" #include "ui/gfx/size.h" #include "ui/views/focus/focus_manager.h" -#include "views/widget/native_widget_private.h" -#include "views/widget/widget.h" +#include "ui/views/widget/native_widget_private.h" +#include "ui/views/widget/widget.h" namespace gfx { class Rect; @@ -472,4 +472,4 @@ class VIEWS_EXPORT NativeWidgetGtk : public internal::NativeWidgetPrivate, } // namespace views -#endif // VIEWS_WIDGET_NATIVE_WIDGET_GTK_H_ +#endif // UI_VIEWS_WIDGET_NATIVE_WIDGET_GTK_H_ diff --git a/views/widget/native_widget_private.h b/ui/views/widget/native_widget_private.h index df5bad3..229a530 100644 --- a/views/widget/native_widget_private.h +++ b/ui/views/widget/native_widget_private.h @@ -2,14 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef VIEWS_WIDGET_NATIVE_WIDGET_PRIVATE_H_ -#define VIEWS_WIDGET_NATIVE_WIDGET_PRIVATE_H_ +#ifndef UI_VIEWS_WIDGET_NATIVE_WIDGET_PRIVATE_H_ +#define UI_VIEWS_WIDGET_NATIVE_WIDGET_PRIVATE_H_ #pragma once #include "base/string16.h" #include "ui/gfx/native_widget_types.h" #include "ui/views/ime/input_method_delegate.h" -#include "views/widget/native_widget.h" +#include "ui/views/widget/native_widget.h" namespace gfx { class Rect; @@ -213,4 +213,4 @@ class VIEWS_EXPORT NativeWidgetPrivate : public NativeWidget, } // namespace internal } // namespace views -#endif // VIEWS_WIDGET_NATIVE_WIDGET_PRIVATE_H_ +#endif // UI_VIEWS_WIDGET_NATIVE_WIDGET_PRIVATE_H_ diff --git a/views/widget/native_widget_test_utils.h b/ui/views/widget/native_widget_test_utils.h index 9fe73f6..91a2d77 100644 --- a/views/widget/native_widget_test_utils.h +++ b/ui/views/widget/native_widget_test_utils.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef VIEWS_WIDGET_NATIVE_WIDGET_TEST_UTILS_H_ -#define VIEWS_WIDGET_NATIVE_WIDGET_TEST_UTILS_H_ +#ifndef UI_VIEWS_WIDGET_NATIVE_WIDGET_TEST_UTILS_H_ +#define UI_VIEWS_WIDGET_NATIVE_WIDGET_TEST_UTILS_H_ #pragma once namespace views { @@ -19,4 +19,4 @@ NativeWidgetPrivate* CreateNativeSubWidget(); } // namespace internal } // namespace views -#endif // VIEWS_WIDGET_NATIVE_WIDGET_TEST_UTILS_H_ +#endif // UI_VIEWS_WIDGET_NATIVE_WIDGET_TEST_UTILS_H_ diff --git a/views/widget/native_widget_test_utils_aura.cc b/ui/views/widget/native_widget_test_utils_aura.cc index 7e8926a..4b0ecec 100644 --- a/views/widget/native_widget_test_utils_aura.cc +++ b/ui/views/widget/native_widget_test_utils_aura.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/widget/native_widget_test_utils.h" +#include "ui/views/widget/native_widget_test_utils.h" +#include "ui/views/widget/native_widget_private.h" +#include "ui/views/widget/widget.h" #include "views/view.h" -#include "views/widget/native_widget_private.h" -#include "views/widget/widget.h" namespace views { namespace internal { diff --git a/views/widget/native_widget_test_utils_gtk.cc b/ui/views/widget/native_widget_test_utils_gtk.cc index 3217f99..60c2050 100644 --- a/views/widget/native_widget_test_utils_gtk.cc +++ b/ui/views/widget/native_widget_test_utils_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/widget/native_widget_test_utils.h" +#include "ui/views/widget/native_widget_test_utils.h" +#include "ui/views/widget/native_widget_private.h" +#include "ui/views/widget/widget.h" #include "views/view.h" -#include "views/widget/native_widget_private.h" -#include "views/widget/widget.h" namespace views { namespace internal { diff --git a/views/widget/native_widget_test_utils_win.cc b/ui/views/widget/native_widget_test_utils_win.cc index 7e8926a..4b0ecec 100644 --- a/views/widget/native_widget_test_utils_win.cc +++ b/ui/views/widget/native_widget_test_utils_win.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/widget/native_widget_test_utils.h" +#include "ui/views/widget/native_widget_test_utils.h" +#include "ui/views/widget/native_widget_private.h" +#include "ui/views/widget/widget.h" #include "views/view.h" -#include "views/widget/native_widget_private.h" -#include "views/widget/widget.h" namespace views { namespace internal { diff --git a/views/widget/native_widget_unittest.cc b/ui/views/widget/native_widget_unittest.cc index 7fc3818..5af3a3f 100644 --- a/views/widget/native_widget_unittest.cc +++ b/ui/views/widget/native_widget_unittest.cc @@ -4,11 +4,11 @@ #include "testing/gtest/include/gtest/gtest.h" #include "ui/views/test/views_test_base.h" +#include "ui/views/widget/native_widget_private.h" +#include "ui/views/widget/native_widget_test_utils.h" +#include "ui/views/widget/widget.h" #include "views/controls/native/native_view_host.h" #include "views/view.h" -#include "views/widget/native_widget_private.h" -#include "views/widget/native_widget_test_utils.h" -#include "views/widget/widget.h" namespace views { diff --git a/views/widget/native_widget_win.cc b/ui/views/widget/native_widget_win.cc index 7c013f9..73dc917 100644 --- a/views/widget/native_widget_win.cc +++ b/ui/views/widget/native_widget_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/widget/native_widget_win.h" +#include "ui/views/widget/native_widget_win.h" #include <dwmapi.h> #include <shellapi.h> @@ -36,17 +36,17 @@ #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/widget/aero_tooltip_manager.h" +#include "ui/views/widget/child_window_message_processor.h" +#include "ui/views/widget/drop_target_win.h" +#include "ui/views/widget/monitor_win.h" +#include "ui/views/widget/native_widget_delegate.h" +#include "ui/views/widget/root_view.h" +#include "ui/views/widget/widget_delegate.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/views_delegate.h" -#include "views/widget/aero_tooltip_manager.h" -#include "views/widget/child_window_message_processor.h" -#include "views/widget/drop_target_win.h" -#include "views/widget/monitor_win.h" -#include "views/widget/native_widget_delegate.h" -#include "views/widget/root_view.h" -#include "views/widget/widget_delegate.h" #pragma comment(lib, "dwmapi.lib") diff --git a/views/widget/native_widget_win.h b/ui/views/widget/native_widget_win.h index e145556..df9a3fc 100644 --- a/views/widget/native_widget_win.h +++ b/ui/views/widget/native_widget_win.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef VIEWS_WIDGET_NATIVE_WIDGET_WIN_H_ -#define VIEWS_WIDGET_NATIVE_WIDGET_WIN_H_ +#ifndef UI_VIEWS_WIDGET_NATIVE_WIDGET_WIN_H_ +#define UI_VIEWS_WIDGET_NATIVE_WIDGET_WIN_H_ #pragma once #include <atlbase.h> @@ -25,7 +25,7 @@ #include "ui/gfx/compositor/compositor.h" #include "ui/views/focus/focus_manager.h" #include "ui/views/layout/layout_manager.h" -#include "views/widget/native_widget_private.h" +#include "ui/views/widget/native_widget_private.h" namespace ui { class Compositor; @@ -661,4 +661,4 @@ class VIEWS_EXPORT NativeWidgetWin : public ui::WindowImpl, } // namespace views -#endif // VIEWS_WIDGET_NATIVE_WIDGET_WIN_H_ +#endif // UI_VIEWS_WIDGET_NATIVE_WIDGET_WIN_H_ diff --git a/views/widget/native_widget_win_unittest.cc b/ui/views/widget/native_widget_win_unittest.cc index f2465f4..9ad5ecb 100644 --- a/views/widget/native_widget_win_unittest.cc +++ b/ui/views/widget/native_widget_win_unittest.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/widget/native_widget_win.h" +#include "ui/views/widget/native_widget_win.h" #include "base/basictypes.h" #include "base/memory/scoped_ptr.h" diff --git a/views/widget/root_view.cc b/ui/views/widget/root_view.cc index 2682bfc..4334e4d 100644 --- a/views/widget/root_view.cc +++ b/ui/views/widget/root_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/widget/root_view.h" +#include "ui/views/widget/root_view.h" #include <algorithm> @@ -16,7 +16,7 @@ #include "ui/views/focus/view_storage.h" #include "ui/views/layout/fill_layout.h" #include "ui/views/touchui/gesture_manager.h" -#include "views/widget/widget.h" +#include "ui/views/widget/widget.h" namespace views { namespace internal { diff --git a/views/widget/root_view.h b/ui/views/widget/root_view.h index 1a17d38..d5df829 100644 --- a/views/widget/root_view.h +++ b/ui/views/widget/root_view.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef VIEWS_WIDGET_ROOT_VIEW_H_ -#define VIEWS_WIDGET_ROOT_VIEW_H_ +#ifndef UI_VIEWS_WIDGET_ROOT_VIEW_H_ +#define UI_VIEWS_WIDGET_ROOT_VIEW_H_ #pragma once #include <string> @@ -204,4 +204,4 @@ class VIEWS_EXPORT RootView : public View, public FocusTraversable { } // namespace internal } // namespace views -#endif // VIEWS_WIDGET_ROOT_VIEW_H_ +#endif // UI_VIEWS_WIDGET_ROOT_VIEW_H_ diff --git a/views/widget/tooltip_manager.cc b/ui/views/widget/tooltip_manager.cc index 1d8b285..7f4d193 100644 --- a/views/widget/tooltip_manager.cc +++ b/ui/views/widget/tooltip_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/widget/tooltip_manager.h" +#include "ui/views/widget/tooltip_manager.h" #include <vector> diff --git a/views/widget/tooltip_manager.h b/ui/views/widget/tooltip_manager.h index 6b4c8d9..f7d1a8b 100644 --- a/views/widget/tooltip_manager.h +++ b/ui/views/widget/tooltip_manager.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef VIEWS_WIDGET_TOOLTIP_MANAGER_H_ -#define VIEWS_WIDGET_TOOLTIP_MANAGER_H_ +#ifndef UI_VIEWS_WIDGET_TOOLTIP_MANAGER_H_ +#define UI_VIEWS_WIDGET_TOOLTIP_MANAGER_H_ #pragma once #include <string> @@ -65,4 +65,4 @@ class VIEWS_EXPORT TooltipManager { } // namespace views -#endif // VIEWS_WIDGET_TOOLTIP_MANAGER_H_ +#endif // UI_VIEWS_WIDGET_TOOLTIP_MANAGER_H_ diff --git a/views/widget/tooltip_manager_gtk.cc b/ui/views/widget/tooltip_manager_gtk.cc index 82828fc..b33e5ad 100644 --- a/views/widget/tooltip_manager_gtk.cc +++ b/ui/views/widget/tooltip_manager_gtk.cc @@ -2,15 +2,15 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "views/widget/tooltip_manager_gtk.h" +#include "ui/views/widget/tooltip_manager_gtk.h" #include "base/logging.h" #include "base/utf_string_conversions.h" #include "ui/gfx/font.h" #include "ui/gfx/screen.h" #include "ui/views/focus/focus_manager.h" +#include "ui/views/widget/native_widget_gtk.h" #include "views/view.h" -#include "views/widget/native_widget_gtk.h" // WARNING: this implementation is good for a start, but it doesn't give us // control of tooltip positioning both on mouse events and when showing from diff --git a/views/widget/tooltip_manager_gtk.h b/ui/views/widget/tooltip_manager_gtk.h index 8273425..7f1aee7 100644 --- a/views/widget/tooltip_manager_gtk.h +++ b/ui/views/widget/tooltip_manager_gtk.h @@ -2,14 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef VIEWS_WIDGET_TOOLTIP_MANAGER_GTK_H_ -#define VIEWS_WIDGET_TOOLTIP_MANAGER_GTK_H_ +#ifndef UI_VIEWS_WIDGET_TOOLTIP_MANAGER_GTK_H_ +#define UI_VIEWS_WIDGET_TOOLTIP_MANAGER_GTK_H_ #pragma once #include <gtk/gtk.h> #include "ui/base/gtk/tooltip_window_gtk.h" -#include "views/widget/tooltip_manager.h" +#include "ui/views/widget/tooltip_manager.h" namespace views { @@ -50,4 +50,4 @@ class TooltipManagerGtk : public TooltipManager { } // namespace views -#endif // VIEWS_WIDGET_TOOLTIP_MANAGER_GTK_H_ +#endif // UI_VIEWS_WIDGET_TOOLTIP_MANAGER_GTK_H_ diff --git a/views/widget/tooltip_manager_views.cc b/ui/views/widget/tooltip_manager_views.cc index 904099a..fa3cb63 100644 --- a/views/widget/tooltip_manager_views.cc +++ b/ui/views/widget/tooltip_manager_views.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/widget/tooltip_manager_views.h" +#include "ui/views/widget/tooltip_manager_views.h" #if defined(USE_X11) #include <X11/Xlib.h> @@ -28,10 +28,10 @@ #include "ui/gfx/screen.h" #include "ui/views/events/event.h" #include "ui/views/focus/focus_manager.h" +#include "ui/views/widget/native_widget.h" #include "views/background.h" #include "views/border.h" #include "views/view.h" -#include "views/widget/native_widget.h" namespace { SkColor kTooltipBackground = 0xFF7F7F00; diff --git a/views/widget/tooltip_manager_views.h b/ui/views/widget/tooltip_manager_views.h index 4cf2657..29d7048 100644 --- a/views/widget/tooltip_manager_views.h +++ b/ui/views/widget/tooltip_manager_views.h @@ -2,16 +2,16 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef VIEWS_WIDGET_TOOLTIP_MANAGER_VIEWS_H_ -#define VIEWS_WIDGET_TOOLTIP_MANAGER_VIEWS_H_ +#ifndef UI_VIEWS_WIDGET_TOOLTIP_MANAGER_VIEWS_H_ +#define UI_VIEWS_WIDGET_TOOLTIP_MANAGER_VIEWS_H_ #pragma once #include "base/message_loop.h" #include "base/timer.h" +#include "ui/views/widget/native_widget.h" +#include "ui/views/widget/tooltip_manager.h" +#include "ui/views/widget/widget_delegate.h" #include "views/controls/label.h" -#include "views/widget/native_widget.h" -#include "views/widget/tooltip_manager.h" -#include "views/widget/widget_delegate.h" #include "views/view.h" #if defined(USE_X11) @@ -77,4 +77,4 @@ class TooltipManagerViews : public TooltipManager { } // namespace views -#endif // VIEWS_WIDGET_TOOLTIP_MANAGER_VIEWS_H_ +#endif // UI_VIEWS_WIDGET_TOOLTIP_MANAGER_VIEWS_H_ diff --git a/views/widget/tooltip_manager_win.cc b/ui/views/widget/tooltip_manager_win.cc index 521fcc0..fedb700 100644 --- a/views/widget/tooltip_manager_win.cc +++ b/ui/views/widget/tooltip_manager_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/widget/tooltip_manager_win.h" +#include "ui/views/widget/tooltip_manager_win.h" #include <windowsx.h> @@ -17,9 +17,9 @@ #include "ui/base/win/hwnd_util.h" #include "ui/gfx/font.h" #include "ui/gfx/screen.h" +#include "ui/views/widget/monitor_win.h" +#include "ui/views/widget/widget.h" #include "views/view.h" -#include "views/widget/monitor_win.h" -#include "views/widget/widget.h" namespace views { diff --git a/views/widget/tooltip_manager_win.h b/ui/views/widget/tooltip_manager_win.h index f4afaa2..9bbd68b 100644 --- a/views/widget/tooltip_manager_win.h +++ b/ui/views/widget/tooltip_manager_win.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef VIEWS_WIDGET_TOOLTIP_MANAGER_WIN_H_ -#define VIEWS_WIDGET_TOOLTIP_MANAGER_WIN_H_ +#ifndef UI_VIEWS_WIDGET_TOOLTIP_MANAGER_WIN_H_ +#define UI_VIEWS_WIDGET_TOOLTIP_MANAGER_WIN_H_ #pragma once #include <windows.h> @@ -15,7 +15,7 @@ #include "base/string16.h" #include "ui/gfx/native_widget_types.h" #include "ui/gfx/point.h" -#include "views/widget/tooltip_manager.h" +#include "ui/views/widget/tooltip_manager.h" namespace gfx { class Point; @@ -150,4 +150,4 @@ class TooltipManagerWin : public TooltipManager { } // namespace views -#endif // VIEWS_WIDGET_TOOLTIP_MANAGER_WIN_H_ +#endif // UI_VIEWS_WIDGET_TOOLTIP_MANAGER_WIN_H_ diff --git a/views/widget/widget.cc b/ui/views/widget/widget.cc index 9394028..857dac5 100644 --- a/views/widget/widget.cc +++ b/ui/views/widget/widget.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/widget/widget.h" +#include "ui/views/widget/widget.h" #include "base/logging.h" #include "base/message_loop.h" @@ -18,14 +18,14 @@ #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/widget/default_theme_provider.h" +#include "ui/views/widget/native_widget_private.h" +#include "ui/views/widget/root_view.h" +#include "ui/views/widget/tooltip_manager.h" +#include "ui/views/widget/widget_delegate.h" #include "ui/views/window/custom_frame_view.h" #include "views/controls/menu/menu_controller.h" #include "views/views_delegate.h" -#include "views/widget/default_theme_provider.h" -#include "views/widget/native_widget_private.h" -#include "views/widget/root_view.h" -#include "views/widget/tooltip_manager.h" -#include "views/widget/widget_delegate.h" namespace { diff --git a/views/widget/widget.h b/ui/views/widget/widget.h index 4faf12b..4beda65 100644 --- a/views/widget/widget.h +++ b/ui/views/widget/widget.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef VIEWS_WIDGET_WIDGET_H_ -#define VIEWS_WIDGET_WIDGET_H_ +#ifndef UI_VIEWS_WIDGET_WIDGET_H_ +#define UI_VIEWS_WIDGET_WIDGET_H_ #pragma once #include <set> @@ -17,9 +17,9 @@ #include "ui/gfx/native_widget_types.h" #include "ui/gfx/rect.h" #include "ui/views/focus/focus_manager.h" +#include "ui/views/widget/native_widget_delegate.h" #include "ui/views/window/client_view.h" #include "ui/views/window/non_client_view.h" -#include "views/widget/native_widget_delegate.h" #if defined(OS_WIN) // Windows headers define macros for these function names which screw with us. @@ -743,4 +743,4 @@ class VIEWS_EXPORT Widget : public internal::NativeWidgetDelegate, } // namespace views -#endif // VIEWS_WIDGET_WIDGET_H_ +#endif // UI_VIEWS_WIDGET_WIDGET_H_ diff --git a/views/widget/widget_delegate.cc b/ui/views/widget/widget_delegate.cc index c64f8e6..94ebcf1 100644 --- a/views/widget/widget_delegate.cc +++ b/ui/views/widget/widget_delegate.cc @@ -2,15 +2,15 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "views/widget/widget_delegate.h" +#include "ui/views/widget/widget_delegate.h" #include "base/utf_string_conversions.h" #include "third_party/skia/include/core/SkBitmap.h" #include "ui/views/bubble/bubble_delegate.h" +#include "ui/views/widget/widget.h" #include "ui/views/window/client_view.h" #include "views/view.h" #include "views/views_delegate.h" -#include "views/widget/widget.h" namespace views { diff --git a/views/widget/widget_delegate.h b/ui/views/widget/widget_delegate.h index 854c70b..b771d33 100644 --- a/views/widget/widget_delegate.h +++ b/ui/views/widget/widget_delegate.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef VIEWS_WIDGET_WIDGET_DELEGATE_H_ -#define VIEWS_WIDGET_WIDGET_DELEGATE_H_ +#ifndef UI_VIEWS_WIDGET_WIDGET_DELEGATE_H_ +#define UI_VIEWS_WIDGET_WIDGET_DELEGATE_H_ #pragma once #include <string> @@ -178,4 +178,4 @@ class VIEWS_EXPORT WidgetDelegateView : public WidgetDelegate, public View { } // namespace views -#endif // VIEWS_WIDGET_WIDGET_DELEGATE_H_ +#endif // UI_VIEWS_WIDGET_WIDGET_DELEGATE_H_ diff --git a/views/widget/widget_unittest.cc b/ui/views/widget/widget_unittest.cc index 580bed8..90632c6 100644 --- a/views/widget/widget_unittest.cc +++ b/ui/views/widget/widget_unittest.cc @@ -6,20 +6,20 @@ #include "base/memory/scoped_ptr.h" #include "base/message_loop.h" #include "testing/gtest/include/gtest/gtest.h" +#include "ui/gfx/native_widget_types.h" +#include "ui/gfx/point.h" #include "ui/views/test/test_views_delegate.h" #include "ui/views/test/views_test_base.h" -#include "ui/gfx/point.h" -#include "ui/gfx/native_widget_types.h" +#include "ui/views/widget/native_widget_delegate.h" #include "views/views_delegate.h" -#include "views/widget/native_widget_delegate.h" #if defined(USE_AURA) #include "ui/aura/window.h" -#include "views/widget/native_widget_aura.h" +#include "ui/views/widget/native_widget_aura.h" #elif defined(OS_WIN) -#include "views/widget/native_widget_win.h" +#include "ui/views/widget/native_widget_win.h" #elif defined(TOOLKIT_USES_GTK) -#include "views/widget/native_widget_gtk.h" +#include "ui/views/widget/native_widget_gtk.h" #endif namespace views { diff --git a/views/widget/window_manager.cc b/ui/views/widget/window_manager.cc index 7e5e7ca..ead923c 100644 --- a/views/widget/window_manager.cc +++ b/ui/views/widget/window_manager.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/widget/window_manager.h" +#include "ui/views/widget/window_manager.h" #include "base/compiler_specific.h" #include "ui/views/events/event.h" -#include "views/widget/widget.h" +#include "ui/views/widget/widget.h" namespace { diff --git a/views/widget/window_manager.h b/ui/views/widget/window_manager.h index f634bf0..accef0a 100644 --- a/views/widget/window_manager.h +++ b/ui/views/widget/window_manager.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef VIEWS_WIDGET_WINDOW_MANAGER_H_ -#define VIEWS_WIDGET_WINDOW_MANAGER_H_ +#ifndef UI_VIEWS_WIDGET_WINDOW_MANAGER_H_ +#define UI_VIEWS_WIDGET_WINDOW_MANAGER_H_ #pragma once #include "base/basictypes.h" @@ -76,4 +76,4 @@ class VIEWS_EXPORT WindowManager { } // namespace views -#endif // VIEWS_WIDGET_WINDOW_MANAGER_H_ +#endif // UI_VIEWS_WIDGET_WINDOW_MANAGER_H_ diff --git a/ui/views/window/client_view.cc b/ui/views/window/client_view.cc index 0beaa89..60992ec 100644 --- a/ui/views/window/client_view.cc +++ b/ui/views/window/client_view.cc @@ -7,8 +7,8 @@ #include "base/logging.h" #include "ui/base/accessibility/accessible_view_state.h" #include "ui/base/hit_test.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 views { diff --git a/ui/views/window/custom_frame_view.cc b/ui/views/window/custom_frame_view.cc index 6f9cf62..9019919 100644 --- a/ui/views/window/custom_frame_view.cc +++ b/ui/views/window/custom_frame_view.cc @@ -15,15 +15,15 @@ #include "ui/gfx/canvas.h" #include "ui/gfx/font.h" #include "ui/gfx/path.h" +#include "ui/views/widget/widget_delegate.h" #include "ui/views/window/client_view.h" #include "ui/views/window/window_resources.h" #include "ui/views/window/window_shape.h" -#include "views/widget/widget_delegate.h" #if defined(USE_AURA) -#include "views/widget/native_widget_aura.h" +#include "ui/views/widget/native_widget_aura.h" #elif defined(OS_WIN) -#include "views/widget/native_widget_win.h" +#include "ui/views/widget/native_widget_win.h" #endif namespace views { diff --git a/ui/views/window/custom_frame_view.h b/ui/views/window/custom_frame_view.h index d53eb21..2d2d3d4 100644 --- a/ui/views/window/custom_frame_view.h +++ b/ui/views/window/custom_frame_view.h @@ -6,9 +6,9 @@ #define UI_VIEWS_WINDOW_CUSTOM_FRAME_VIEW_H_ #pragma once +#include "ui/views/widget/widget.h" #include "ui/views/window/non_client_view.h" #include "views/controls/button/image_button.h" -#include "views/widget/widget.h" namespace gfx { class Canvas; diff --git a/ui/views/window/dialog_client_view.cc b/ui/views/window/dialog_client_view.cc index 610ae8d..edd3da3 100644 --- a/ui/views/window/dialog_client_view.cc +++ b/ui/views/window/dialog_client_view.cc @@ -25,10 +25,10 @@ #include "ui/gfx/canvas_skia.h" #include "ui/gfx/font.h" #include "ui/views/layout/layout_constants.h" +#include "ui/views/widget/root_view.h" +#include "ui/views/widget/widget.h" #include "ui/views/window/dialog_delegate.h" #include "views/controls/button/text_button.h" -#include "views/widget/root_view.h" -#include "views/widget/widget.h" #if defined(OS_WIN) #include "ui/gfx/native_theme.h" diff --git a/ui/views/window/dialog_delegate.cc b/ui/views/window/dialog_delegate.cc index 8da29bb..3b97b8a 100644 --- a/ui/views/window/dialog_delegate.cc +++ b/ui/views/window/dialog_delegate.cc @@ -5,8 +5,8 @@ #include "ui/views/window/dialog_delegate.h" #include "base/logging.h" +#include "ui/views/widget/widget.h" #include "views/controls/button/text_button.h" -#include "views/widget/widget.h" namespace views { diff --git a/ui/views/window/dialog_delegate.h b/ui/views/window/dialog_delegate.h index 530bbd9..88fdc31 100644 --- a/ui/views/window/dialog_delegate.h +++ b/ui/views/window/dialog_delegate.h @@ -9,8 +9,8 @@ #include "base/string16.h" #include "ui/base/accessibility/accessibility_types.h" #include "ui/base/ui_base_types.h" +#include "ui/views/widget/widget_delegate.h" #include "ui/views/window/dialog_client_view.h" -#include "views/widget/widget_delegate.h" namespace views { diff --git a/ui/views/window/native_frame_view.cc b/ui/views/window/native_frame_view.cc index 1a794ee..1605e3d 100644 --- a/ui/views/window/native_frame_view.cc +++ b/ui/views/window/native_frame_view.cc @@ -4,11 +4,11 @@ #include "ui/views/window/native_frame_view.h" -#include "views/widget/native_widget.h" -#include "views/widget/widget.h" +#include "ui/views/widget/native_widget.h" +#include "ui/views/widget/widget.h" #if defined(OS_WIN) && !defined(USE_AURA) -#include "views/widget/native_widget_win.h" +#include "ui/views/widget/native_widget_win.h" #endif namespace views { diff --git a/ui/views/window/non_client_view.cc b/ui/views/window/non_client_view.cc index 9e2be91..702042a 100644 --- a/ui/views/window/non_client_view.cc +++ b/ui/views/window/non_client_view.cc @@ -6,9 +6,9 @@ #include "ui/base/accessibility/accessible_view_state.h" #include "ui/base/hit_test.h" +#include "ui/views/widget/root_view.h" +#include "ui/views/widget/widget.h" #include "ui/views/window/client_view.h" -#include "views/widget/root_view.h" -#include "views/widget/widget.h" namespace views { diff --git a/views/accessible_pane_view.cc b/views/accessible_pane_view.cc index 425523a..1b1387f 100644 --- a/views/accessible_pane_view.cc +++ b/views/accessible_pane_view.cc @@ -7,7 +7,7 @@ #include "ui/base/accessibility/accessible_view_state.h" #include "ui/views/focus/focus_search.h" #include "ui/views/focus/view_storage.h" -#include "views/widget/widget.h" +#include "ui/views/widget/widget.h" namespace views { diff --git a/views/accessible_pane_view_unittest.cc b/views/accessible_pane_view_unittest.cc index bc88aa4..96b8b09 100644 --- a/views/accessible_pane_view_unittest.cc +++ b/views/accessible_pane_view_unittest.cc @@ -7,8 +7,8 @@ #include "ui/base/models/accelerator.h" #include "ui/views/layout/fill_layout.h" #include "ui/views/test/views_test_base.h" +#include "ui/views/widget/widget.h" #include "views/controls/button/text_button.h" -#include "views/widget/widget.h" namespace views { diff --git a/views/controls/button/button_dropdown.cc b/views/controls/button/button_dropdown.cc index f5477a5..7df2164 100644 --- a/views/controls/button/button_dropdown.cc +++ b/views/controls/button/button_dropdown.cc @@ -12,10 +12,10 @@ #include "ui/base/accessibility/accessible_view_state.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/models/menu_model.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/widget/widget.h" namespace views { diff --git a/views/controls/button/custom_button.cc b/views/controls/button/custom_button.cc index fc0c6b4..a4233b9 100644 --- a/views/controls/button/custom_button.cc +++ b/views/controls/button/custom_button.cc @@ -8,7 +8,7 @@ #include "ui/base/animation/throb_animation.h" #include "ui/base/keycodes/keyboard_codes.h" #include "ui/gfx/screen.h" -#include "views/widget/widget.h" +#include "ui/views/widget/widget.h" namespace views { diff --git a/views/controls/button/menu_button.cc b/views/controls/button/menu_button.cc index fc6afaa..0248aaf 100644 --- a/views/controls/button/menu_button.cc +++ b/views/controls/button/menu_button.cc @@ -14,10 +14,10 @@ #include "ui/gfx/canvas.h" #include "ui/gfx/screen.h" #include "ui/views/events/event.h" +#include "ui/views/widget/root_view.h" +#include "ui/views/widget/widget.h" #include "views/controls/button/button.h" #include "views/controls/menu/view_menu_delegate.h" -#include "views/widget/root_view.h" -#include "views/widget/widget.h" using base::Time; using base::TimeDelta; diff --git a/views/controls/button/radio_button.cc b/views/controls/button/radio_button.cc index 170d010..8cd1c4a 100644 --- a/views/controls/button/radio_button.cc +++ b/views/controls/button/radio_button.cc @@ -6,7 +6,7 @@ #include "base/logging.h" #include "ui/base/accessibility/accessible_view_state.h" -#include "views/widget/widget.h" +#include "ui/views/widget/widget.h" namespace views { diff --git a/views/controls/button/text_button.cc b/views/controls/button/text_button.cc index 12f28f5..3456f84 100644 --- a/views/controls/button/text_button.cc +++ b/views/controls/button/text_button.cc @@ -12,8 +12,8 @@ #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/button.h" -#include "views/widget/widget.h" #if defined(OS_WIN) #include "skia/ext/skia_utils_win.h" diff --git a/views/controls/combobox/combobox.cc b/views/controls/combobox/combobox.cc index c8bd106..cb7310d 100644 --- a/views/controls/combobox/combobox.cc +++ b/views/controls/combobox/combobox.cc @@ -9,8 +9,8 @@ #include "ui/base/accessibility/accessible_view_state.h" #include "ui/base/keycodes/keyboard_codes.h" #include "ui/base/models/combobox_model.h" +#include "ui/views/widget/widget.h" #include "views/controls/native/native_view_host.h" -#include "views/widget/widget.h" namespace views { diff --git a/views/controls/combobox/native_combobox_gtk.cc b/views/controls/combobox/native_combobox_gtk.cc index a3f6106..810ff42 100644 --- a/views/controls/combobox/native_combobox_gtk.cc +++ b/views/controls/combobox/native_combobox_gtk.cc @@ -11,10 +11,10 @@ #include "base/message_loop.h" #include "base/utf_string_conversions.h" #include "ui/base/models/combobox_model.h" +#include "ui/views/widget/widget.h" #include "views/controls/combobox/combobox.h" #include "views/controls/combobox/native_combobox_views.h" #include "views/views_delegate.h" -#include "views/widget/widget.h" namespace views { diff --git a/views/controls/combobox/native_combobox_views.cc b/views/controls/combobox/native_combobox_views.cc index 864b993..f48f9bd 100644 --- a/views/controls/combobox/native_combobox_views.cc +++ b/views/controls/combobox/native_combobox_views.cc @@ -15,14 +15,14 @@ #include "ui/gfx/canvas_skia.h" #include "ui/gfx/font.h" #include "ui/gfx/path.h" +#include "ui/views/widget/root_view.h" +#include "ui/views/widget/widget.h" #include "views/background.h" #include "views/border.h" #include "views/controls/combobox/combobox.h" #include "views/controls/focusable_border.h" #include "views/controls/menu/menu_runner.h" #include "views/controls/menu/submenu_view.h" -#include "views/widget/root_view.h" -#include "views/widget/widget.h" #if defined(OS_LINUX) #include "ui/gfx/gtk_util.h" diff --git a/views/controls/combobox/native_combobox_views_unittest.cc b/views/controls/combobox/native_combobox_views_unittest.cc index 76d0c3c..30b03e1 100644 --- a/views/controls/combobox/native_combobox_views_unittest.cc +++ b/views/controls/combobox/native_combobox_views_unittest.cc @@ -7,10 +7,10 @@ #include "ui/base/models/combobox_model.h" #include "ui/views/ime/mock_input_method.h" #include "ui/views/test/views_test_base.h" +#include "ui/views/widget/native_widget_private.h" +#include "ui/views/widget/widget.h" #include "views/controls/combobox/combobox.h" #include "views/controls/combobox/native_combobox_views.h" -#include "views/widget/native_widget_private.h" -#include "views/widget/widget.h" namespace { diff --git a/views/controls/combobox/native_combobox_win.cc b/views/controls/combobox/native_combobox_win.cc index 23c3b85..151cab4 100644 --- a/views/controls/combobox/native_combobox_win.cc +++ b/views/controls/combobox/native_combobox_win.cc @@ -11,9 +11,9 @@ #include "ui/base/win/hwnd_util.h" #include "ui/gfx/font.h" #include "ui/gfx/native_theme_win.h" +#include "ui/views/widget/widget.h" #include "views/controls/combobox/combobox.h" #include "views/controls/combobox/native_combobox_views.h" -#include "views/widget/widget.h" namespace views { diff --git a/views/controls/menu/menu_controller.cc b/views/controls/menu/menu_controller.cc index 37b98b1..90dd6b2 100644 --- a/views/controls/menu/menu_controller.cc +++ b/views/controls/menu/menu_controller.cc @@ -14,6 +14,8 @@ #include "ui/base/l10n/l10n_util.h" #include "ui/gfx/canvas_skia.h" #include "ui/gfx/screen.h" +#include "ui/views/widget/root_view.h" +#include "ui/views/widget/widget.h" #include "views/controls/button/menu_button.h" #include "views/controls/menu/menu_controller_delegate.h" #include "views/controls/menu/menu_scroll_view_container.h" @@ -21,8 +23,6 @@ #include "views/drag_utils.h" #include "views/view_constants.h" #include "views/views_delegate.h" -#include "views/widget/root_view.h" -#include "views/widget/widget.h" #if defined(USE_AURA) #include "ui/aura/desktop.h" diff --git a/views/controls/menu/menu_host.cc b/views/controls/menu/menu_host.cc index 593fb10..075fa82 100644 --- a/views/controls/menu/menu_host.cc +++ b/views/controls/menu/menu_host.cc @@ -4,13 +4,13 @@ #include "views/controls/menu/menu_host.h" +#include "ui/views/widget/native_widget_private.h" +#include "ui/views/widget/widget.h" #include "views/controls/menu/menu_controller.h" #include "views/controls/menu/menu_host_root_view.h" #include "views/controls/menu/menu_item_view.h" #include "views/controls/menu/native_menu_host.h" #include "views/controls/menu/submenu_view.h" -#include "views/widget/native_widget_private.h" -#include "views/widget/widget.h" namespace views { diff --git a/views/controls/menu/menu_host.h b/views/controls/menu/menu_host.h index 377f128..df079cb 100644 --- a/views/controls/menu/menu_host.h +++ b/views/controls/menu/menu_host.h @@ -8,8 +8,8 @@ #include "base/compiler_specific.h" #include "ui/gfx/rect.h" +#include "ui/views/widget/widget.h" #include "views/controls/menu/native_menu_host_delegate.h" -#include "views/widget/widget.h" namespace views { diff --git a/views/controls/menu/menu_host_root_view.h b/views/controls/menu/menu_host_root_view.h index 11c674c..8558c15 100644 --- a/views/controls/menu/menu_host_root_view.h +++ b/views/controls/menu/menu_host_root_view.h @@ -6,7 +6,7 @@ #define VIEWS_CONTROLS_MENU_MENU_HOST_ROOT_VIEW_H_ #pragma once -#include "views/widget/root_view.h" +#include "ui/views/widget/root_view.h" namespace views { diff --git a/views/controls/menu/native_menu_gtk.cc b/views/controls/menu/native_menu_gtk.cc index 85b87b5..62d05cb 100644 --- a/views/controls/menu/native_menu_gtk.cc +++ b/views/controls/menu/native_menu_gtk.cc @@ -20,11 +20,11 @@ #include "ui/base/models/menu_model.h" #include "ui/gfx/font.h" #include "ui/gfx/gtk_util.h" +#include "ui/views/widget/native_widget_gtk.h" #include "views/controls/menu/menu_2.h" #include "views/controls/menu/menu_listener.h" #include "views/controls/menu/nested_dispatcher_gtk.h" #include "views/views_delegate.h" -#include "views/widget/native_widget_gtk.h" namespace { diff --git a/views/controls/menu/submenu_view.cc b/views/controls/menu/submenu_view.cc index 50cb440..e89973f 100644 --- a/views/controls/menu/submenu_view.cc +++ b/views/controls/menu/submenu_view.cc @@ -6,12 +6,12 @@ #include "ui/base/accessibility/accessible_view_state.h" #include "ui/gfx/canvas.h" +#include "ui/views/widget/root_view.h" +#include "ui/views/widget/widget.h" #include "views/controls/menu/menu_config.h" #include "views/controls/menu/menu_controller.h" #include "views/controls/menu/menu_host.h" #include "views/controls/menu/menu_scroll_view_container.h" -#include "views/widget/root_view.h" -#include "views/widget/widget.h" namespace { diff --git a/views/controls/message_box_view.cc b/views/controls/message_box_view.cc index be8a305..53fae80 100644 --- a/views/controls/message_box_view.cc +++ b/views/controls/message_box_view.cc @@ -13,13 +13,13 @@ #include "ui/base/message_box_flags.h" #include "ui/views/layout/grid_layout.h" #include "ui/views/layout/layout_constants.h" +#include "ui/views/widget/widget.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/views_delegate.h" -#include "views/widget/widget.h" const int kDefaultMessageWidth = 320; diff --git a/views/controls/native/native_view_host.cc b/views/controls/native/native_view_host.cc index e8c5710..c75a54c 100644 --- a/views/controls/native/native_view_host.cc +++ b/views/controls/native/native_view_host.cc @@ -6,8 +6,8 @@ #include "base/logging.h" #include "ui/gfx/canvas.h" +#include "ui/views/widget/widget.h" #include "views/controls/native/native_view_host_wrapper.h" -#include "views/widget/widget.h" namespace views { diff --git a/views/controls/native/native_view_host_aura.cc b/views/controls/native/native_view_host_aura.cc index 888ece7..f5ea43c 100644 --- a/views/controls/native/native_view_host_aura.cc +++ b/views/controls/native/native_view_host_aura.cc @@ -7,8 +7,8 @@ #include "base/logging.h" #include "ui/aura/focus_manager.h" #include "ui/aura/window.h" +#include "ui/views/widget/widget.h" #include "views/controls/native/native_view_host.h" -#include "views/widget/widget.h" namespace views { diff --git a/views/controls/native/native_view_host_gtk.cc b/views/controls/native/native_view_host_gtk.cc index 85ad105..b848269 100644 --- a/views/controls/native/native_view_host_gtk.cc +++ b/views/controls/native/native_view_host_gtk.cc @@ -9,12 +9,12 @@ #include <algorithm> #include "base/logging.h" -#include "views/controls/native/native_view_host.h" #include "ui/views/focus/focus_manager.h" +#include "ui/views/widget/gtk_views_fixed.h" +#include "ui/views/widget/native_widget_gtk.h" +#include "ui/views/widget/widget.h" +#include "views/controls/native/native_view_host.h" #include "views/views_delegate.h" -#include "views/widget/gtk_views_fixed.h" -#include "views/widget/native_widget_gtk.h" -#include "views/widget/widget.h" namespace views { diff --git a/views/controls/native/native_view_host_win.cc b/views/controls/native/native_view_host_win.cc index d02bd9f..017721c 100644 --- a/views/controls/native/native_view_host_win.cc +++ b/views/controls/native/native_view_host_win.cc @@ -9,10 +9,10 @@ #include "base/logging.h" #include "ui/gfx/canvas.h" #include "ui/views/focus/focus_manager.h" +#include "ui/views/widget/native_widget.h" +#include "ui/views/widget/root_view.h" +#include "ui/views/widget/widget.h" #include "views/controls/native/native_view_host.h" -#include "views/widget/native_widget.h" -#include "views/widget/root_view.h" -#include "views/widget/widget.h" namespace views { diff --git a/views/controls/native_control.cc b/views/controls/native_control.cc index f1550b8..7a8605b 100644 --- a/views/controls/native_control.cc +++ b/views/controls/native_control.cc @@ -22,7 +22,7 @@ #include "views/background.h" #include "views/border.h" #include "views/controls/native/native_view_host.h" -#include "views/widget/widget.h" +#include "ui/views/widget/widget.h" using ui::ViewProp; diff --git a/views/controls/native_control_gtk.cc b/views/controls/native_control_gtk.cc index c1ec850..52b2d45 100644 --- a/views/controls/native_control_gtk.cc +++ b/views/controls/native_control_gtk.cc @@ -9,7 +9,7 @@ #include "base/logging.h" #include "ui/base/accessibility/accessibility_types.h" #include "ui/views/focus/focus_manager.h" -#include "views/widget/widget.h" +#include "ui/views/widget/widget.h" #if defined(TOUCH_UI) namespace { diff --git a/views/controls/native_control_win.cc b/views/controls/native_control_win.cc index 4b10afe..20e829c 100644 --- a/views/controls/native_control_win.cc +++ b/views/controls/native_control_win.cc @@ -12,8 +12,8 @@ #include "ui/base/view_prop.h" #include "ui/base/win/hwnd_util.h" #include "ui/views/focus/focus_manager.h" +#include "ui/views/widget/widget.h" #include "views/controls/combobox/combobox.h" -#include "views/widget/widget.h" using ui::ViewProp; diff --git a/views/controls/native_control_win.h b/views/controls/native_control_win.h index a40b02f..dc38926 100644 --- a/views/controls/native_control_win.h +++ b/views/controls/native_control_win.h @@ -9,8 +9,8 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" #include "base/memory/scoped_vector.h" +#include "ui/views/widget/child_window_message_processor.h" #include "views/controls/native/native_view_host.h" -#include "views/widget/child_window_message_processor.h" namespace ui { class ViewProp; diff --git a/views/controls/scroll_view.cc b/views/controls/scroll_view.cc index 6397f71..653b24f 100644 --- a/views/controls/scroll_view.cc +++ b/views/controls/scroll_view.cc @@ -5,8 +5,8 @@ #include "views/controls/scroll_view.h" #include "base/logging.h" +#include "ui/views/widget/root_view.h" #include "views/controls/scrollbar/native_scroll_bar.h" -#include "views/widget/root_view.h" namespace views { diff --git a/views/controls/scrollbar/base_scroll_bar.cc b/views/controls/scrollbar/base_scroll_bar.cc index 9641cbe..1b1ed86 100644 --- a/views/controls/scrollbar/base_scroll_bar.cc +++ b/views/controls/scrollbar/base_scroll_bar.cc @@ -16,11 +16,11 @@ #include "ui/base/keycodes/keyboard_codes.h" #include "ui/base/l10n/l10n_util.h" #include "ui/gfx/canvas.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/scroll_view.h" #include "views/controls/scrollbar/base_scroll_bar_thumb.h" -#include "views/widget/widget.h" #if defined(OS_LINUX) #include "ui/gfx/screen.h" diff --git a/views/controls/scrollbar/bitmap_scroll_bar.cc b/views/controls/scrollbar/bitmap_scroll_bar.cc index 7529f99..5cb7b46 100644 --- a/views/controls/scrollbar/bitmap_scroll_bar.cc +++ b/views/controls/scrollbar/bitmap_scroll_bar.cc @@ -17,10 +17,10 @@ #include "ui/base/keycodes/keyboard_codes.h" #include "ui/base/l10n/l10n_util.h" #include "ui/gfx/canvas.h" +#include "ui/views/widget/widget.h" #include "views/controls/menu/menu.h" #include "views/controls/scroll_view.h" #include "views/controls/scrollbar/base_scroll_bar_thumb.h" -#include "views/widget/widget.h" #if defined(OS_LINUX) #include "views/screen.h" diff --git a/views/controls/scrollbar/native_scroll_bar.cc b/views/controls/scrollbar/native_scroll_bar.cc index 44fbafb..16f0430 100644 --- a/views/controls/scrollbar/native_scroll_bar.cc +++ b/views/controls/scrollbar/native_scroll_bar.cc @@ -8,8 +8,8 @@ #include <string> #include "base/message_loop.h" +#include "ui/views/widget/widget.h" #include "views/controls/scrollbar/native_scroll_bar_wrapper.h" -#include "views/widget/widget.h" #if defined(USE_AURA) #include "views/controls/scrollbar/native_scroll_bar_views.h" diff --git a/views/controls/scrollbar/native_scroll_bar_gtk.cc b/views/controls/scrollbar/native_scroll_bar_gtk.cc index df6d904..baa8435 100644 --- a/views/controls/scrollbar/native_scroll_bar_gtk.cc +++ b/views/controls/scrollbar/native_scroll_bar_gtk.cc @@ -7,10 +7,10 @@ #include <gtk/gtk.h> #include "ui/base/keycodes/keyboard_codes_posix.h" +#include "ui/views/widget/widget.h" #include "views/controls/scrollbar/native_scroll_bar.h" #include "views/controls/scrollbar/native_scroll_bar_views.h" #include "views/controls/scrollbar/scroll_bar.h" -#include "views/widget/widget.h" namespace views { diff --git a/views/controls/scrollbar/native_scroll_bar_win.cc b/views/controls/scrollbar/native_scroll_bar_win.cc index 2f18db3..86e6e67 100644 --- a/views/controls/scrollbar/native_scroll_bar_win.cc +++ b/views/controls/scrollbar/native_scroll_bar_win.cc @@ -11,9 +11,9 @@ #include "ui/base/keycodes/keyboard_codes.h" #include "ui/base/win/hwnd_util.h" #include "ui/base/win/window_impl.h" +#include "ui/views/widget/widget.h" #include "views/controls/scrollbar/native_scroll_bar.h" #include "views/controls/scrollbar/scroll_bar.h" -#include "views/widget/widget.h" namespace views { diff --git a/views/controls/scrollbar/scrollbar_unittest.cc b/views/controls/scrollbar/scrollbar_unittest.cc index 2704354..889ac2e 100644 --- a/views/controls/scrollbar/scrollbar_unittest.cc +++ b/views/controls/scrollbar/scrollbar_unittest.cc @@ -3,10 +3,10 @@ // found in the LICENSE file. #include "ui/views/test/views_test_base.h" +#include "ui/views/widget/widget.h" #include "views/controls/scrollbar/native_scroll_bar.h" #include "views/controls/scrollbar/native_scroll_bar_views.h" #include "views/controls/scrollbar/scroll_bar.h" -#include "views/widget/widget.h" namespace { diff --git a/views/controls/tabbed_pane/native_tabbed_pane_gtk.cc b/views/controls/tabbed_pane/native_tabbed_pane_gtk.cc index 1eaf48e..e1e490c 100644 --- a/views/controls/tabbed_pane/native_tabbed_pane_gtk.cc +++ b/views/controls/tabbed_pane/native_tabbed_pane_gtk.cc @@ -13,11 +13,11 @@ #include "ui/gfx/font.h" #include "ui/gfx/skia_utils_gtk.h" #include "ui/views/layout/fill_layout.h" +#include "ui/views/widget/native_widget.h" +#include "ui/views/widget/widget.h" #include "views/background.h" #include "views/controls/tabbed_pane/tabbed_pane.h" #include "views/controls/tabbed_pane/tabbed_pane_listener.h" -#include "views/widget/native_widget.h" -#include "views/widget/widget.h" namespace views { diff --git a/views/controls/tabbed_pane/native_tabbed_pane_win.cc b/views/controls/tabbed_pane/native_tabbed_pane_win.cc index 654be79..5e29dba 100644 --- a/views/controls/tabbed_pane/native_tabbed_pane_win.cc +++ b/views/controls/tabbed_pane/native_tabbed_pane_win.cc @@ -15,10 +15,10 @@ #include "ui/gfx/font.h" #include "ui/gfx/native_theme_win.h" #include "ui/views/layout/fill_layout.h" +#include "ui/views/widget/root_view.h" +#include "ui/views/widget/widget.h" #include "views/controls/tabbed_pane/tabbed_pane.h" #include "views/controls/tabbed_pane/tabbed_pane_listener.h" -#include "views/widget/root_view.h" -#include "views/widget/widget.h" namespace views { diff --git a/views/controls/tabbed_pane/tabbed_pane.cc b/views/controls/tabbed_pane/tabbed_pane.cc index 72ff0ed..6931fe2 100644 --- a/views/controls/tabbed_pane/tabbed_pane.cc +++ b/views/controls/tabbed_pane/tabbed_pane.cc @@ -7,10 +7,10 @@ #include "base/logging.h" #include "ui/base/accessibility/accessible_view_state.h" #include "ui/base/keycodes/keyboard_codes.h" +#include "ui/views/widget/widget.h" #include "views/controls/native/native_view_host.h" #include "views/controls/tabbed_pane/native_tabbed_pane_wrapper.h" #include "views/controls/tabbed_pane/tabbed_pane_listener.h" -#include "views/widget/widget.h" namespace views { diff --git a/views/controls/tabbed_pane/tabbed_pane_unittest.cc b/views/controls/tabbed_pane/tabbed_pane_unittest.cc index 75e8214..80264c5 100644 --- a/views/controls/tabbed_pane/tabbed_pane_unittest.cc +++ b/views/controls/tabbed_pane/tabbed_pane_unittest.cc @@ -6,9 +6,9 @@ #include "base/utf_string_conversions.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/views/test/views_test_base.h" +#include "ui/views/widget/widget.h" +#include "ui/views/widget/widget_delegate.h" #include "views/controls/tabbed_pane/tabbed_pane.h" -#include "views/widget/widget.h" -#include "views/widget/widget_delegate.h" namespace views { diff --git a/views/controls/table/native_table_gtk.cc b/views/controls/table/native_table_gtk.cc index 61e3978..8e01b19 100644 --- a/views/controls/table/native_table_gtk.cc +++ b/views/controls/table/native_table_gtk.cc @@ -10,9 +10,9 @@ #include "base/utf_string_conversions.h" #include "third_party/skia/include/core/SkBitmap.h" #include "ui/gfx/gtk_util.h" +#include "ui/views/widget/widget.h" #include "views/controls/table/table_view2.h" #include "views/controls/table/table_view_observer.h" -#include "views/widget/widget.h" namespace views { diff --git a/views/controls/table/native_table_win.cc b/views/controls/table/native_table_win.cc index 94bc54d..23b1780 100644 --- a/views/controls/table/native_table_win.cc +++ b/views/controls/table/native_table_win.cc @@ -19,9 +19,9 @@ #include "ui/gfx/canvas_skia.h" #include "ui/gfx/favicon_size.h" #include "ui/gfx/icon_util.h" +#include "ui/views/widget/widget.h" #include "views/controls/table/table_view2.h" #include "views/controls/table/table_view_observer.h" -#include "views/widget/widget.h" namespace views { diff --git a/views/controls/table/table_view_unittest.cc b/views/controls/table/table_view_unittest.cc index aa63143..95a6820 100644 --- a/views/controls/table/table_view_unittest.cc +++ b/views/controls/table/table_view_unittest.cc @@ -20,10 +20,10 @@ #include "testing/gtest/include/gtest/gtest.h" #include "ui/base/models/table_model.h" #include "ui/base/models/table_model_observer.h" +#include "ui/views/widget/widget.h" +#include "ui/views/widget/widget_delegate.h" #include "views/controls/table/table_view.h" #include "views/controls/table/table_view2.h" -#include "views/widget/widget.h" -#include "views/widget/widget_delegate.h" // Put the tests in the views namespace to make it easier to declare them as // friend classes. diff --git a/views/controls/textfield/native_textfield_gtk.cc b/views/controls/textfield/native_textfield_gtk.cc index d2a353a..da96a37 100644 --- a/views/controls/textfield/native_textfield_gtk.cc +++ b/views/controls/textfield/native_textfield_gtk.cc @@ -14,12 +14,12 @@ #include "ui/gfx/insets.h" #include "ui/gfx/selection_model.h" #include "ui/gfx/skia_utils_gtk.h" +#include "ui/views/widget/native_widget_gtk.h" #include "views/controls/textfield/gtk_views_entry.h" #include "views/controls/textfield/gtk_views_textview.h" #include "views/controls/textfield/native_textfield_views.h" #include "views/controls/textfield/textfield.h" #include "views/controls/textfield/textfield_controller.h" -#include "views/widget/native_widget_gtk.h" namespace views { diff --git a/views/controls/textfield/native_textfield_views.cc b/views/controls/textfield/native_textfield_views.cc index fa22340..5b5e86e 100644 --- a/views/controls/textfield/native_textfield_views.cc +++ b/views/controls/textfield/native_textfield_views.cc @@ -20,6 +20,7 @@ #include "ui/gfx/render_text.h" #include "ui/views/events/event.h" #include "ui/views/ime/input_method.h" +#include "ui/views/widget/widget.h" #include "views/background.h" #include "views/border.h" #include "views/controls/focusable_border.h" @@ -31,7 +32,6 @@ #include "views/controls/textfield/textfield_views_model.h" #include "views/metrics.h" #include "views/views_delegate.h" -#include "views/widget/widget.h" #if defined(OS_LINUX) #include "ui/gfx/gtk_util.h" diff --git a/views/controls/textfield/native_textfield_views_unittest.cc b/views/controls/textfield/native_textfield_views_unittest.cc index aa1e20d..9033f81 100644 --- a/views/controls/textfield/native_textfield_views_unittest.cc +++ b/views/controls/textfield/native_textfield_views_unittest.cc @@ -26,13 +26,13 @@ #include "ui/views/ime/mock_input_method.h" #include "ui/views/test/test_views_delegate.h" #include "ui/views/test/views_test_base.h" +#include "ui/views/widget/native_widget_private.h" +#include "ui/views/widget/widget.h" #include "views/controls/textfield/native_textfield_views.h" #include "views/controls/textfield/textfield.h" #include "views/controls/textfield/textfield_controller.h" #include "views/controls/textfield/textfield_views_model.h" #include "views/views_delegate.h" -#include "views/widget/native_widget_private.h" -#include "views/widget/widget.h" // Drag and drop for aura in linux hasn't been implemented yet. // Bug http://crbug.com/97845 diff --git a/views/controls/textfield/native_textfield_win.cc b/views/controls/textfield/native_textfield_win.cc index e0ef11f..ecacf91 100644 --- a/views/controls/textfield/native_textfield_win.cc +++ b/views/controls/textfield/native_textfield_win.cc @@ -24,6 +24,7 @@ #include "ui/base/win/mouse_wheel_util.h" #include "ui/gfx/native_theme_win.h" #include "ui/views/focus/focus_manager.h" +#include "ui/views/widget/widget.h" #include "views/controls/label.h" #include "views/controls/menu/menu_2.h" #include "views/controls/menu/menu_win.h" @@ -33,7 +34,6 @@ #include "views/controls/textfield/textfield_controller.h" #include "views/metrics.h" #include "views/views_delegate.h" -#include "views/widget/widget.h" namespace views { diff --git a/views/controls/textfield/textfield.cc b/views/controls/textfield/textfield.cc index a8e041e..cee525a 100644 --- a/views/controls/textfield/textfield.cc +++ b/views/controls/textfield/textfield.cc @@ -18,10 +18,10 @@ #include "ui/base/range/range.h" #include "ui/gfx/insets.h" #include "ui/gfx/selection_model.h" +#include "ui/views/widget/widget.h" #include "views/controls/native/native_view_host.h" #include "views/controls/textfield/native_textfield_wrapper.h" #include "views/controls/textfield/textfield_controller.h" -#include "views/widget/widget.h" #if defined(OS_LINUX) #include "ui/base/keycodes/keyboard_code_conversion_gtk.h" diff --git a/views/controls/tree/tree_view.cc b/views/controls/tree/tree_view.cc index 18fdc85..77692b4 100644 --- a/views/controls/tree/tree_view.cc +++ b/views/controls/tree/tree_view.cc @@ -24,7 +24,7 @@ #include "ui/gfx/icon_util.h" #include "ui/gfx/point.h" #include "ui/views/focus/focus_manager.h" -#include "views/widget/widget.h" +#include "ui/views/widget/widget.h" using ui::TreeModel; using ui::TreeModelNode; diff --git a/views/mouse_watcher.cc b/views/mouse_watcher.cc index b88e85f..3b2b039 100644 --- a/views/mouse_watcher.cc +++ b/views/mouse_watcher.cc @@ -11,8 +11,8 @@ #include "base/message_loop.h" #include "ui/base/events.h" #include "ui/gfx/screen.h" +#include "ui/views/widget/widget.h" #include "views/view.h" -#include "views/widget/widget.h" namespace views { diff --git a/views/view.cc b/views/view.cc index 152e416..fb10437 100644 --- a/views/view.cc +++ b/views/view.cc @@ -24,14 +24,14 @@ #include "ui/gfx/point3.h" #include "ui/gfx/transform.h" #include "ui/views/layout/layout_manager.h" +#include "ui/views/widget/native_widget_private.h" +#include "ui/views/widget/root_view.h" +#include "ui/views/widget/tooltip_manager.h" +#include "ui/views/widget/widget.h" #include "views/background.h" #include "views/context_menu_controller.h" #include "views/drag_controller.h" #include "views/views_delegate.h" -#include "views/widget/native_widget_private.h" -#include "views/widget/root_view.h" -#include "views/widget/tooltip_manager.h" -#include "views/widget/widget.h" #if defined(OS_WIN) #include "base/win/scoped_gdi_object.h" diff --git a/views/view_unittest.cc b/views/view_unittest.cc index eac26ed..1eabedd 100644 --- a/views/view_unittest.cc +++ b/views/view_unittest.cc @@ -26,6 +26,8 @@ #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/widget/native_widget.h" +#include "ui/views/widget/root_view.h" #include "ui/views/window/dialog_delegate.h" #include "views/background.h" #include "views/controls/button/button_dropdown.h" @@ -35,8 +37,6 @@ #include "views/controls/textfield/textfield.h" #include "views/view.h" #include "views/views_delegate.h" -#include "views/widget/native_widget.h" -#include "views/widget/root_view.h" #if defined(OS_WIN) #include "ui/views/test/test_views_delegate.h" diff --git a/views/views.gyp b/views/views.gyp index c193d8a..e2ceaca 100644 --- a/views/views.gyp +++ b/views/views.gyp @@ -266,49 +266,49 @@ 'view_text_utils.h', 'view_win.cc', 'views_delegate.h', - 'widget/aero_tooltip_manager.cc', - 'widget/aero_tooltip_manager.h', - 'widget/child_window_message_processor.cc', - 'widget/child_window_message_processor.h', - 'widget/default_theme_provider.cc', - 'widget/default_theme_provider.h', - 'widget/drop_helper.cc', - 'widget/drop_helper.h', - 'widget/drop_target_gtk.cc', - 'widget/drop_target_gtk.h', - 'widget/drop_target_win.cc', - 'widget/drop_target_win.h', - 'widget/gtk_views_fixed.cc', - 'widget/gtk_views_fixed.h', - 'widget/gtk_views_window.cc', - 'widget/gtk_views_window.h', - 'widget/root_view.cc', - 'widget/root_view.h', - 'widget/tooltip_manager_gtk.cc', - 'widget/tooltip_manager_gtk.h', - 'widget/tooltip_manager_views.cc', - 'widget/tooltip_manager_views.h', - 'widget/tooltip_manager_win.cc', - 'widget/tooltip_manager_win.h', - 'widget/tooltip_manager.cc', - 'widget/tooltip_manager.h', - 'widget/monitor_win.cc', - 'widget/monitor_win.h', - 'widget/native_widget.h', - 'widget/native_widget_aura.cc', - 'widget/native_widget_aura.h', - 'widget/native_widget_delegate.h', - 'widget/native_widget_private.h', - 'widget/native_widget_gtk.cc', - 'widget/native_widget_gtk.h', - 'widget/native_widget_win.cc', - 'widget/native_widget_win.h', - 'widget/widget.cc', - 'widget/widget.h', - 'widget/widget_delegate.cc', - 'widget/widget_delegate.h', - 'widget/window_manager.cc', - 'widget/window_manager.h', + '../ui/views/widget/aero_tooltip_manager.cc', + '../ui/views/widget/aero_tooltip_manager.h', + '../ui/views/widget/child_window_message_processor.cc', + '../ui/views/widget/child_window_message_processor.h', + '../ui/views/widget/default_theme_provider.cc', + '../ui/views/widget/default_theme_provider.h', + '../ui/views/widget/drop_helper.cc', + '../ui/views/widget/drop_helper.h', + '../ui/views/widget/drop_target_gtk.cc', + '../ui/views/widget/drop_target_gtk.h', + '../ui/views/widget/drop_target_win.cc', + '../ui/views/widget/drop_target_win.h', + '../ui/views/widget/gtk_views_fixed.cc', + '../ui/views/widget/gtk_views_fixed.h', + '../ui/views/widget/gtk_views_window.cc', + '../ui/views/widget/gtk_views_window.h', + '../ui/views/widget/root_view.cc', + '../ui/views/widget/root_view.h', + '../ui/views/widget/tooltip_manager_gtk.cc', + '../ui/views/widget/tooltip_manager_gtk.h', + '../ui/views/widget/tooltip_manager_views.cc', + '../ui/views/widget/tooltip_manager_views.h', + '../ui/views/widget/tooltip_manager_win.cc', + '../ui/views/widget/tooltip_manager_win.h', + '../ui/views/widget/tooltip_manager.cc', + '../ui/views/widget/tooltip_manager.h', + '../ui/views/widget/monitor_win.cc', + '../ui/views/widget/monitor_win.h', + '../ui/views/widget/native_widget.h', + '../ui/views/widget/native_widget_aura.cc', + '../ui/views/widget/native_widget_aura.h', + '../ui/views/widget/native_widget_delegate.h', + '../ui/views/widget/native_widget_private.h', + '../ui/views/widget/native_widget_gtk.cc', + '../ui/views/widget/native_widget_gtk.h', + '../ui/views/widget/native_widget_win.cc', + '../ui/views/widget/native_widget_win.h', + '../ui/views/widget/widget.cc', + '../ui/views/widget/widget.h', + '../ui/views/widget/widget_delegate.cc', + '../ui/views/widget/widget_delegate.h', + '../ui/views/widget/window_manager.cc', + '../ui/views/widget/window_manager.h', '../ui/views/accessibility/native_view_accessibility_win.cc', '../ui/views/accessibility/native_view_accessibility_win.h', '../ui/views/animation/bounds_animator.cc', @@ -419,10 +419,10 @@ 'controls/tree/tree_view.cc', 'controls/tree/tree_view.h', 'drag_utils_win.cc', - 'widget/aero_tooltip_manager.cc', - 'widget/aero_tooltip_manager.h', - 'widget/child_window_message_processor.cc', - 'widget/child_window_message_processor.h', + '../ui/views/widget/aero_tooltip_manager.cc', + '../ui/views/widget/aero_tooltip_manager.h', + '../ui/views/widget/child_window_message_processor.cc', + '../ui/views/widget/child_window_message_processor.h', ], }, ], @@ -440,17 +440,17 @@ 'controls/table/group_table_view.cc', 'controls/table/table_view.cc', 'controls/tree/tree_view.cc', - 'widget/aero_tooltip_manager.cc', - 'widget/child_window_message_processor.cc', - 'widget/child_window_message_processor.h', - 'widget/native_widget_win.cc', + '../ui/views/widget/aero_tooltip_manager.cc', + '../ui/views/widget/child_window_message_processor.cc', + '../ui/views/widget/child_window_message_processor.h', + '../ui/views/widget/native_widget_win.cc', ], }], ['touchui==1', { 'sources/': [ ['exclude', '../ui/views/focus/accelerator_handler_gtk.cc'], ['exclude', 'controls/menu/native_menu_gtk.cc'], - ['exclude', 'widget/tooltip_manager_gtk.cc'], + ['exclude', '../ui/views/widget/tooltip_manager_gtk.cc'], ], }], ['touchui==0', { @@ -463,7 +463,7 @@ 'sources!': [ 'controls/menu/native_menu_views.cc', 'controls/menu/native_menu_views.h', - 'widget/tooltip_manager_views.cc', + '../ui/views/widget/tooltip_manager_views.cc', ], }], ['use_ibus==1', { @@ -551,13 +551,13 @@ 'controls/scrollbar/scrollbar_unittest.cc', 'run_all_unittests.cc', 'view_unittest.cc', - 'widget/native_widget_test_utils.h', - 'widget/native_widget_test_utils_aura.cc', - 'widget/native_widget_test_utils_gtk.cc', - 'widget/native_widget_test_utils_win.cc', - 'widget/native_widget_unittest.cc', - 'widget/native_widget_win_unittest.cc', - 'widget/widget_unittest.cc', + '../ui/views/widget/native_widget_test_utils.h', + '../ui/views/widget/native_widget_test_utils_aura.cc', + '../ui/views/widget/native_widget_test_utils_gtk.cc', + '../ui/views/widget/native_widget_test_utils_win.cc', + '../ui/views/widget/native_widget_unittest.cc', + '../ui/views/widget/native_widget_win_unittest.cc', + '../ui/views/widget/widget_unittest.cc', '<(SHARED_INTERMEDIATE_DIR)/ui/gfx/gfx_resources.rc', '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc', @@ -608,7 +608,7 @@ ['exclude', 'controls/combobox/native_combobox_views_unittest.cc'], ['exclude', 'controls/table/table_view_unittest.cc'], ['exclude', 'controls/tabbed_pane/tabbed_pane_unittest.cc'], - ['exclude', 'widget/native_widget_win_unittest.cc'], + ['exclude', '../ui/views/widget/native_widget_win_unittest.cc'], ], }, { 'sources/': [ |