diff options
117 files changed, 189 insertions, 188 deletions
diff --git a/chrome/browser/chromeos/external_protocol_dialog.cc b/chrome/browser/chromeos/external_protocol_dialog.cc index d597c50..6bcf303 100644 --- a/chrome/browser/chromeos/external_protocol_dialog.cc +++ b/chrome/browser/chromeos/external_protocol_dialog.cc @@ -19,8 +19,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/controls/message_box_view.h" #include "ui/views/widget/widget.h" -#include "views/controls/message_box_view.h" namespace { diff --git a/chrome/browser/chromeos/frame/bubble_frame_view.cc b/chrome/browser/chromeos/frame/bubble_frame_view.cc index 9691fa9..dc35fda 100644 --- a/chrome/browser/chromeos/frame/bubble_frame_view.cc +++ b/chrome/browser/chromeos/frame/bubble_frame_view.cc @@ -21,9 +21,9 @@ #include "ui/gfx/rect.h" #include "ui/views/controls/button/image_button.h" #include "ui/views/controls/label.h" +#include "ui/views/controls/throbber.h" #include "ui/views/widget/widget.h" #include "ui/views/widget/widget_delegate.h" -#include "views/controls/throbber.h" namespace { diff --git a/chrome/browser/chromeos/frame/panel_controller.cc b/chrome/browser/chromeos/frame/panel_controller.cc index 4de9fda..fec051d 100644 --- a/chrome/browser/chromeos/frame/panel_controller.cc +++ b/chrome/browser/chromeos/frame/panel_controller.cc @@ -29,10 +29,10 @@ #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/canvas_skia.h" #include "ui/views/controls/button/image_button.h" +#include "ui/views/controls/image_view.h" #include "ui/views/controls/label.h" #include "ui/views/events/event.h" #include "ui/views/widget/widget.h" -#include "views/controls/image_view.h" #include "views/painter.h" #include "views/view.h" diff --git a/chrome/browser/chromeos/login/captcha_view.cc b/chrome/browser/chromeos/login/captcha_view.cc index 266f041..cf2a3ff 100644 --- a/chrome/browser/chromeos/login/captcha_view.cc +++ b/chrome/browser/chromeos/login/captcha_view.cc @@ -16,13 +16,13 @@ #include "grit/locale_settings.h" #include "ui/base/l10n/l10n_util.h" #include "ui/views/controls/button/text_button.h" +#include "ui/views/controls/image_view.h" #include "ui/views/controls/label.h" #include "ui/views/controls/textfield/textfield.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/image_view.h" using views::Label; using views::Textfield; diff --git a/chrome/browser/chromeos/login/helper.cc b/chrome/browser/chromeos/login/helper.cc index 5c0d9b5..5046afd 100644 --- a/chrome/browser/chromeos/login/helper.cc +++ b/chrome/browser/chromeos/login/helper.cc @@ -19,8 +19,8 @@ #include "ui/views/controls/button/menu_button.h" #include "ui/views/controls/label.h" #include "ui/views/controls/textfield/textfield.h" +#include "ui/views/controls/throbber.h" #include "ui/views/widget/widget.h" -#include "views/controls/throbber.h" #include "views/painter.h" namespace chromeos { diff --git a/chrome/browser/chromeos/login/message_bubble.cc b/chrome/browser/chromeos/login/message_bubble.cc index 91e11d1..2758166 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/controls/button/image_button.h" +#include "ui/views/controls/image_view.h" #include "ui/views/controls/label.h" #include "ui/views/controls/link.h" #include "ui/views/layout/grid_layout.h" #include "ui/views/widget/widget.h" -#include "views/controls/image_view.h" namespace chromeos { diff --git a/chrome/browser/chromeos/login/screen_lock_view.cc b/chrome/browser/chromeos/login/screen_lock_view.cc index e55e8a9..f8708c1 100644 --- a/chrome/browser/chromeos/login/screen_lock_view.cc +++ b/chrome/browser/chromeos/login/screen_lock_view.cc @@ -19,6 +19,7 @@ #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" +#include "ui/views/controls/image_view.h" #include "ui/views/controls/label.h" #include "ui/views/controls/textfield/native_textfield_wrapper.h" #include "ui/views/controls/textfield/textfield.h" @@ -26,7 +27,6 @@ #include "ui/views/widget/native_widget_gtk.h" #include "views/background.h" #include "views/border.h" -#include "views/controls/image_view.h" namespace chromeos { diff --git a/chrome/browser/chromeos/login/take_photo_view.cc b/chrome/browser/chromeos/login/take_photo_view.cc index f1c2ef1..bae66e1 100644 --- a/chrome/browser/chromeos/login/take_photo_view.cc +++ b/chrome/browser/chromeos/login/take_photo_view.cc @@ -13,12 +13,12 @@ #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/canvas.h" #include "ui/views/controls/button/image_button.h" +#include "ui/views/controls/image_view.h" #include "ui/views/controls/label.h" +#include "ui/views/controls/throbber.h" #include "ui/views/layout/grid_layout.h" #include "views/background.h" #include "views/border.h" -#include "views/controls/image_view.h" -#include "views/controls/throbber.h" namespace { diff --git a/chrome/browser/chromeos/login/user_view.cc b/chrome/browser/chromeos/login/user_view.cc index 914d0a9..268b031 100644 --- a/chrome/browser/chromeos/login/user_view.cc +++ b/chrome/browser/chromeos/login/user_view.cc @@ -19,11 +19,11 @@ #include "ui/gfx/gtk_util.h" #include "ui/gfx/rect.h" #include "ui/views/controls/button/text_button.h" +#include "ui/views/controls/image_view.h" #include "ui/views/controls/label.h" #include "ui/views/controls/link.h" #include "ui/views/controls/link_listener.h" #include "views/background.h" -#include "views/controls/image_view.h" namespace { diff --git a/chrome/browser/chromeos/login/web_page_view.cc b/chrome/browser/chromeos/login/web_page_view.cc index 54dac4f..24f2fe8 100644 --- a/chrome/browser/chromeos/login/web_page_view.cc +++ b/chrome/browser/chromeos/login/web_page_view.cc @@ -24,9 +24,9 @@ #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/canvas.h" #include "ui/views/controls/label.h" +#include "ui/views/controls/throbber.h" #include "views/background.h" #include "views/border.h" -#include "views/controls/throbber.h" using base::TimeDelta; using views::Label; diff --git a/chrome/browser/chromeos/notifications/notification_panel.cc b/chrome/browser/chromeos/notifications/notification_panel.cc index 97ed173..4803711 100644 --- a/chrome/browser/chromeos/notifications/notification_panel.cc +++ b/chrome/browser/chromeos/notifications/notification_panel.cc @@ -20,9 +20,9 @@ #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/canvas.h" #include "ui/views/controls/native/native_view_host.h" +#include "ui/views/controls/scroll_view.h" #include "ui/views/widget/native_widget_gtk.h" #include "views/background.h" -#include "views/controls/scroll_view.h" #define SET_STATE(state) SetState(state, __PRETTY_FUNCTION__) diff --git a/chrome/browser/chromeos/setting_level_bubble_browsertest.cc b/chrome/browser/chromeos/setting_level_bubble_browsertest.cc index eac3906..411850d 100644 --- a/chrome/browser/chromeos/setting_level_bubble_browsertest.cc +++ b/chrome/browser/chromeos/setting_level_bubble_browsertest.cc @@ -7,7 +7,7 @@ #include "chrome/browser/chromeos/setting_level_bubble_view.h" #include "chrome/test/base/in_process_browser_test.h" #include "third_party/skia/include/core/SkBitmap.h" -#include "views/controls/progress_bar.h" +#include "ui/views/controls/progress_bar.h" #include "views/view.h" diff --git a/chrome/browser/chromeos/setting_level_bubble_view.cc b/chrome/browser/chromeos/setting_level_bubble_view.cc index 145471c..53c6b1e 100644 --- a/chrome/browser/chromeos/setting_level_bubble_view.cc +++ b/chrome/browser/chromeos/setting_level_bubble_view.cc @@ -9,7 +9,7 @@ #include "base/logging.h" #include "third_party/skia/include/core/SkBitmap.h" #include "ui/gfx/canvas.h" -#include "views/controls/progress_bar.h" +#include "ui/views/controls/progress_bar.h" using views::Background; using views::View; diff --git a/chrome/browser/chromeos/status/accessibility_menu_button.cc b/chrome/browser/chromeos/status/accessibility_menu_button.cc index 7f1b076..85fa4b2 100644 --- a/chrome/browser/chromeos/status/accessibility_menu_button.cc +++ b/chrome/browser/chromeos/status/accessibility_menu_button.cc @@ -19,10 +19,10 @@ #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/image/image.h" +#include "ui/views/controls/image_view.h" #include "ui/views/controls/menu/menu_item_view.h" #include "ui/views/controls/menu/menu_runner.h" #include "ui/views/widget/widget.h" -#include "views/controls/image_view.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 6f4984d..5765dca 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/controls/image_view.h" #include "ui/views/controls/menu/menu_item_view.h" #include "ui/views/controls/menu/menu_runner.h" #include "ui/views/controls/menu/submenu_view.h" #include "ui/views/widget/widget.h" -#include "views/controls/image_view.h" namespace { diff --git a/chrome/browser/first_run/try_chrome_dialog_view.cc b/chrome/browser/first_run/try_chrome_dialog_view.cc index c4df79b..0a79c1e 100644 --- a/chrome/browser/first_run/try_chrome_dialog_view.cc +++ b/chrome/browser/first_run/try_chrome_dialog_view.cc @@ -21,11 +21,11 @@ #include "ui/views/controls/button/image_button.h" #include "ui/views/controls/button/radio_button.h" #include "ui/views/controls/button/text_button.h" +#include "ui/views/controls/image_view.h" #include "ui/views/controls/link.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" namespace { diff --git a/chrome/browser/speech/speech_input_bubble_views.cc b/chrome/browser/speech/speech_input_bubble_views.cc index 0b9185f..5544484 100644 --- a/chrome/browser/speech/speech_input_bubble_views.cc +++ b/chrome/browser/speech/speech_input_bubble_views.cc @@ -21,11 +21,11 @@ #include "ui/base/resource/resource_bundle.h" #include "ui/views/bubble/bubble_delegate.h" #include "ui/views/controls/button/text_button.h" +#include "ui/views/controls/image_view.h" #include "ui/views/controls/label.h" #include "ui/views/controls/link.h" #include "ui/views/controls/link_listener.h" #include "ui/views/layout/layout_constants.h" -#include "views/controls/image_view.h" namespace { diff --git a/chrome/browser/ui/panels/panel_browser_view_browsertest.cc b/chrome/browser/ui/panels/panel_browser_view_browsertest.cc index bda3a67..da7ca20 100644 --- a/chrome/browser/ui/panels/panel_browser_view_browsertest.cc +++ b/chrome/browser/ui/panels/panel_browser_view_browsertest.cc @@ -22,10 +22,10 @@ #include "ui/base/l10n/l10n_util.h" #include "ui/views/controls/button/image_button.h" #include "ui/views/controls/button/menu_button.h" +#include "ui/views/controls/image_view.h" #include "ui/views/controls/label.h" #include "ui/views/controls/link.h" #include "ui/views/controls/textfield/textfield.h" -#include "views/controls/image_view.h" class PanelBrowserViewTest : public BasePanelBrowserTest { public: diff --git a/chrome/browser/ui/tests/ui_gfx_image_unittest.cc b/chrome/browser/ui/tests/ui_gfx_image_unittest.cc index 645c13e..640560c 100644 --- a/chrome/browser/ui/tests/ui_gfx_image_unittest.cc +++ b/chrome/browser/ui/tests/ui_gfx_image_unittest.cc @@ -10,11 +10,12 @@ #if defined(TOOLKIT_USES_GTK) #include <gtk/gtk.h> + #include "ui/gfx/gtk_util.h" #endif #if defined(TOOLKIT_VIEWS) -#include "views/controls/image_view.h" +#include "ui/views/controls/image_view.h" #include "views/view.h" #endif diff --git a/chrome/browser/ui/views/about_chrome_view.cc b/chrome/browser/ui/views/about_chrome_view.cc index 72b6a33..fe8c614 100644 --- a/chrome/browser/ui/views/about_chrome_view.cc +++ b/chrome/browser/ui/views/about_chrome_view.cc @@ -38,9 +38,9 @@ #include "ui/views/controls/button/text_button.h" #include "ui/views/controls/link.h" #include "ui/views/controls/textfield/textfield.h" +#include "ui/views/controls/throbber.h" #include "ui/views/layout/layout_constants.h" #include "ui/views/widget/widget.h" -#include "views/controls/throbber.h" #include "views/view_text_utils.h" #include "webkit/glue/webkit_glue.h" diff --git a/chrome/browser/ui/views/about_chrome_view.h b/chrome/browser/ui/views/about_chrome_view.h index fe5ddda..378ea2a 100644 --- a/chrome/browser/ui/views/about_chrome_view.h +++ b/chrome/browser/ui/views/about_chrome_view.h @@ -10,10 +10,10 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" +#include "ui/views/controls/image_view.h" #include "ui/views/controls/label.h" #include "ui/views/controls/link_listener.h" #include "ui/views/window/dialog_delegate.h" -#include "views/controls/image_view.h" #include "views/view.h" #if defined(OS_WIN) && !defined(USE_AURA) diff --git a/chrome/browser/ui/views/avatar_menu_bubble_view.cc b/chrome/browser/ui/views/avatar_menu_bubble_view.cc index 75945ee..67a9708 100644 --- a/chrome/browser/ui/views/avatar_menu_bubble_view.cc +++ b/chrome/browser/ui/views/avatar_menu_bubble_view.cc @@ -22,10 +22,10 @@ #include "ui/gfx/image/image.h" #include "ui/views/controls/button/custom_button.h" #include "ui/views/controls/button/image_button.h" +#include "ui/views/controls/image_view.h" #include "ui/views/controls/label.h" #include "ui/views/controls/link.h" -#include "views/controls/image_view.h" -#include "views/controls/separator.h" +#include "ui/views/controls/separator.h" namespace { diff --git a/chrome/browser/ui/views/browser_actions_container.cc b/chrome/browser/ui/views/browser_actions_container.cc index cd422eb..137116e 100644 --- a/chrome/browser/ui/views/browser_actions_container.cc +++ b/chrome/browser/ui/views/browser_actions_container.cc @@ -48,7 +48,7 @@ #include "ui/views/controls/menu/menu_item_view.h" #include "ui/views/controls/menu/menu_model_adapter.h" #include "ui/views/controls/menu/menu_runner.h" -#include "views/controls/resize_area.h" +#include "ui/views/controls/resize_area.h" #include "views/drag_utils.h" #include "views/metrics.h" diff --git a/chrome/browser/ui/views/browser_actions_container.h b/chrome/browser/ui/views/browser_actions_container.h index 0a76077..1d0dd71 100644 --- a/chrome/browser/ui/views/browser_actions_container.h +++ b/chrome/browser/ui/views/browser_actions_container.h @@ -25,7 +25,7 @@ #include "ui/base/animation/tween.h" #include "ui/views/controls/button/menu_button.h" #include "ui/views/controls/menu/view_menu_delegate.h" -#include "views/controls/resize_area_delegate.h" +#include "ui/views/controls/resize_area_delegate.h" #include "views/drag_controller.h" #include "views/view.h" diff --git a/chrome/browser/ui/views/collected_cookies_win.cc b/chrome/browser/ui/views/collected_cookies_win.cc index 621fd1f..3c4a5eb 100644 --- a/chrome/browser/ui/views/collected_cookies_win.cc +++ b/chrome/browser/ui/views/collected_cookies_win.cc @@ -26,13 +26,13 @@ #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/color_utils.h" #include "ui/views/controls/button/text_button.h" +#include "ui/views/controls/image_view.h" #include "ui/views/controls/label.h" #include "ui/views/controls/tabbed_pane/tabbed_pane.h" #include "ui/views/layout/box_layout.h" #include "ui/views/layout/grid_layout.h" #include "ui/views/layout/layout_constants.h" #include "ui/views/widget/widget.h" -#include "views/controls/image_view.h" namespace browser { diff --git a/chrome/browser/ui/views/confirm_bubble_view.cc b/chrome/browser/ui/views/confirm_bubble_view.cc index 88297e9..4826fd4 100644 --- a/chrome/browser/ui/views/confirm_bubble_view.cc +++ b/chrome/browser/ui/views/confirm_bubble_view.cc @@ -10,11 +10,11 @@ #include "ui/gfx/image/image.h" #include "ui/views/controls/button/image_button.h" #include "ui/views/controls/button/text_button.h" +#include "ui/views/controls/image_view.h" #include "ui/views/controls/label.h" #include "ui/views/controls/link.h" #include "ui/views/layout/grid_layout.h" #include "ui/views/layout/layout_constants.h" -#include "views/controls/image_view.h" namespace { diff --git a/chrome/browser/ui/views/content_setting_bubble_contents.cc b/chrome/browser/ui/views/content_setting_bubble_contents.cc index 41483ba..993cb29 100644 --- a/chrome/browser/ui/views/content_setting_bubble_contents.cc +++ b/chrome/browser/ui/views/content_setting_bubble_contents.cc @@ -26,12 +26,12 @@ #include "ui/base/l10n/l10n_util.h" #include "ui/views/controls/button/radio_button.h" #include "ui/views/controls/button/text_button.h" +#include "ui/views/controls/image_view.h" #include "ui/views/controls/label.h" #include "ui/views/controls/link.h" +#include "ui/views/controls/separator.h" #include "ui/views/layout/grid_layout.h" #include "ui/views/layout/layout_constants.h" -#include "views/controls/image_view.h" -#include "views/controls/separator.h" #if defined(TOOLKIT_USES_GTK) #include "ui/gfx/gtk_util.h" diff --git a/chrome/browser/ui/views/create_application_shortcut_view.cc b/chrome/browser/ui/views/create_application_shortcut_view.cc index a24ff40..772a846 100644 --- a/chrome/browser/ui/views/create_application_shortcut_view.cc +++ b/chrome/browser/ui/views/create_application_shortcut_view.cc @@ -36,11 +36,11 @@ #include "ui/gfx/canvas_skia.h" #include "ui/gfx/codec/png_codec.h" #include "ui/views/controls/button/checkbox.h" +#include "ui/views/controls/image_view.h" #include "ui/views/controls/label.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" namespace { diff --git a/chrome/browser/ui/views/critical_notification_bubble_view.cc b/chrome/browser/ui/views/critical_notification_bubble_view.cc index 31c7a07..ae1f613 100644 --- a/chrome/browser/ui/views/critical_notification_bubble_view.cc +++ b/chrome/browser/ui/views/critical_notification_bubble_view.cc @@ -20,11 +20,11 @@ #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" #include "ui/views/controls/button/text_button.h" +#include "ui/views/controls/image_view.h" #include "ui/views/controls/label.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" namespace { diff --git a/chrome/browser/ui/views/default_search_view.cc b/chrome/browser/ui/views/default_search_view.cc index ad8aa13..4267dc8 100644 --- a/chrome/browser/ui/views/default_search_view.cc +++ b/chrome/browser/ui/views/default_search_view.cc @@ -23,12 +23,12 @@ #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/canvas.h" #include "ui/views/controls/button/text_button.h" +#include "ui/views/controls/image_view.h" #include "ui/views/controls/label.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/image_view.h" namespace { diff --git a/chrome/browser/ui/views/download/download_shelf_view.cc b/chrome/browser/ui/views/download/download_shelf_view.cc index b51f126..f78c6ef 100644 --- a/chrome/browser/ui/views/download/download_shelf_view.cc +++ b/chrome/browser/ui/views/download/download_shelf_view.cc @@ -27,9 +27,9 @@ #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/canvas.h" #include "ui/views/controls/button/image_button.h" +#include "ui/views/controls/image_view.h" #include "ui/views/controls/link.h" #include "views/background.h" -#include "views/controls/image_view.h" // Max number of download views we'll contain. Any time a view is added and // we already have this many download views, one is removed. 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 caef753..603640f 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/controls/image_view.h" #include "ui/views/widget/widget.h" -#include "views/controls/image_view.h" // How long to spend moving downwards and fading out after waiting. static const int kMoveTimeMs = 600; diff --git a/chrome/browser/ui/views/edit_search_engine_dialog.cc b/chrome/browser/ui/views/edit_search_engine_dialog.cc index db4086b..ed87835 100644 --- a/chrome/browser/ui/views/edit_search_engine_dialog.cc +++ b/chrome/browser/ui/views/edit_search_engine_dialog.cc @@ -15,13 +15,13 @@ #include "grit/ui_resources.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" +#include "ui/views/controls/image_view.h" #include "ui/views/controls/label.h" #include "ui/views/controls/table/table_view.h" #include "ui/views/controls/textfield/textfield.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" using views::GridLayout; using views::ImageView; 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 ad443c6..ee06d5c 100644 --- a/chrome/browser/ui/views/extensions/extension_install_dialog_view.cc +++ b/chrome/browser/ui/views/extensions/extension_install_dialog_view.cc @@ -16,17 +16,17 @@ #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" +#include "ui/views/controls/image_view.h" #include "ui/views/controls/label.h" #include "ui/views/controls/link.h" #include "ui/views/controls/link_listener.h" +#include "ui/views/controls/separator.h" #include "ui/views/layout/box_layout.h" #include "ui/views/layout/grid_layout.h" #include "ui/views/layout/layout_constants.h" #include "ui/views/widget/widget.h" #include "ui/views/window/dialog_delegate.h" #include "views/border.h" -#include "views/controls/image_view.h" -#include "views/controls/separator.h" #include "views/view.h" namespace { diff --git a/chrome/browser/ui/views/extensions/extension_installed_bubble.cc b/chrome/browser/ui/views/extensions/extension_installed_bubble.cc index d03ced7..352987e 100644 --- a/chrome/browser/ui/views/extensions/extension_installed_bubble.cc +++ b/chrome/browser/ui/views/extensions/extension_installed_bubble.cc @@ -30,12 +30,12 @@ #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" #include "ui/views/controls/button/image_button.h" +#include "ui/views/controls/image_view.h" #include "ui/views/controls/label.h" #include "ui/views/controls/link.h" #include "ui/views/controls/link_listener.h" #include "ui/views/layout/fill_layout.h" #include "ui/views/layout/layout_constants.h" -#include "views/controls/image_view.h" #include "views/view.h" namespace { 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 48eeaa7..71c2921 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/base/l10n/l10n_util.h" #include "ui/gfx/compositor/compositor.h" #include "ui/gfx/compositor/layer.h" +#include "ui/views/controls/image_view.h" #include "ui/views/controls/label.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/view.h" namespace { diff --git a/chrome/browser/ui/views/external_protocol_dialog.cc b/chrome/browser/ui/views/external_protocol_dialog.cc index f328b81..ff9725e 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/controls/message_box_view.h" #include "ui/views/widget/widget.h" -#include "views/controls/message_box_view.h" namespace { 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 8b9426b..1ea6aab 100644 --- a/chrome/browser/ui/views/first_run_search_engine_view.cc +++ b/chrome/browser/ui/views/first_run_search_engine_view.cc @@ -31,11 +31,11 @@ #include "ui/gfx/canvas.h" #include "ui/gfx/font.h" #include "ui/views/controls/button/button.h" +#include "ui/views/controls/image_view.h" #include "ui/views/controls/label.h" #include "ui/views/focus/accelerator_handler.h" #include "ui/views/layout/layout_constants.h" #include "ui/views/widget/widget.h" -#include "views/controls/image_view.h" #include "views/view_text_utils.h" namespace { diff --git a/chrome/browser/ui/views/frame/browser_view.cc b/chrome/browser/ui/views/frame/browser_view.cc index fcf1a05..5f9ed64 100644 --- a/chrome/browser/ui/views/frame/browser_view.cc +++ b/chrome/browser/ui/views/frame/browser_view.cc @@ -96,6 +96,7 @@ #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/canvas_skia.h" +#include "ui/views/controls/single_split_view.h" #include "ui/views/events/event.h" #include "ui/views/focus/external_focus_tracker.h" #include "ui/views/focus/view_storage.h" @@ -104,7 +105,6 @@ #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" #if defined(USE_AURA) #include "chrome/browser/ui/views/accelerator_table.h" diff --git a/chrome/browser/ui/views/frame/browser_view.h b/chrome/browser/ui/views/frame/browser_view.h index 5b258f3..430bf73 100644 --- a/chrome/browser/ui/views/frame/browser_view.h +++ b/chrome/browser/ui/views/frame/browser_view.h @@ -26,9 +26,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/controls/single_split_view_listener.h" #include "ui/views/widget/widget_delegate.h" #include "ui/views/window/client_view.h" -#include "views/controls/single_split_view_listener.h" #if defined(OS_WIN) #include "chrome/browser/hang_monitor/hung_plugin_action.h" diff --git a/chrome/browser/ui/views/frame/browser_view_layout.cc b/chrome/browser/ui/views/frame/browser_view_layout.cc index 85ab1aa..d9e2d2b 100644 --- a/chrome/browser/ui/views/frame/browser_view_layout.cc +++ b/chrome/browser/ui/views/frame/browser_view_layout.cc @@ -20,7 +20,7 @@ #include "ui/gfx/point.h" #include "ui/gfx/scrollbar_size.h" #include "ui/gfx/size.h" -#include "views/controls/single_split_view.h" +#include "ui/views/controls/single_split_view.h" #if !defined(OS_CHROMEOS) || defined(USE_AURA) #include "chrome/browser/ui/views/download/download_shelf_view.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 9ee459d..87399e9 100644 --- a/chrome/browser/ui/views/frame/opaque_browser_frame_view.cc +++ b/chrome/browser/ui/views/frame/opaque_browser_frame_view.cc @@ -37,9 +37,9 @@ #include "ui/gfx/image/image.h" #include "ui/gfx/path.h" #include "ui/views/controls/button/image_button.h" +#include "ui/views/controls/image_view.h" #include "ui/views/widget/root_view.h" #include "ui/views/window/window_shape.h" -#include "views/controls/image_view.h" #if defined(USE_VIRTUAL_KEYBOARD) #include "chrome/browser/ui/virtual_keyboard/virtual_keyboard_manager.h" diff --git a/chrome/browser/ui/views/global_error_bubble_view.cc b/chrome/browser/ui/views/global_error_bubble_view.cc index 4af108a..9cf9fe9 100644 --- a/chrome/browser/ui/views/global_error_bubble_view.cc +++ b/chrome/browser/ui/views/global_error_bubble_view.cc @@ -12,10 +12,10 @@ #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/image/image.h" #include "ui/views/controls/button/text_button.h" +#include "ui/views/controls/image_view.h" #include "ui/views/controls/label.h" #include "ui/views/layout/grid_layout.h" #include "ui/views/layout/layout_constants.h" -#include "views/controls/image_view.h" namespace { diff --git a/chrome/browser/ui/views/hung_renderer_view.cc b/chrome/browser/ui/views/hung_renderer_view.cc index cbd8056..d700256 100644 --- a/chrome/browser/ui/views/hung_renderer_view.cc +++ b/chrome/browser/ui/views/hung_renderer_view.cc @@ -23,6 +23,7 @@ #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/canvas.h" #include "ui/views/controls/button/text_button.h" +#include "ui/views/controls/image_view.h" #include "ui/views/controls/label.h" #include "ui/views/controls/table/group_table_view.h" #include "ui/views/layout/grid_layout.h" @@ -30,7 +31,6 @@ #include "ui/views/widget/widget.h" #include "ui/views/window/client_view.h" #include "ui/views/window/dialog_delegate.h" -#include "views/controls/image_view.h" class HungRendererDialogView; 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 d9a86c6..97150b7 100644 --- a/chrome/browser/ui/views/importer/import_progress_dialog_view.cc +++ b/chrome/browser/ui/views/importer/import_progress_dialog_view.cc @@ -13,10 +13,10 @@ #include "grit/locale_settings.h" #include "ui/base/l10n/l10n_util.h" #include "ui/views/controls/label.h" +#include "ui/views/controls/throbber.h" #include "ui/views/layout/grid_layout.h" #include "ui/views/layout/layout_constants.h" #include "ui/views/widget/widget.h" -#include "views/controls/throbber.h" ImportProgressDialogView::ImportProgressDialogView( HWND parent_window, diff --git a/chrome/browser/ui/views/infobars/infobar_view.cc b/chrome/browser/ui/views/infobars/infobar_view.cc index f805591..aaff170 100644 --- a/chrome/browser/ui/views/infobars/infobar_view.cc +++ b/chrome/browser/ui/views/infobars/infobar_view.cc @@ -27,6 +27,7 @@ #include "ui/views/controls/button/image_button.h" #include "ui/views/controls/button/menu_button.h" #include "ui/views/controls/button/text_button.h" +#include "ui/views/controls/image_view.h" #include "ui/views/controls/label.h" #include "ui/views/controls/link.h" #include "ui/views/controls/menu/menu_model_adapter.h" @@ -34,7 +35,6 @@ #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/image_view.h" #if defined(OS_WIN) #include "base/win/win_util.h" diff --git a/chrome/browser/ui/views/js_modal_dialog_views.cc b/chrome/browser/ui/views/js_modal_dialog_views.cc index ead4644..b303d95 100644 --- a/chrome/browser/ui/views/js_modal_dialog_views.cc +++ b/chrome/browser/ui/views/js_modal_dialog_views.cc @@ -12,9 +12,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/controls/message_box_view.h" #include "ui/views/controls/textfield/textfield.h" #include "ui/views/widget/widget.h" -#include "views/controls/message_box_view.h" //////////////////////////////////////////////////////////////////////////////// // JSModalDialogViews, public: diff --git a/chrome/browser/ui/views/location_bar/content_setting_image_view.h b/chrome/browser/ui/views/location_bar/content_setting_image_view.h index 4731cfb..34643fe 100644 --- a/chrome/browser/ui/views/location_bar/content_setting_image_view.h +++ b/chrome/browser/ui/views/location_bar/content_setting_image_view.h @@ -11,7 +11,7 @@ #include "base/string16.h" #include "chrome/common/content_settings_types.h" #include "ui/base/animation/linear_animation.h" -#include "views/controls/image_view.h" +#include "ui/views/controls/image_view.h" class ContentSettingImageModel; class ContentSettingBubbleContents; diff --git a/chrome/browser/ui/views/location_bar/icon_label_bubble_view.cc b/chrome/browser/ui/views/location_bar/icon_label_bubble_view.cc index 64dc948..87a4563 100644 --- a/chrome/browser/ui/views/location_bar/icon_label_bubble_view.cc +++ b/chrome/browser/ui/views/location_bar/icon_label_bubble_view.cc @@ -9,8 +9,8 @@ #include "grit/theme_resources.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/canvas.h" +#include "ui/views/controls/image_view.h" #include "ui/views/controls/label.h" -#include "views/controls/image_view.h" // Amount of padding at the edges of the bubble. static const int kBubbleOuterPadding = LocationBarView::kEdgeItemPadding - diff --git a/chrome/browser/ui/views/location_bar/location_icon_view.h b/chrome/browser/ui/views/location_bar/location_icon_view.h index 66a9d03..c7f3828 100644 --- a/chrome/browser/ui/views/location_bar/location_icon_view.h +++ b/chrome/browser/ui/views/location_bar/location_icon_view.h @@ -7,7 +7,7 @@ #pragma once #include "chrome/browser/ui/views/location_bar/click_handler.h" -#include "views/controls/image_view.h" +#include "ui/views/controls/image_view.h" class LocationBarView; namespace views { diff --git a/chrome/browser/ui/views/location_bar/page_action_image_view.h b/chrome/browser/ui/views/location_bar/page_action_image_view.h index ea0d333..ab81007 100644 --- a/chrome/browser/ui/views/location_bar/page_action_image_view.h +++ b/chrome/browser/ui/views/location_bar/page_action_image_view.h @@ -10,10 +10,10 @@ #include <string> #include "base/memory/scoped_ptr.h" -#include "chrome/browser/extensions/image_loading_tracker.h" #include "chrome/browser/extensions/extension_context_menu_model.h" +#include "chrome/browser/extensions/image_loading_tracker.h" #include "chrome/browser/ui/views/extensions/extension_popup.h" -#include "views/controls/image_view.h" +#include "ui/views/controls/image_view.h" class LocationBarView; namespace views { diff --git a/chrome/browser/ui/views/location_bar/star_view.h b/chrome/browser/ui/views/location_bar/star_view.h index 7125287..e460b2b 100644 --- a/chrome/browser/ui/views/location_bar/star_view.h +++ b/chrome/browser/ui/views/location_bar/star_view.h @@ -6,7 +6,7 @@ #define CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_STAR_VIEW_H_ #pragma once -#include "views/controls/image_view.h" +#include "ui/views/controls/image_view.h" class CommandUpdater; diff --git a/chrome/browser/ui/views/page_info_bubble_view.cc b/chrome/browser/ui/views/page_info_bubble_view.cc index fe3a5b8..6cc5cb7 100644 --- a/chrome/browser/ui/views/page_info_bubble_view.cc +++ b/chrome/browser/ui/views/page_info_bubble_view.cc @@ -21,12 +21,12 @@ #include "ui/gfx/canvas.h" #include "ui/gfx/canvas_skia.h" #include "ui/gfx/image/image.h" +#include "ui/views/controls/image_view.h" #include "ui/views/controls/label.h" #include "ui/views/controls/link.h" +#include "ui/views/controls/separator.h" #include "ui/views/layout/grid_layout.h" #include "ui/views/widget/widget.h" -#include "views/controls/image_view.h" -#include "views/controls/separator.h" namespace { diff --git a/chrome/browser/ui/views/repost_form_warning_view.cc b/chrome/browser/ui/views/repost_form_warning_view.cc index c7ade24..325f80e 100644 --- a/chrome/browser/ui/views/repost_form_warning_view.cc +++ b/chrome/browser/ui/views/repost_form_warning_view.cc @@ -15,7 +15,7 @@ #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/message_box_flags.h" -#include "views/controls/message_box_view.h" +#include "ui/views/controls/message_box_view.h" namespace browser { diff --git a/chrome/browser/ui/views/restart_message_box.cc b/chrome/browser/ui/views/restart_message_box.cc index 97af8635d..633895e 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/controls/message_box_view.h" #include "ui/views/widget/widget.h" -#include "views/controls/message_box_view.h" //////////////////////////////////////////////////////////////////////////////// // RestartMessageBox, public: diff --git a/chrome/browser/ui/views/sad_tab_view.cc b/chrome/browser/ui/views/sad_tab_view.cc index 68d485d..c5f7fe6 100644 --- a/chrome/browser/ui/views/sad_tab_view.cc +++ b/chrome/browser/ui/views/sad_tab_view.cc @@ -18,10 +18,10 @@ #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/font.h" #include "ui/views/controls/button/text_button.h" +#include "ui/views/controls/image_view.h" #include "ui/views/controls/label.h" #include "ui/views/controls/link.h" #include "ui/views/layout/grid_layout.h" -#include "views/controls/image_view.h" static const int kPadding = 20; static const float kMessageSize = 0.65f; diff --git a/chrome/browser/ui/views/simple_message_box_views.cc b/chrome/browser/ui/views/simple_message_box_views.cc index 0705896..aa55cd1 100644 --- a/chrome/browser/ui/views/simple_message_box_views.cc +++ b/chrome/browser/ui/views/simple_message_box_views.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/controls/message_box_view.h" #include "ui/views/widget/widget.h" -#include "views/controls/message_box_view.h" #if defined(USE_AURA) #include "ui/views/focus/accelerator_handler.h" diff --git a/chrome/browser/ui/views/tabs/tab_strip.cc b/chrome/browser/ui/views/tabs/tab_strip.cc index 457e892..9b076fc 100644 --- a/chrome/browser/ui/views/tabs/tab_strip.cc +++ b/chrome/browser/ui/views/tabs/tab_strip.cc @@ -28,10 +28,10 @@ #include "ui/gfx/canvas_skia.h" #include "ui/gfx/path.h" #include "ui/gfx/size.h" +#include "ui/views/controls/image_view.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" #if defined(OS_WIN) #include "ui/base/win/hwnd_util.h" diff --git a/chrome/browser/ui/views/update_recommended_message_box.cc b/chrome/browser/ui/views/update_recommended_message_box.cc index ee86b12..ae2b945 100644 --- a/chrome/browser/ui/views/update_recommended_message_box.cc +++ b/chrome/browser/ui/views/update_recommended_message_box.cc @@ -13,8 +13,8 @@ #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/message_box_flags.h" +#include "ui/views/controls/message_box_view.h" #include "ui/views/widget/widget.h" -#include "views/controls/message_box_view.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 cb1e178..d466fb3 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/controls/message_box_view.h" #include "ui/views/widget/widget.h" -#include "views/controls/message_box_view.h" // static FilePath UserDataDirDialog::RunUserDataDirDialog( diff --git a/chrome/browser/ui/views/web_intent_picker_view.cc b/chrome/browser/ui/views/web_intent_picker_view.cc index 2063533..eacdd5d 100644 --- a/chrome/browser/ui/views/web_intent_picker_view.cc +++ b/chrome/browser/ui/views/web_intent_picker_view.cc @@ -22,9 +22,9 @@ #include "ui/gfx/canvas_skia.h" #include "ui/gfx/image/image.h" #include "ui/views/controls/button/image_button.h" +#include "ui/views/controls/image_view.h" #include "ui/views/controls/label.h" #include "ui/views/layout/box_layout.h" -#include "views/controls/image_view.h" namespace { diff --git a/ui/aura_shell/drag_image_view.h b/ui/aura_shell/drag_image_view.h index ecc665c..6f92ea3 100644 --- a/ui/aura_shell/drag_image_view.h +++ b/ui/aura_shell/drag_image_view.h @@ -6,7 +6,7 @@ #define UI_AURA_SHELL_DRAG_IMAGE_VIEW_H_ #pragma once -#include "views/controls/image_view.h" +#include "ui/views/controls/image_view.h" namespace views { class Widget; diff --git a/ui/views/controls/combobox/native_combobox_gtk.h b/ui/views/controls/combobox/native_combobox_gtk.h index 9466dcd..7b08410 100644 --- a/ui/views/controls/combobox/native_combobox_gtk.h +++ b/ui/views/controls/combobox/native_combobox_gtk.h @@ -8,7 +8,7 @@ #include "ui/base/gtk/gtk_signal.h" #include "ui/views/controls/combobox/native_combobox_wrapper.h" -#include "views/controls/native_control_gtk.h" +#include "ui/views/controls/native_control_gtk.h" namespace views { diff --git a/ui/views/controls/combobox/native_combobox_views.cc b/ui/views/controls/combobox/native_combobox_views.cc index 4c3bc63..4311b8f 100644 --- a/ui/views/controls/combobox/native_combobox_views.cc +++ b/ui/views/controls/combobox/native_combobox_views.cc @@ -16,13 +16,13 @@ #include "ui/gfx/font.h" #include "ui/gfx/path.h" #include "ui/views/controls/combobox/combobox.h" +#include "ui/views/controls/focusable_border.h" #include "ui/views/controls/menu/menu_runner.h" #include "ui/views/controls/menu/submenu_view.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/focusable_border.h" #if defined(OS_LINUX) #include "ui/gfx/gtk_util.h" diff --git a/ui/views/controls/combobox/native_combobox_win.h b/ui/views/controls/combobox/native_combobox_win.h index ee22cee..e71e3fe 100644 --- a/ui/views/controls/combobox/native_combobox_win.h +++ b/ui/views/controls/combobox/native_combobox_win.h @@ -7,7 +7,7 @@ #pragma once #include "ui/views/controls/combobox/native_combobox_wrapper.h" -#include "views/controls/native_control_win.h" +#include "ui/views/controls/native_control_win.h" namespace views { diff --git a/views/controls/focusable_border.cc b/ui/views/controls/focusable_border.cc index 7681539..c90ee67 100644 --- a/views/controls/focusable_border.cc +++ b/ui/views/controls/focusable_border.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "views/controls/focusable_border.h" +#include "ui/views/controls/focusable_border.h" #include "ui/gfx/canvas.h" #include "ui/gfx/canvas_skia.h" diff --git a/views/controls/focusable_border.h b/ui/views/controls/focusable_border.h index 59f9e45..098809b 100644 --- a/views/controls/focusable_border.h +++ b/ui/views/controls/focusable_border.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_CONTROLS_FOCUSABLE_BORDER_H_ -#define VIEWS_CONTROLS_FOCUSABLE_BORDER_H_ +#ifndef UI_VIEWS_CONTROLS_FOCUSABLE_BORDER_H_ +#define UI_VIEWS_CONTROLS_FOCUSABLE_BORDER_H_ #pragma once #include "base/basictypes.h" @@ -44,4 +44,4 @@ class FocusableBorder : public Border { } // namespace views -#endif // VIEWS_CONTROLS_FOCUSABLE_BORDER_H_ +#endif // UI_VIEWS_CONTROLS_FOCUSABLE_BORDER_H_ diff --git a/views/controls/image_view.cc b/ui/views/controls/image_view.cc index c6a5441..92c1513 100644 --- a/views/controls/image_view.cc +++ b/ui/views/controls/image_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/controls/image_view.h" +#include "ui/views/controls/image_view.h" #include "base/logging.h" #include "base/utf_string_conversions.h" diff --git a/views/controls/image_view.h b/ui/views/controls/image_view.h index 8207aa3..1149c8d 100644 --- a/views/controls/image_view.h +++ b/ui/views/controls/image_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_CONTROLS_IMAGE_VIEW_H_ -#define VIEWS_CONTROLS_IMAGE_VIEW_H_ +#ifndef UI_VIEWS_CONTROLS_IMAGE_VIEW_H_ +#define UI_VIEWS_CONTROLS_IMAGE_VIEW_H_ #pragma once #include "third_party/skia/include/core/SkBitmap.h" @@ -109,4 +109,4 @@ class VIEWS_EXPORT ImageView : public View { } // namespace views -#endif // VIEWS_CONTROLS_IMAGE_VIEW_H_ +#endif // UI_VIEWS_CONTROLS_IMAGE_VIEW_H_ diff --git a/views/controls/message_box_view.cc b/ui/views/controls/message_box_view.cc index 0da57c1..b9564fe 100644 --- a/views/controls/message_box_view.cc +++ b/ui/views/controls/message_box_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/controls/message_box_view.h" +#include "ui/views/controls/message_box_view.h" #include "base/i18n/rtl.h" #include "base/message_loop.h" @@ -12,13 +12,13 @@ #include "ui/base/clipboard/scoped_clipboard_writer.h" #include "ui/base/message_box_flags.h" #include "ui/views/controls/button/checkbox.h" +#include "ui/views/controls/image_view.h" #include "ui/views/controls/label.h" #include "ui/views/controls/textfield/textfield.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/image_view.h" #include "views/views_delegate.h" const int kDefaultMessageWidth = 320; diff --git a/views/controls/message_box_view.h b/ui/views/controls/message_box_view.h index 5416b4b..64e1f27 100644 --- a/views/controls/message_box_view.h +++ b/ui/views/controls/message_box_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_CONTROLS_MESSAGE_BOX_VIEW_H_ -#define VIEWS_CONTROLS_MESSAGE_BOX_VIEW_H_ +#ifndef UI_VIEWS_CONTROLS_MESSAGE_BOX_VIEW_H_ +#define UI_VIEWS_CONTROLS_MESSAGE_BOX_VIEW_H_ #pragma once #include <string> @@ -96,4 +96,4 @@ class VIEWS_EXPORT MessageBoxView : public View { } // namespace views -#endif // VIEWS_CONTROLS_MESSAGE_BOX_VIEW_H_ +#endif // UI_VIEWS_CONTROLS_MESSAGE_BOX_VIEW_H_ diff --git a/views/controls/native_control.cc b/ui/views/controls/native_control.cc index 7f221f3..7edbda6 100644 --- a/views/controls/native_control.cc +++ b/ui/views/controls/native_control.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/controls/native_control.h" +#include "ui/views/controls/native_control.h" #include <atlbase.h> #include <atlapp.h> diff --git a/views/controls/native_control.h b/ui/views/controls/native_control.h index 7092b2f..ba419c1 100644 --- a/views/controls/native_control.h +++ b/ui/views/controls/native_control.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_CONTROLS_NATIVE_CONTROL_H_ -#define VIEWS_CONTROLS_NATIVE_CONTROL_H_ +#ifndef UI_VIEWS_CONTROLS_NATIVE_CONTROL_H_ +#define UI_VIEWS_CONTROLS_NATIVE_CONTROL_H_ #pragma once #include <windows.h> @@ -123,4 +123,4 @@ class VIEWS_EXPORT NativeControl : public View { } // namespace views -#endif // VIEWS_CONTROLS_NATIVE_CONTROL_H_ +#endif // UI_VIEWS_CONTROLS_NATIVE_CONTROL_H_ diff --git a/views/controls/native_control_gtk.cc b/ui/views/controls/native_control_gtk.cc index 24410f4..417e8a8 100644 --- a/views/controls/native_control_gtk.cc +++ b/ui/views/controls/native_control_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/controls/native_control_gtk.h" +#include "ui/views/controls/native_control_gtk.h" #include <gtk/gtk.h> diff --git a/views/controls/native_control_gtk.h b/ui/views/controls/native_control_gtk.h index 9dc88f0..a72c943 100644 --- a/views/controls/native_control_gtk.h +++ b/ui/views/controls/native_control_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_CONTROLS_NATIVE_CONTROL_GTK_H_ -#define VIEWS_CONTROLS_NATIVE_CONTROL_GTK_H_ +#ifndef UI_VIEWS_CONTROLS_NATIVE_CONTROL_GTK_H_ +#define UI_VIEWS_CONTROLS_NATIVE_CONTROL_GTK_H_ #pragma once #include <gtk/gtk.h> @@ -49,4 +49,4 @@ class NativeControlGtk : public NativeViewHost { } // namespace views -#endif // #ifndef VIEWS_CONTROLS_NATIVE_CONTROL_GTK_H_ +#endif // UI_VIEWS_CONTROLS_NATIVE_CONTROL_GTK_H_ diff --git a/views/controls/native_control_win.cc b/ui/views/controls/native_control_win.cc index d4e6989..2b71964 100644 --- a/views/controls/native_control_win.cc +++ b/ui/views/controls/native_control_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/controls/native_control_win.h" +#include "ui/views/controls/native_control_win.h" #include <windowsx.h> diff --git a/views/controls/native_control_win.h b/ui/views/controls/native_control_win.h index f5be1ec..f8a002b 100644 --- a/views/controls/native_control_win.h +++ b/ui/views/controls/native_control_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_CONTROLS_NATIVE_CONTROL_WIN_H_ -#define VIEWS_CONTROLS_NATIVE_CONTROL_WIN_H_ +#ifndef UI_VIEWS_CONTROLS_NATIVE_CONTROL_WIN_H_ +#define UI_VIEWS_CONTROLS_NATIVE_CONTROL_WIN_H_ #pragma once #include "base/basictypes.h" @@ -98,4 +98,4 @@ class NativeControlWin : public ChildWindowMessageProcessor, } // namespace views -#endif // VIEWS_CONTROLS_NATIVE_CONTROL_WIN_H_ +#endif // UI_VIEWS_CONTROLS_NATIVE_CONTROL_WIN_H_ diff --git a/views/controls/progress_bar.cc b/ui/views/controls/progress_bar.cc index 41c69ec..74943bb 100644 --- a/views/controls/progress_bar.cc +++ b/ui/views/controls/progress_bar.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/controls/progress_bar.h" +#include "ui/views/controls/progress_bar.h" #include <algorithm> #include <string> diff --git a/views/controls/progress_bar.h b/ui/views/controls/progress_bar.h index aaaee03..02674de 100644 --- a/views/controls/progress_bar.h +++ b/ui/views/controls/progress_bar.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_CONTROLS_PROGRESS_BAR_H_ -#define VIEWS_CONTROLS_PROGRESS_BAR_H_ +#ifndef UI_VIEWS_CONTROLS_PROGRESS_BAR_H_ +#define UI_VIEWS_CONTROLS_PROGRESS_BAR_H_ #pragma once #include "base/basictypes.h" @@ -62,4 +62,4 @@ class VIEWS_EXPORT ProgressBar : public View { } // namespace views -#endif // VIEWS_CONTROLS_PROGRESS_BAR_H_ +#endif // UI_VIEWS_CONTROLS_PROGRESS_BAR_H_ diff --git a/views/controls/progress_bar_unittest.cc b/ui/views/controls/progress_bar_unittest.cc index 7d62b99..71cdb20 100644 --- a/views/controls/progress_bar_unittest.cc +++ b/ui/views/controls/progress_bar_unittest.cc @@ -6,7 +6,7 @@ #include "base/utf_string_conversions.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/base/accessibility/accessible_view_state.h" -#include "views/controls/progress_bar.h" +#include "ui/views/controls/progress_bar.h" namespace views { diff --git a/views/controls/resize_area.cc b/ui/views/controls/resize_area.cc index 88ac5b5..832ebec 100644 --- a/views/controls/resize_area.cc +++ b/ui/views/controls/resize_area.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/controls/resize_area.h" +#include "ui/views/controls/resize_area.h" #include "base/logging.h" #include "ui/base/accessibility/accessible_view_state.h" #include "ui/base/resource/resource_bundle.h" -#include "views/controls/resize_area_delegate.h" +#include "ui/views/controls/resize_area_delegate.h" #if defined(OS_LINUX) #include "ui/gfx/gtk_util.h" diff --git a/views/controls/resize_area.h b/ui/views/controls/resize_area.h index 3f06a1e..1cebd9d 100644 --- a/views/controls/resize_area.h +++ b/ui/views/controls/resize_area.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_CONTROLS_RESIZE_AREA_H_ -#define VIEWS_CONTROLS_RESIZE_AREA_H_ +#ifndef UI_VIEWS_CONTROLS_RESIZE_AREA_H_ +#define UI_VIEWS_CONTROLS_RESIZE_AREA_H_ #pragma once #include <string> @@ -51,4 +51,4 @@ class VIEWS_EXPORT ResizeArea : public View { } // namespace views -#endif // VIEWS_CONTROLS_RESIZE_AREA_H_ +#endif // UI_VIEWS_CONTROLS_RESIZE_AREA_H_ diff --git a/views/controls/resize_area_delegate.h b/ui/views/controls/resize_area_delegate.h index 041495f..ad8b3bf 100644 --- a/views/controls/resize_area_delegate.h +++ b/ui/views/controls/resize_area_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_CONTROLS_RESIZE_AREA_DELEGATE_H_ -#define VIEWS_CONTROLS_RESIZE_AREA_DELEGATE_H_ +#ifndef UI_VIEWS_CONTROLS_RESIZE_AREA_DELEGATE_H_ +#define UI_VIEWS_CONTROLS_RESIZE_AREA_DELEGATE_H_ #pragma once namespace views { @@ -26,4 +26,4 @@ class ResizeAreaDelegate { } // namespace views -#endif // VIEWS_CONTROLS_RESIZE_AREA_DELEGATE_H_ +#endif // UI_VIEWS_CONTROLS_RESIZE_AREA_DELEGATE_H_ diff --git a/views/controls/scroll_view.cc b/ui/views/controls/scroll_view.cc index 43d8377..8d67d28 100644 --- a/views/controls/scroll_view.cc +++ b/ui/views/controls/scroll_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/controls/scroll_view.h" +#include "ui/views/controls/scroll_view.h" #include "base/logging.h" #include "ui/views/controls/scrollbar/native_scroll_bar.h" diff --git a/views/controls/scroll_view.h b/ui/views/controls/scroll_view.h index b8aac47..a7f84fd 100644 --- a/views/controls/scroll_view.h +++ b/ui/views/controls/scroll_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_CONTROLS_SCROLL_VIEW_H_ -#define VIEWS_CONTROLS_SCROLL_VIEW_H_ +#ifndef UI_VIEWS_CONTROLS_SCROLL_VIEW_H_ +#define UI_VIEWS_CONTROLS_SCROLL_VIEW_H_ #pragma once #include <string> @@ -204,4 +204,4 @@ class FixedRowHeightScrollHelper : public VariableRowHeightScrollHelper { } // namespace views -#endif // VIEWS_CONTROLS_SCROLL_VIEW_H_ +#endif // UI_VIEWS_CONTROLS_SCROLL_VIEW_H_ diff --git a/ui/views/controls/scrollbar/base_scroll_bar.cc b/ui/views/controls/scrollbar/base_scroll_bar.cc index 3afb238..54d4b44 100644 --- a/ui/views/controls/scrollbar/base_scroll_bar.cc +++ b/ui/views/controls/scrollbar/base_scroll_bar.cc @@ -18,9 +18,9 @@ #include "ui/gfx/canvas.h" #include "ui/views/controls/menu/menu_item_view.h" #include "ui/views/controls/menu/menu_runner.h" +#include "ui/views/controls/scroll_view.h" #include "ui/views/controls/scrollbar/base_scroll_bar_thumb.h" #include "ui/views/widget/widget.h" -#include "views/controls/scroll_view.h" #if defined(OS_LINUX) #include "ui/gfx/screen.h" diff --git a/ui/views/controls/scrollbar/bitmap_scroll_bar.cc b/ui/views/controls/scrollbar/bitmap_scroll_bar.cc index 6aa44d5..47c8f13 100644 --- a/ui/views/controls/scrollbar/bitmap_scroll_bar.cc +++ b/ui/views/controls/scrollbar/bitmap_scroll_bar.cc @@ -18,9 +18,9 @@ #include "ui/base/l10n/l10n_util.h" #include "ui/gfx/canvas.h" #include "ui/views/controls/menu/menu.h" +#include "ui/views/controls/scroll_view.h" #include "ui/views/controls/scrollbar/base_scroll_bar_thumb.h" #include "ui/views/widget/widget.h" -#include "views/controls/scroll_view.h" #if defined(OS_LINUX) #include "views/screen.h" diff --git a/ui/views/controls/scrollbar/native_scroll_bar_gtk.h b/ui/views/controls/scrollbar/native_scroll_bar_gtk.h index 909adfe..e9a5ed5 100644 --- a/ui/views/controls/scrollbar/native_scroll_bar_gtk.h +++ b/ui/views/controls/scrollbar/native_scroll_bar_gtk.h @@ -7,8 +7,8 @@ #pragma once #include "base/compiler_specific.h" +#include "ui/views/controls/native_control_gtk.h" #include "ui/views/controls/scrollbar/native_scroll_bar_wrapper.h" -#include "views/controls/native_control_gtk.h" namespace views { diff --git a/ui/views/controls/scrollbar/native_scroll_bar_views.cc b/ui/views/controls/scrollbar/native_scroll_bar_views.cc index 29c5f6f..fba93d09 100644 --- a/ui/views/controls/scrollbar/native_scroll_bar_views.cc +++ b/ui/views/controls/scrollbar/native_scroll_bar_views.cc @@ -10,11 +10,11 @@ #include "ui/gfx/canvas_skia.h" #include "ui/gfx/path.h" #include "ui/views/controls/button/custom_button.h" +#include "ui/views/controls/focusable_border.h" #include "ui/views/controls/scrollbar/base_scroll_bar_button.h" #include "ui/views/controls/scrollbar/base_scroll_bar_thumb.h" #include "ui/views/controls/scrollbar/native_scroll_bar.h" #include "ui/views/controls/scrollbar/scroll_bar.h" -#include "views/controls/focusable_border.h" namespace views { diff --git a/ui/views/controls/scrollbar/native_scroll_bar_win.h b/ui/views/controls/scrollbar/native_scroll_bar_win.h index 33e369e..1f7ec36 100644 --- a/ui/views/controls/scrollbar/native_scroll_bar_win.h +++ b/ui/views/controls/scrollbar/native_scroll_bar_win.h @@ -6,8 +6,8 @@ #define UI_VIEWS_CONTROLS_SCROLLBAR_NATIVE_SCROLL_BAR_WIN_H_ #pragma once +#include "ui/views/controls/native_control_win.h" #include "ui/views/controls/scrollbar/native_scroll_bar_wrapper.h" -#include "views/controls/native_control_win.h" namespace views { diff --git a/views/controls/separator.cc b/ui/views/controls/separator.cc index 7d3d99d..2842068 100644 --- a/views/controls/separator.cc +++ b/ui/views/controls/separator.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/controls/separator.h" +#include "ui/views/controls/separator.h" #include "ui/base/accessibility/accessible_view_state.h" #include "ui/gfx/canvas.h" diff --git a/views/controls/separator.h b/ui/views/controls/separator.h index b9f1eff..f47d238 100644 --- a/views/controls/separator.h +++ b/ui/views/controls/separator.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_CONTROLS_SEPARATOR_H_ -#define VIEWS_CONTROLS_SEPARATOR_H_ +#ifndef UI_VIEWS_CONTROLS_SEPARATOR_H_ +#define UI_VIEWS_CONTROLS_SEPARATOR_H_ #pragma once #include <string> @@ -35,4 +35,4 @@ class VIEWS_EXPORT Separator : public View { } // namespace views -#endif // VIEWS_CONTROLS_SEPARATOR_H_ +#endif // UI_VIEWS_CONTROLS_SEPARATOR_H_ diff --git a/views/controls/single_split_view.cc b/ui/views/controls/single_split_view.cc index 79df3fd..333c388 100644 --- a/views/controls/single_split_view.cc +++ b/ui/views/controls/single_split_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/controls/single_split_view.h" +#include "ui/views/controls/single_split_view.h" #if defined(TOOLKIT_USES_GTK) #include <gdk/gdk.h> @@ -11,8 +11,8 @@ #include "skia/ext/skia_utils_win.h" #include "ui/base/accessibility/accessible_view_state.h" #include "ui/gfx/canvas.h" +#include "ui/views/controls/single_split_view_listener.h" #include "views/background.h" -#include "views/controls/single_split_view_listener.h" #if defined(TOOLKIT_USES_GTK) #include "ui/gfx/gtk_util.h" @@ -26,7 +26,7 @@ namespace views { // static const char SingleSplitView::kViewClassName[] = - "views/controls/SingleSplitView"; + "ui/views/controls/SingleSplitView"; // Size of the divider in pixels. static const int kDividerSize = 4; diff --git a/views/controls/single_split_view.h b/ui/views/controls/single_split_view.h index 7cb8540..c3f2bc3 100644 --- a/views/controls/single_split_view.h +++ b/ui/views/controls/single_split_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_CONTROLS_SINGLE_SPLIT_VIEW_H_ -#define VIEWS_CONTROLS_SINGLE_SPLIT_VIEW_H_ +#ifndef UI_VIEWS_CONTROLS_SINGLE_SPLIT_VIEW_H_ +#define UI_VIEWS_CONTROLS_SINGLE_SPLIT_VIEW_H_ #pragma once #include "base/gtest_prod_util.h" @@ -131,4 +131,4 @@ class VIEWS_EXPORT SingleSplitView : public View { } // namespace views -#endif // VIEWS_CONTROLS_SINGLE_SPLIT_VIEW_H_ +#endif // UI_VIEWS_CONTROLS_SINGLE_SPLIT_VIEW_H_ diff --git a/views/controls/single_split_view_listener.h b/ui/views/controls/single_split_view_listener.h index 6d38aad..580ac82 100644 --- a/views/controls/single_split_view_listener.h +++ b/ui/views/controls/single_split_view_listener.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_CONTROLS_SINGLE_SPLIT_VIEW_LISTENER_H_ -#define VIEWS_CONTROLS_SINGLE_SPLIT_VIEW_LISTENER_H_ +#ifndef UI_VIEWS_CONTROLS_SINGLE_SPLIT_VIEW_LISTENER_H_ +#define UI_VIEWS_CONTROLS_SINGLE_SPLIT_VIEW_LISTENER_H_ #pragma once namespace views { @@ -26,4 +26,4 @@ class SingleSplitViewListener { } // namespace views -#endif // VIEWS_CONTROLS_SINGLE_SPLIT_VIEW_LISTENER_H_ +#endif // UI_VIEWS_CONTROLS_SINGLE_SPLIT_VIEW_LISTENER_H_ diff --git a/views/controls/single_split_view_unittest.cc b/ui/views/controls/single_split_view_unittest.cc index 28a9aa0..891a877 100644 --- a/views/controls/single_split_view_unittest.cc +++ b/ui/views/controls/single_split_view_unittest.cc @@ -5,8 +5,8 @@ #include "base/logging.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" -#include "views/controls/single_split_view.h" -#include "views/controls/single_split_view_listener.h" +#include "ui/views/controls/single_split_view.h" +#include "ui/views/controls/single_split_view_listener.h" using ::testing::_; using ::testing::Return; diff --git a/ui/views/controls/tabbed_pane/native_tabbed_pane_gtk.h b/ui/views/controls/tabbed_pane/native_tabbed_pane_gtk.h index c37af6c..b937cb2 100644 --- a/ui/views/controls/tabbed_pane/native_tabbed_pane_gtk.h +++ b/ui/views/controls/tabbed_pane/native_tabbed_pane_gtk.h @@ -8,8 +8,8 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" +#include "ui/views/controls/native_control_gtk.h" #include "ui/views/controls/tabbed_pane/native_tabbed_pane_wrapper.h" -#include "views/controls/native_control_gtk.h" namespace views { diff --git a/ui/views/controls/tabbed_pane/native_tabbed_pane_win.h b/ui/views/controls/tabbed_pane/native_tabbed_pane_win.h index 8935c1a..6532438 100644 --- a/ui/views/controls/tabbed_pane/native_tabbed_pane_win.h +++ b/ui/views/controls/tabbed_pane/native_tabbed_pane_win.h @@ -8,8 +8,8 @@ #include <vector> +#include "ui/views/controls/native_control_win.h" #include "ui/views/controls/tabbed_pane/native_tabbed_pane_wrapper.h" -#include "views/controls/native_control_win.h" namespace views { diff --git a/ui/views/controls/table/native_table_gtk.h b/ui/views/controls/table/native_table_gtk.h index 3ebb51f..df63faf 100644 --- a/ui/views/controls/table/native_table_gtk.h +++ b/ui/views/controls/table/native_table_gtk.h @@ -9,8 +9,8 @@ #include "base/compiler_specific.h" #include "ui/base/gtk/gtk_signal.h" #include "ui/base/models/table_model.h" +#include "ui/views/controls/native_control_gtk.h" #include "ui/views/controls/table/native_table_wrapper.h" -#include "views/controls/native_control_gtk.h" namespace views { diff --git a/ui/views/controls/table/native_table_win.h b/ui/views/controls/table/native_table_win.h index 810eb94..432b30c 100644 --- a/ui/views/controls/table/native_table_win.h +++ b/ui/views/controls/table/native_table_win.h @@ -9,8 +9,8 @@ #include <windows.h> #include "ui/base/models/table_model.h" +#include "ui/views/controls/native_control_win.h" #include "ui/views/controls/table/native_table_wrapper.h" -#include "views/controls/native_control_win.h" typedef struct tagNMLVCUSTOMDRAW NMLVCUSTOMDRAW; diff --git a/ui/views/controls/table/table_view.h b/ui/views/controls/table/table_view.h index e226f10..78a0f55 100644 --- a/ui/views/controls/table/table_view.h +++ b/ui/views/controls/table/table_view.h @@ -21,7 +21,7 @@ #include <windows.h> // TODO(port): remove the ifdef when native_control.h is ported. -#include "views/controls/native_control.h" +#include "ui/views/controls/native_control.h" typedef struct tagNMLVCUSTOMDRAW NMLVCUSTOMDRAW; #endif // defined(OS_WIN) diff --git a/ui/views/controls/textfield/native_textfield_gtk.h b/ui/views/controls/textfield/native_textfield_gtk.h index ea3151c..42a9680 100644 --- a/ui/views/controls/textfield/native_textfield_gtk.h +++ b/ui/views/controls/textfield/native_textfield_gtk.h @@ -10,8 +10,8 @@ #include "base/string16.h" #include "ui/base/gtk/gtk_signal.h" +#include "ui/views/controls/native_control_gtk.h" #include "ui/views/controls/textfield/native_textfield_wrapper.h" -#include "views/controls/native_control_gtk.h" namespace gfx { class SelectionModel; diff --git a/ui/views/controls/textfield/native_textfield_views.cc b/ui/views/controls/textfield/native_textfield_views.cc index 3e6a5f8..d5d0b56 100644 --- a/ui/views/controls/textfield/native_textfield_views.cc +++ b/ui/views/controls/textfield/native_textfield_views.cc @@ -18,6 +18,7 @@ #include "ui/gfx/canvas.h" #include "ui/gfx/insets.h" #include "ui/gfx/render_text.h" +#include "ui/views/controls/focusable_border.h" #include "ui/views/controls/menu/menu_item_view.h" #include "ui/views/controls/menu/menu_model_adapter.h" #include "ui/views/controls/menu/menu_runner.h" @@ -29,7 +30,6 @@ #include "ui/views/widget/widget.h" #include "views/background.h" #include "views/border.h" -#include "views/controls/focusable_border.h" #include "views/metrics.h" #include "views/views_delegate.h" diff --git a/views/controls/throbber.cc b/ui/views/controls/throbber.cc index 7719d0d..d323c00 100644 --- a/views/controls/throbber.cc +++ b/ui/views/controls/throbber.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/controls/throbber.h" +#include "ui/views/controls/throbber.h" #include "base/time.h" #include "grit/ui_resources.h" diff --git a/views/controls/throbber.h b/ui/views/controls/throbber.h index b2aa599..e40828f 100644 --- a/views/controls/throbber.h +++ b/ui/views/controls/throbber.h @@ -2,10 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Throbbers display an animation, usually used as a status indicator. - -#ifndef VIEWS_CONTROLS_THROBBER_H_ -#define VIEWS_CONTROLS_THROBBER_H_ +#ifndef UI_VIEWS_CONTROLS_THROBBER_H_ +#define UI_VIEWS_CONTROLS_THROBBER_H_ #pragma once #include "base/basictypes.h" @@ -18,6 +16,8 @@ class SkBitmap; namespace views { +// Throbbers display an animation, usually used as a status indicator. + class VIEWS_EXPORT Throbber : public View { public: // |frame_time_ms| is the amount of time that should elapse between frames @@ -125,4 +125,4 @@ class VIEWS_EXPORT CheckmarkThrobber : public Throbber { } // namespace views -#endif // VIEWS_CONTROLS_THROBBER_H_ +#endif // UI_VIEWS_CONTROLS_THROBBER_H_ diff --git a/ui/views/controls/tree/tree_view.h b/ui/views/controls/tree/tree_view.h index 9b1fd75..035d3f6 100644 --- a/ui/views/controls/tree/tree_view.h +++ b/ui/views/controls/tree/tree_view.h @@ -15,7 +15,7 @@ #include "base/compiler_specific.h" #include "ui/base/keycodes/keyboard_codes.h" #include "ui/base/models/tree_model.h" -#include "views/controls/native_control.h" +#include "ui/views/controls/native_control.h" namespace views { diff --git a/ui/views/examples/double_split_view_example.cc b/ui/views/examples/double_split_view_example.cc index 516c191..4620f72 100644 --- a/ui/views/examples/double_split_view_example.cc +++ b/ui/views/examples/double_split_view_example.cc @@ -4,8 +4,8 @@ #include "ui/views/examples/double_split_view_example.h" +#include "ui/views/controls/single_split_view.h" #include "ui/views/layout/grid_layout.h" -#include "views/controls/single_split_view.h" namespace { diff --git a/ui/views/examples/message_box_example.cc b/ui/views/examples/message_box_example.cc index e1b1542..942f22b 100644 --- a/ui/views/examples/message_box_example.cc +++ b/ui/views/examples/message_box_example.cc @@ -5,8 +5,8 @@ #include "ui/views/examples/message_box_example.h" #include "base/utf_string_conversions.h" +#include "ui/views/controls/message_box_view.h" #include "ui/views/layout/grid_layout.h" -#include "views/controls/message_box_view.h" #include "views/view.h" namespace views { diff --git a/ui/views/examples/progress_bar_example.cc b/ui/views/examples/progress_bar_example.cc index e28cad3..f355007 100644 --- a/ui/views/examples/progress_bar_example.cc +++ b/ui/views/examples/progress_bar_example.cc @@ -6,8 +6,8 @@ #include "base/utf_string_conversions.h" #include "ui/views/controls/button/text_button.h" +#include "ui/views/controls/progress_bar.h" #include "ui/views/layout/grid_layout.h" -#include "views/controls/progress_bar.h" #include "views/view.h" namespace { diff --git a/ui/views/examples/scroll_view_example.h b/ui/views/examples/scroll_view_example.h index 62de4e8..d18eac9 100644 --- a/ui/views/examples/scroll_view_example.h +++ b/ui/views/examples/scroll_view_example.h @@ -11,8 +11,8 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" #include "ui/views/controls/button/text_button.h" +#include "ui/views/controls/scroll_view.h" #include "ui/views/examples/example_base.h" -#include "views/controls/scroll_view.h" namespace views { namespace examples { diff --git a/ui/views/examples/single_split_view_example.cc b/ui/views/examples/single_split_view_example.cc index 6b703e3..70e4b19 100644 --- a/ui/views/examples/single_split_view_example.cc +++ b/ui/views/examples/single_split_view_example.cc @@ -4,8 +4,8 @@ #include "ui/views/examples/single_split_view_example.h" +#include "ui/views/controls/single_split_view.h" #include "ui/views/layout/grid_layout.h" -#include "views/controls/single_split_view.h" namespace views { namespace examples { diff --git a/ui/views/examples/single_split_view_example.h b/ui/views/examples/single_split_view_example.h index 9c9d919..c3a95be 100644 --- a/ui/views/examples/single_split_view_example.h +++ b/ui/views/examples/single_split_view_example.h @@ -8,8 +8,8 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" +#include "ui/views/controls/single_split_view_listener.h" #include "ui/views/examples/example_base.h" -#include "views/controls/single_split_view_listener.h" namespace views { namespace examples { diff --git a/ui/views/examples/throbber_example.cc b/ui/views/examples/throbber_example.cc index f25152a0..a3af5cf 100644 --- a/ui/views/examples/throbber_example.cc +++ b/ui/views/examples/throbber_example.cc @@ -4,8 +4,8 @@ #include "ui/views/examples/throbber_example.h" +#include "ui/views/controls/throbber.h" #include "ui/views/layout/fill_layout.h" -#include "views/controls/throbber.h" #include "views/view.h" namespace views { diff --git a/ui/views/focus/focus_traversal_unittest.cc b/ui/views/focus/focus_traversal_unittest.cc index 3605015..fc58df8 100644 --- a/ui/views/focus/focus_traversal_unittest.cc +++ b/ui/views/focus/focus_traversal_unittest.cc @@ -14,11 +14,11 @@ #include "ui/views/controls/label.h" #include "ui/views/controls/link.h" #include "ui/views/controls/native/native_view_host.h" +#include "ui/views/controls/scroll_view.h" #include "ui/views/controls/textfield/textfield.h" #include "ui/views/focus/focus_manager_test.h" #include "ui/views/widget/root_view.h" #include "ui/views/widget/widget.h" -#include "views/controls/scroll_view.h" #if !defined(USE_AURA) #include "ui/views/controls/tabbed_pane/tabbed_pane.h" diff --git a/ui/views/widget/native_widget_win.cc b/ui/views/widget/native_widget_win.cc index ce5ad17..f328ecb 100644 --- a/ui/views/widget/native_widget_win.cc +++ b/ui/views/widget/native_widget_win.cc @@ -33,6 +33,7 @@ #include "ui/gfx/path.h" #include "ui/gfx/screen.h" #include "ui/views/accessibility/native_view_accessibility_win.h" +#include "ui/views/controls/native_control_win.h" #include "ui/views/controls/textfield/native_textfield_views.h" #include "ui/views/focus/accelerator_handler.h" #include "ui/views/focus/view_storage.h" @@ -45,7 +46,6 @@ #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/views_delegate.h" #pragma comment(lib, "dwmapi.lib") diff --git a/views/view_unittest.cc b/views/view_unittest.cc index 1086827..baee824 100644 --- a/views/view_unittest.cc +++ b/views/view_unittest.cc @@ -24,6 +24,7 @@ #include "ui/views/controls/button/button_dropdown.h" #include "ui/views/controls/button/checkbox.h" #include "ui/views/controls/native/native_view_host.h" +#include "ui/views/controls/scroll_view.h" #include "ui/views/controls/textfield/textfield.h" #include "ui/views/events/event.h" #include "ui/views/focus/accelerator_handler.h" @@ -34,7 +35,6 @@ #include "ui/views/widget/root_view.h" #include "ui/views/window/dialog_delegate.h" #include "views/background.h" -#include "views/controls/scroll_view.h" #include "views/view.h" #include "views/views_delegate.h" diff --git a/views/views.gyp b/views/views.gyp index 821f387..bc9fb99 100644 --- a/views/views.gyp +++ b/views/views.gyp @@ -52,32 +52,6 @@ 'border.cc', 'border.h', 'context_menu_controller.h', - 'controls/focusable_border.cc', - 'controls/focusable_border.h', - 'controls/image_view.cc', - 'controls/image_view.h', - 'controls/message_box_view.cc', - 'controls/message_box_view.h', - 'controls/native_control.cc', - 'controls/native_control.h', - 'controls/native_control_gtk.cc', - 'controls/native_control_gtk.h', - 'controls/native_control_win.cc', - 'controls/native_control_win.h', - 'controls/progress_bar.h', - 'controls/progress_bar.cc', - 'controls/resize_area.cc', - 'controls/resize_area.h', - 'controls/resize_area_delegate.h', - 'controls/scroll_view.cc', - 'controls/scroll_view.h', - 'controls/separator.cc', - 'controls/separator.h', - 'controls/single_split_view.cc', - 'controls/single_split_view.h', - 'controls/single_split_view_listener.h', - 'controls/throbber.cc', - 'controls/throbber.h', #'debug_utils.cc', #'debug_utils.h', 'drag_controller.h', @@ -150,6 +124,10 @@ '../ui/views/controls/combobox/native_combobox_win.cc', '../ui/views/controls/combobox/native_combobox_win.h', '../ui/views/controls/combobox/native_combobox_wrapper.h', + '../ui/views/controls/focusable_border.cc', + '../ui/views/controls/focusable_border.h', + '../ui/views/controls/image_view.cc', + '../ui/views/controls/image_view.h', '../ui/views/controls/label.cc', '../ui/views/controls/label.h', '../ui/views/controls/link.cc', @@ -209,6 +187,14 @@ '../ui/views/controls/menu/submenu_view.cc', '../ui/views/controls/menu/submenu_view.h', '../ui/views/controls/menu/view_menu_delegate.h', + '../ui/views/controls/message_box_view.cc', + '../ui/views/controls/message_box_view.h', + '../ui/views/controls/native_control.cc', + '../ui/views/controls/native_control.h', + '../ui/views/controls/native_control_gtk.cc', + '../ui/views/controls/native_control_gtk.h', + '../ui/views/controls/native_control_win.cc', + '../ui/views/controls/native_control_win.h', '../ui/views/controls/native/native_view_host.cc', '../ui/views/controls/native/native_view_host.h', '../ui/views/controls/native/native_view_host_aura.cc', @@ -217,6 +203,13 @@ '../ui/views/controls/native/native_view_host_gtk.h', '../ui/views/controls/native/native_view_host_win.cc', '../ui/views/controls/native/native_view_host_win.h', + '../ui/views/controls/progress_bar.cc', + '../ui/views/controls/progress_bar.h', + '../ui/views/controls/resize_area.cc', + '../ui/views/controls/resize_area.h', + '../ui/views/controls/resize_area_delegate.h', + '../ui/views/controls/scroll_view.cc', + '../ui/views/controls/scroll_view.h', '../ui/views/controls/scrollbar/base_scroll_bar.cc', '../ui/views/controls/scrollbar/base_scroll_bar.h', '../ui/views/controls/scrollbar/base_scroll_bar_button.cc', @@ -236,6 +229,11 @@ '../ui/views/controls/scrollbar/native_scroll_bar.h', '../ui/views/controls/scrollbar/scroll_bar.cc', '../ui/views/controls/scrollbar/scroll_bar.h', + '../ui/views/controls/separator.cc', + '../ui/views/controls/separator.h', + '../ui/views/controls/single_split_view.cc', + '../ui/views/controls/single_split_view.h', + '../ui/views/controls/single_split_view_listener.h', '../ui/views/controls/tabbed_pane/native_tabbed_pane_gtk.cc', '../ui/views/controls/tabbed_pane/native_tabbed_pane_gtk.h', '../ui/views/controls/tabbed_pane/native_tabbed_pane_views.cc', @@ -274,6 +272,8 @@ '../ui/views/controls/textfield/textfield_controller.h', '../ui/views/controls/textfield/textfield_views_model.cc', '../ui/views/controls/textfield/textfield_views_model.h', + '../ui/views/controls/throbber.cc', + '../ui/views/controls/throbber.h', '../ui/views/controls/tree/tree_view.cc', '../ui/views/controls/tree/tree_view.h', '../ui/views/events/event.cc', @@ -395,12 +395,12 @@ ['exclude', '../ui/views/controls/menu/menu_2.*'], ], 'sources!': [ - 'controls/native_control.cc', - 'controls/native_control.h', 'drag_utils_win.cc', '../ui/views/controls/menu/menu_config_linux.cc', '../ui/views/controls/menu/menu_item_view_linux.cc', '../ui/views/controls/menu/menu_separator_linux.cc', + '../ui/views/controls/native_control.cc', + '../ui/views/controls/native_control.h', '../ui/views/controls/scrollbar/bitmap_scroll_bar.cc', '../ui/views/controls/scrollbar/bitmap_scroll_bar.h', '../ui/views/controls/table/group_table_view.cc', @@ -426,8 +426,8 @@ '../build/linux/system.gyp:xext', ], 'sources!': [ - 'controls/native_control.cc', '../ui/views/accessibility/native_view_accessibility_win.cc', + '../ui/views/controls/native_control.cc', '../ui/views/controls/scrollbar/bitmap_scroll_bar.cc', '../ui/views/controls/table/group_table_view.cc', '../ui/views/controls/table/table_view.cc', @@ -513,7 +513,9 @@ '../ui/views/controls/combobox/native_combobox_views_unittest.cc', '../ui/views/controls/label_unittest.cc', '../ui/views/controls/menu/menu_model_adapter_unittest.cc', + '../ui/views/controls/progress_bar_unittest.cc', '../ui/views/controls/scrollbar/scrollbar_unittest.cc', + '../ui/views/controls/single_split_view_unittest.cc', '../ui/views/controls/tabbed_pane/tabbed_pane_unittest.cc', '../ui/views/controls/table/table_view_unittest.cc', '../ui/views/controls/textfield/native_textfield_views_unittest.cc', @@ -539,8 +541,6 @@ '../ui/views/widget/native_widget_win_unittest.cc', '../ui/views/widget/widget_unittest.cc', 'accessible_pane_view_unittest.cc', - 'controls/progress_bar_unittest.cc', - 'controls/single_split_view_unittest.cc', 'run_all_unittests.cc', 'view_unittest.cc', |