diff options
Diffstat (limited to 'chrome/browser')
98 files changed, 122 insertions, 122 deletions
diff --git a/chrome/browser/chromeos/drop_shadow_label.h b/chrome/browser/chromeos/drop_shadow_label.h index 1be105d..e64f12d 100644 --- a/chrome/browser/chromeos/drop_shadow_label.h +++ b/chrome/browser/chromeos/drop_shadow_label.h @@ -7,7 +7,7 @@ #pragma once #include "ui/gfx/font.h" -#include "views/controls/label.h" +#include "ui/views/controls/label.h" namespace chromeos { diff --git a/chrome/browser/chromeos/frame/bubble_frame_view.cc b/chrome/browser/chromeos/frame/bubble_frame_view.cc index 4eb6fe6..9691fa9 100644 --- a/chrome/browser/chromeos/frame/bubble_frame_view.cc +++ b/chrome/browser/chromeos/frame/bubble_frame_view.cc @@ -20,9 +20,9 @@ #include "ui/gfx/path.h" #include "ui/gfx/rect.h" #include "ui/views/controls/button/image_button.h" +#include "ui/views/controls/label.h" #include "ui/views/widget/widget.h" #include "ui/views/widget/widget_delegate.h" -#include "views/controls/label.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 85e42e4..4de9fda 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/label.h" #include "ui/views/events/event.h" #include "ui/views/widget/widget.h" #include "views/controls/image_view.h" -#include "views/controls/label.h" #include "views/painter.h" #include "views/view.h" diff --git a/chrome/browser/chromeos/input_method/candidate_window.cc b/chrome/browser/chromeos/input_method/candidate_window.cc index b1416ed..85078ff 100644 --- a/chrome/browser/chromeos/input_method/candidate_window.cc +++ b/chrome/browser/chromeos/input_method/candidate_window.cc @@ -23,13 +23,13 @@ #include "ui/gfx/canvas.h" #include "ui/gfx/font.h" #include "ui/gfx/screen.h" +#include "ui/views/controls/label.h" #include "ui/views/controls/textfield/textfield.h" #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" namespace chromeos { namespace input_method { diff --git a/chrome/browser/chromeos/login/background_view.cc b/chrome/browser/chromeos/login/background_view.cc index 1a0f91d..16370c2 100644 --- a/chrome/browser/chromeos/login/background_view.cc +++ b/chrome/browser/chromeos/login/background_view.cc @@ -32,8 +32,8 @@ #include "ui/base/x/x11_util.h" #include "ui/gfx/gtk_util.h" #include "ui/views/controls/button/text_button.h" +#include "ui/views/controls/label.h" #include "ui/views/widget/widget.h" -#include "views/controls/label.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 b534c2c..266f041 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/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" -#include "views/controls/label.h" using views::Label; using views::Textfield; diff --git a/chrome/browser/chromeos/login/helper.cc b/chrome/browser/chromeos/login/helper.cc index 9d087fa..5c0d9b5 100644 --- a/chrome/browser/chromeos/login/helper.cc +++ b/chrome/browser/chromeos/login/helper.cc @@ -17,9 +17,9 @@ #include "ui/gfx/canvas_skia.h" #include "ui/gfx/screen.h" #include "ui/views/controls/button/menu_button.h" +#include "ui/views/controls/label.h" #include "ui/views/controls/textfield/textfield.h" #include "ui/views/widget/widget.h" -#include "views/controls/label.h" #include "views/controls/throbber.h" #include "views/painter.h" diff --git a/chrome/browser/chromeos/login/message_bubble.cc b/chrome/browser/chromeos/login/message_bubble.cc index fa1a1cc..f526dd9 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/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" -#include "views/controls/label.h" -#include "views/controls/link.h" namespace chromeos { diff --git a/chrome/browser/chromeos/login/message_bubble.h b/chrome/browser/chromeos/login/message_bubble.h index 99d3bab..ecdf775 100644 --- a/chrome/browser/chromeos/login/message_bubble.h +++ b/chrome/browser/chromeos/login/message_bubble.h @@ -12,7 +12,7 @@ #include "base/compiler_specific.h" #include "chrome/browser/ui/views/bubble/bubble.h" #include "ui/views/controls/button/button.h" -#include "views/controls/link_listener.h" +#include "ui/views/controls/link_listener.h" #include "views/view.h" #if defined(TOOLKIT_USES_GTK) diff --git a/chrome/browser/chromeos/login/password_changed_view.cc b/chrome/browser/chromeos/login/password_changed_view.cc index c0692de..c20d018 100644 --- a/chrome/browser/chromeos/login/password_changed_view.cc +++ b/chrome/browser/chromeos/login/password_changed_view.cc @@ -14,11 +14,11 @@ #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" #include "ui/views/controls/button/radio_button.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/controls/label.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 98aef5f..e55e8a9 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/label.h" #include "ui/views/controls/textfield/native_textfield_wrapper.h" #include "ui/views/controls/textfield/textfield.h" #include "ui/views/layout/grid_layout.h" @@ -26,7 +27,6 @@ #include "views/background.h" #include "views/border.h" #include "views/controls/image_view.h" -#include "views/controls/label.h" namespace chromeos { diff --git a/chrome/browser/chromeos/login/screen_locker_tester.cc b/chrome/browser/chromeos/login/screen_locker_tester.cc index d5ac67f..bcfe0c9 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/controls/button/button.h" +#include "ui/views/controls/label.h" #include "ui/views/controls/textfield/textfield.h" #include "ui/views/events/event.h" #include "ui/views/widget/root_view.h" -#include "views/controls/label.h" namespace chromeos { diff --git a/chrome/browser/chromeos/login/take_photo_view.cc b/chrome/browser/chromeos/login/take_photo_view.cc index 58d6c37..f1c2ef1 100644 --- a/chrome/browser/chromeos/login/take_photo_view.cc +++ b/chrome/browser/chromeos/login/take_photo_view.cc @@ -13,11 +13,11 @@ #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/canvas.h" #include "ui/views/controls/button/image_button.h" +#include "ui/views/controls/label.h" #include "ui/views/layout/grid_layout.h" #include "views/background.h" #include "views/border.h" #include "views/controls/image_view.h" -#include "views/controls/label.h" #include "views/controls/throbber.h" namespace { diff --git a/chrome/browser/chromeos/login/user_view.cc b/chrome/browser/chromeos/login/user_view.cc index a7d5020..914d0a9 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/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" -#include "views/controls/label.h" -#include "views/controls/link.h" -#include "views/controls/link_listener.h" namespace { diff --git a/chrome/browser/chromeos/login/user_view.h b/chrome/browser/chromeos/login/user_view.h index 929468c..a9333de 100644 --- a/chrome/browser/chromeos/login/user_view.h +++ b/chrome/browser/chromeos/login/user_view.h @@ -9,7 +9,7 @@ #include <string> #include "ui/views/controls/button/button.h" -#include "views/controls/link_listener.h" +#include "ui/views/controls/link_listener.h" #include "views/view.h" class SkBitmap; diff --git a/chrome/browser/chromeos/login/username_view.h b/chrome/browser/chromeos/login/username_view.h index ea9feaa..d6ec6d0 100644 --- a/chrome/browser/chromeos/login/username_view.h +++ b/chrome/browser/chromeos/login/username_view.h @@ -8,8 +8,8 @@ #include <string> -#include "views/controls/label.h" #include "third_party/skia/include/core/SkBitmap.h" +#include "ui/views/controls/label.h" // Forward declaration. namespace gfx { diff --git a/chrome/browser/chromeos/login/web_page_view.cc b/chrome/browser/chromeos/login/web_page_view.cc index 8b724c7..54dac4f 100644 --- a/chrome/browser/chromeos/login/web_page_view.cc +++ b/chrome/browser/chromeos/login/web_page_view.cc @@ -23,9 +23,9 @@ #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/canvas.h" +#include "ui/views/controls/label.h" #include "views/background.h" #include "views/border.h" -#include "views/controls/label.h" #include "views/controls/throbber.h" using base::TimeDelta; diff --git a/chrome/browser/chromeos/notifications/balloon_view.cc b/chrome/browser/chromeos/notifications/balloon_view.cc index 8f7400b..646a2c8 100644 --- a/chrome/browser/chromeos/notifications/balloon_view.cc +++ b/chrome/browser/chromeos/notifications/balloon_view.cc @@ -33,13 +33,13 @@ #include "ui/views/controls/button/button.h" #include "ui/views/controls/button/image_button.h" #include "ui/views/controls/button/menu_button.h" +#include "ui/views/controls/label.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" #include "ui/views/controls/menu/view_menu_delegate.h" #include "ui/views/widget/widget.h" #include "views/background.h" -#include "views/controls/label.h" namespace { // Menu commands diff --git a/chrome/browser/chromeos/options/vpn_config_view.cc b/chrome/browser/chromeos/options/vpn_config_view.cc index 2e31806..85a1512 100644 --- a/chrome/browser/chromeos/options/vpn_config_view.cc +++ b/chrome/browser/chromeos/options/vpn_config_view.cc @@ -18,10 +18,10 @@ #include "ui/base/models/combobox_model.h" #include "ui/base/resource/resource_bundle.h" #include "ui/views/controls/combobox/combobox.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 "views/controls/label.h" namespace { diff --git a/chrome/browser/chromeos/options/wifi_config_view.cc b/chrome/browser/chromeos/options/wifi_config_view.cc index 9d15680..31f84c1 100644 --- a/chrome/browser/chromeos/options/wifi_config_view.cc +++ b/chrome/browser/chromeos/options/wifi_config_view.cc @@ -18,10 +18,10 @@ #include "ui/views/controls/button/checkbox.h" #include "ui/views/controls/button/image_button.h" #include "ui/views/controls/combobox/combobox.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 "views/controls/label.h" namespace chromeos { diff --git a/chrome/browser/chromeos/status/status_area_bubble.cc b/chrome/browser/chromeos/status/status_area_bubble.cc index e210b47..1893bdd 100644 --- a/chrome/browser/chromeos/status/status_area_bubble.cc +++ b/chrome/browser/chromeos/status/status_area_bubble.cc @@ -6,8 +6,8 @@ #include "chrome/browser/ui/views/window.h" #include "ui/base/accessibility/accessible_view_state.h" +#include "ui/views/controls/label.h" #include "ui/views/layout/box_layout.h" -#include "views/controls/label.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 53f4563..c4df79b 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/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" -#include "views/controls/link.h" namespace { diff --git a/chrome/browser/first_run/try_chrome_dialog_view.h b/chrome/browser/first_run/try_chrome_dialog_view.h index 40af6f7..9724987 100644 --- a/chrome/browser/first_run/try_chrome_dialog_view.h +++ b/chrome/browser/first_run/try_chrome_dialog_view.h @@ -10,7 +10,7 @@ #include "base/compiler_specific.h" #include "ui/gfx/native_widget_types.h" #include "ui/views/controls/button/button.h" -#include "views/controls/link_listener.h" +#include "ui/views/controls/link_listener.h" class ProcessSingleton; diff --git a/chrome/browser/speech/speech_input_bubble_views.cc b/chrome/browser/speech/speech_input_bubble_views.cc index 21e4a0e..0b9185f 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/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" -#include "views/controls/label.h" -#include "views/controls/link.h" -#include "views/controls/link_listener.h" namespace { diff --git a/chrome/browser/ui/input_window_dialog_win.cc b/chrome/browser/ui/input_window_dialog_win.cc index e406d70..3a63e1d 100644 --- a/chrome/browser/ui/input_window_dialog_win.cc +++ b/chrome/browser/ui/input_window_dialog_win.cc @@ -13,13 +13,13 @@ #include "chrome/browser/ui/webui/input_window_dialog_webui.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" +#include "ui/views/controls/label.h" #include "ui/views/controls/textfield/textfield.h" #include "ui/views/controls/textfield/textfield_controller.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" namespace { diff --git a/chrome/browser/ui/panels/panel_browser_frame_view.cc b/chrome/browser/ui/panels/panel_browser_frame_view.cc index 6ea05e1..e749e0e 100644 --- a/chrome/browser/ui/panels/panel_browser_frame_view.cc +++ b/chrome/browser/ui/panels/panel_browser_frame_view.cc @@ -29,11 +29,11 @@ #include "ui/gfx/screen.h" #include "ui/views/controls/button/image_button.h" #include "ui/views/controls/button/menu_button.h" +#include "ui/views/controls/label.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" #include "ui/views/widget/widget_delegate.h" -#include "views/controls/label.h" #include "views/painter.h" namespace { diff --git a/chrome/browser/ui/panels/panel_browser_view.cc b/chrome/browser/ui/panels/panel_browser_view.cc index 2097753..0a887e2 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/controls/label.h" #include "ui/views/widget/widget.h" -#include "views/controls/label.h" namespace { // This value is experimental and subjective. diff --git a/chrome/browser/ui/panels/panel_browser_view_browsertest.cc b/chrome/browser/ui/panels/panel_browser_view_browsertest.cc index c480c85..bda3a67 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/label.h" +#include "ui/views/controls/link.h" #include "ui/views/controls/textfield/textfield.h" #include "views/controls/image_view.h" -#include "views/controls/label.h" -#include "views/controls/link.h" class PanelBrowserViewTest : public BasePanelBrowserTest { public: diff --git a/chrome/browser/ui/views/about_chrome_view.cc b/chrome/browser/ui/views/about_chrome_view.cc index 9d25605..db4b2fb 100644 --- a/chrome/browser/ui/views/about_chrome_view.cc +++ b/chrome/browser/ui/views/about_chrome_view.cc @@ -35,10 +35,10 @@ #include "ui/gfx/canvas.h" #include "ui/gfx/color_utils.h" #include "ui/views/controls/button/text_button.h" +#include "ui/views/controls/link.h" #include "ui/views/controls/textfield/textfield.h" #include "ui/views/layout/layout_constants.h" #include "ui/views/widget/widget.h" -#include "views/controls/link.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 2394b74..fe5ddda 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/label.h" +#include "ui/views/controls/link_listener.h" #include "ui/views/window/dialog_delegate.h" #include "views/controls/image_view.h" -#include "views/controls/label.h" -#include "views/controls/link_listener.h" #include "views/view.h" #if defined(OS_WIN) && !defined(USE_AURA) 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 63a610d..becb12d 100644 --- a/chrome/browser/ui/views/autocomplete/autocomplete_popup_contents_view.cc +++ b/chrome/browser/ui/views/autocomplete/autocomplete_popup_contents_view.cc @@ -31,11 +31,11 @@ #include "ui/gfx/path.h" #include "ui/views/bubble/bubble_border.h" #include "ui/views/controls/button/text_button.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 "unicode/ubidi.h" -#include "views/controls/label.h" #include "views/painter.h" #if defined(OS_WIN) diff --git a/chrome/browser/ui/views/avatar_menu_bubble_view.cc b/chrome/browser/ui/views/avatar_menu_bubble_view.cc index 8a0dcba..75945ee 100644 --- a/chrome/browser/ui/views/avatar_menu_bubble_view.cc +++ b/chrome/browser/ui/views/avatar_menu_bubble_view.cc @@ -22,9 +22,9 @@ #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/label.h" +#include "ui/views/controls/link.h" #include "views/controls/image_view.h" -#include "views/controls/label.h" -#include "views/controls/link.h" #include "views/controls/separator.h" namespace { diff --git a/chrome/browser/ui/views/avatar_menu_bubble_view.h b/chrome/browser/ui/views/avatar_menu_bubble_view.h index 8dbf333..5d4ce32 100644 --- a/chrome/browser/ui/views/avatar_menu_bubble_view.h +++ b/chrome/browser/ui/views/avatar_menu_bubble_view.h @@ -13,7 +13,7 @@ #include "chrome/browser/profiles/avatar_menu_model_observer.h" #include "ui/views/bubble/bubble_delegate.h" #include "ui/views/controls/button/button.h" -#include "views/controls/link_listener.h" +#include "ui/views/controls/link_listener.h" class AvatarMenuModel; class Browser; diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bar_instructions_view.cc b/chrome/browser/ui/views/bookmarks/bookmark_bar_instructions_view.cc index b4432d5..c354fe1 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_bar_instructions_view.cc +++ b/chrome/browser/ui/views/bookmarks/bookmark_bar_instructions_view.cc @@ -11,8 +11,8 @@ #include "chrome/browser/themes/theme_service.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" -#include "views/controls/label.h" -#include "views/controls/link.h" +#include "ui/views/controls/label.h" +#include "ui/views/controls/link.h" namespace { diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bar_instructions_view.h b/chrome/browser/ui/views/bookmarks/bookmark_bar_instructions_view.h index bebb1fa..3e982a0 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_bar_instructions_view.h +++ b/chrome/browser/ui/views/bookmarks/bookmark_bar_instructions_view.h @@ -9,7 +9,7 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" #include "ui/base/accessibility/accessible_view_state.h" -#include "views/controls/link_listener.h" +#include "ui/views/controls/link_listener.h" #include "views/view.h" namespace views { diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc index 8d9d505..69c8c79 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc +++ b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc @@ -54,10 +54,10 @@ #include "ui/base/text/text_elider.h" #include "ui/gfx/canvas_skia.h" #include "ui/views/controls/button/menu_button.h" +#include "ui/views/controls/label.h" #include "ui/views/controls/menu/menu_item_view.h" #include "ui/views/widget/tooltip_manager.h" #include "ui/views/widget/widget.h" -#include "views/controls/label.h" #include "views/drag_utils.h" #include "views/metrics.h" #include "views/view_constants.h" diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc b/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc index 97a73b2..d367d50 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc +++ b/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc @@ -25,13 +25,13 @@ #include "ui/base/resource/resource_bundle.h" #include "ui/views/controls/button/text_button.h" #include "ui/views/controls/combobox/combobox.h" +#include "ui/views/controls/label.h" +#include "ui/views/controls/link.h" #include "ui/views/controls/textfield/textfield.h" #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/label.h" -#include "views/controls/link.h" using views::ColumnSet; using views::GridLayout; diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.h b/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.h index d77e799..ab4652d 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.h +++ b/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.h @@ -14,7 +14,7 @@ #include "ui/views/bubble/bubble_delegate.h" #include "ui/views/controls/button/button.h" #include "ui/views/controls/combobox/combobox_listener.h" -#include "views/controls/link_listener.h" +#include "ui/views/controls/link_listener.h" class Profile; diff --git a/chrome/browser/ui/views/bookmarks/bookmark_editor_view.cc b/chrome/browser/ui/views/bookmarks/bookmark_editor_view.cc index 1479c27..08ec059 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_editor_view.cc +++ b/chrome/browser/ui/views/bookmarks/bookmark_editor_view.cc @@ -24,6 +24,7 @@ #include "net/base/net_util.h" #include "ui/base/l10n/l10n_util.h" #include "ui/views/controls/button/text_button.h" +#include "ui/views/controls/label.h" #include "ui/views/controls/menu/menu_2.h" #include "ui/views/controls/textfield/textfield.h" #include "ui/views/focus/focus_manager.h" @@ -31,7 +32,6 @@ #include "ui/views/layout/layout_constants.h" #include "ui/views/widget/widget.h" #include "views/background.h" -#include "views/controls/label.h" using views::GridLayout; diff --git a/chrome/browser/ui/views/collected_cookies_win.cc b/chrome/browser/ui/views/collected_cookies_win.cc index 4fa7b64..621fd1f 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/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" -#include "views/controls/label.h" namespace browser { diff --git a/chrome/browser/ui/views/confirm_bubble_view.cc b/chrome/browser/ui/views/confirm_bubble_view.cc index 6ee5393..88297e9 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/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" -#include "views/controls/label.h" -#include "views/controls/link.h" namespace { diff --git a/chrome/browser/ui/views/confirm_bubble_view.h b/chrome/browser/ui/views/confirm_bubble_view.h index c9c59aa..61d802e 100644 --- a/chrome/browser/ui/views/confirm_bubble_view.h +++ b/chrome/browser/ui/views/confirm_bubble_view.h @@ -10,7 +10,7 @@ #include "base/memory/scoped_ptr.h" #include "chrome/browser/ui/views/bubble/bubble.h" #include "ui/views/controls/button/button.h" -#include "views/controls/link_listener.h" +#include "ui/views/controls/link_listener.h" #include "views/view.h" class ConfirmBubbleModel; diff --git a/chrome/browser/ui/views/content_setting_bubble_contents.cc b/chrome/browser/ui/views/content_setting_bubble_contents.cc index b87f8df..41483ba 100644 --- a/chrome/browser/ui/views/content_setting_bubble_contents.cc +++ b/chrome/browser/ui/views/content_setting_bubble_contents.cc @@ -26,11 +26,11 @@ #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/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" -#include "views/controls/label.h" -#include "views/controls/link.h" #include "views/controls/separator.h" #if defined(TOOLKIT_USES_GTK) diff --git a/chrome/browser/ui/views/content_setting_bubble_contents.h b/chrome/browser/ui/views/content_setting_bubble_contents.h index 4f37021..473de22 100644 --- a/chrome/browser/ui/views/content_setting_bubble_contents.h +++ b/chrome/browser/ui/views/content_setting_bubble_contents.h @@ -15,7 +15,7 @@ #include "content/public/browser/notification_registrar.h" #include "ui/views/bubble/bubble_delegate.h" #include "ui/views/controls/button/button.h" -#include "views/controls/link_listener.h" +#include "ui/views/controls/link_listener.h" // ContentSettingBubbleContents is used when the user turns on different kinds // of content blocking (e.g. "block images"). When viewing a page with blocked diff --git a/chrome/browser/ui/views/cookie_info_view.cc b/chrome/browser/ui/views/cookie_info_view.cc index d2ec8d6..d83aaf5 100644 --- a/chrome/browser/ui/views/cookie_info_view.cc +++ b/chrome/browser/ui/views/cookie_info_view.cc @@ -18,12 +18,12 @@ #include "ui/gfx/canvas.h" #include "ui/gfx/color_utils.h" #include "ui/views/controls/combobox/combobox.h" +#include "ui/views/controls/label.h" #include "ui/views/controls/textfield/textfield.h" #include "ui/views/controls/tree/tree_view.h" #include "ui/views/layout/grid_layout.h" #include "ui/views/layout/layout_constants.h" #include "views/border.h" -#include "views/controls/label.h" static const int kCookieInfoViewBorderSize = 1; static const int kCookieInfoViewInsetSize = 3; diff --git a/chrome/browser/ui/views/create_application_shortcut_view.cc b/chrome/browser/ui/views/create_application_shortcut_view.cc index 7c93578..a24ff40 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/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" -#include "views/controls/label.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 4f2ae48..31c7a07 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/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" -#include "views/controls/label.h" namespace { diff --git a/chrome/browser/ui/views/database_info_view.cc b/chrome/browser/ui/views/database_info_view.cc index 6ce812d..810f36d 100644 --- a/chrome/browser/ui/views/database_info_view.cc +++ b/chrome/browser/ui/views/database_info_view.cc @@ -12,10 +12,10 @@ #include "ui/base/l10n/l10n_util.h" #include "ui/base/text/bytes_formatting.h" #include "ui/gfx/color_utils.h" +#include "ui/views/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 "views/controls/label.h" static const int kDatabaseInfoViewBorderSize = 1; static const int kDatabaseInfoViewInsetSize = 3; diff --git a/chrome/browser/ui/views/default_search_view.cc b/chrome/browser/ui/views/default_search_view.cc index 16eb7bf..ad8aa13 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/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" -#include "views/controls/label.h" namespace { 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 f28635d9..159e739 100644 --- a/chrome/browser/ui/views/download/download_in_progress_dialog_view.cc +++ b/chrome/browser/ui/views/download/download_in_progress_dialog_view.cc @@ -19,10 +19,10 @@ #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/size.h" +#include "ui/views/controls/label.h" #include "ui/views/layout/grid_layout.h" #include "ui/views/widget/widget.h" #include "views/border.h" -#include "views/controls/label.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 dfb4645..b6294b5 100644 --- a/chrome/browser/ui/views/download/download_item_view.cc +++ b/chrome/browser/ui/views/download/download_item_view.cc @@ -35,10 +35,10 @@ #include "ui/gfx/color_utils.h" #include "ui/gfx/image/image.h" #include "ui/views/controls/button/text_button.h" +#include "ui/views/controls/label.h" #include "ui/views/widget/root_view.h" #include "ui/views/widget/widget.h" #include "unicode/uchar.h" -#include "views/controls/label.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_shelf_view.cc b/chrome/browser/ui/views/download/download_shelf_view.cc index 01c54d4..b51f126 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/link.h" #include "views/background.h" #include "views/controls/image_view.h" -#include "views/controls/link.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_shelf_view.h b/chrome/browser/ui/views/download/download_shelf_view.h index 892171d..1d88941 100644 --- a/chrome/browser/ui/views/download/download_shelf_view.h +++ b/chrome/browser/ui/views/download/download_shelf_view.h @@ -13,8 +13,8 @@ #include "chrome/browser/download/download_shelf.h" #include "ui/base/animation/animation_delegate.h" #include "ui/views/controls/button/button.h" +#include "ui/views/controls/link_listener.h" #include "views/accessible_pane_view.h" -#include "views/controls/link_listener.h" #include "views/mouse_watcher.h" class BaseDownloadItemModel; diff --git a/chrome/browser/ui/views/edit_search_engine_dialog.cc b/chrome/browser/ui/views/edit_search_engine_dialog.cc index c410c03..db4086b 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/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" -#include "views/controls/label.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 6b1dc8e..c9dce08d 100644 --- a/chrome/browser/ui/views/extensions/extension_install_dialog_view.cc +++ b/chrome/browser/ui/views/extensions/extension_install_dialog_view.cc @@ -15,6 +15,9 @@ #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" +#include "ui/views/controls/label.h" +#include "ui/views/controls/link.h" +#include "ui/views/controls/link_listener.h" #include "ui/views/layout/box_layout.h" #include "ui/views/layout/grid_layout.h" #include "ui/views/layout/layout_constants.h" @@ -22,9 +25,6 @@ #include "ui/views/window/dialog_delegate.h" #include "views/border.h" #include "views/controls/image_view.h" -#include "views/controls/label.h" -#include "views/controls/link.h" -#include "views/controls/link_listener.h" #include "views/controls/separator.h" #include "views/view.h" diff --git a/chrome/browser/ui/views/extensions/extension_installed_bubble.cc b/chrome/browser/ui/views/extensions/extension_installed_bubble.cc index 7c77ad1..d03ced7 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/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/controls/label.h" -#include "views/controls/link.h" -#include "views/controls/link_listener.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 b203b21..3a6e8fd 100644 --- a/chrome/browser/ui/views/extensions/extension_uninstall_dialog_view.cc +++ b/chrome/browser/ui/views/extensions/extension_uninstall_dialog_view.cc @@ -16,11 +16,11 @@ #include "ui/base/l10n/l10n_util.h" #include "ui/gfx/compositor/compositor.h" #include "ui/gfx/compositor/layer.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/controls/label.h" #include "views/view.h" namespace { diff --git a/chrome/browser/ui/views/find_bar_view.cc b/chrome/browser/ui/views/find_bar_view.cc index 04875ec..eb02c39 100644 --- a/chrome/browser/ui/views/find_bar_view.cc +++ b/chrome/browser/ui/views/find_bar_view.cc @@ -27,10 +27,10 @@ #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/canvas.h" #include "ui/views/controls/button/image_button.h" +#include "ui/views/controls/label.h" #include "ui/views/controls/textfield/textfield.h" #include "ui/views/widget/widget.h" #include "views/background.h" -#include "views/controls/label.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 2989f1f..42a0353 100644 --- a/chrome/browser/ui/views/first_run_bubble.cc +++ b/chrome/browser/ui/views/first_run_bubble.cc @@ -21,11 +21,11 @@ #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/label.h" #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/label.h" namespace { const int kAnchorVerticalOffset = -4; 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 3443ca2..8b9426b 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/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/controls/label.h" #include "views/view_text_utils.h" namespace { diff --git a/chrome/browser/ui/views/fullscreen_exit_bubble_views.cc b/chrome/browser/ui/views/fullscreen_exit_bubble_views.cc index 1f5a574..85c276a 100644 --- a/chrome/browser/ui/views/fullscreen_exit_bubble_views.cc +++ b/chrome/browser/ui/views/fullscreen_exit_bubble_views.cc @@ -18,11 +18,11 @@ #include "ui/gfx/screen.h" #include "ui/views/bubble/bubble_border.h" #include "ui/views/controls/button/text_button.h" +#include "ui/views/controls/link.h" +#include "ui/views/controls/link_listener.h" #include "ui/views/layout/box_layout.h" #include "ui/views/layout/grid_layout.h" #include "ui/views/widget/widget.h" -#include "views/controls/link.h" -#include "views/controls/link_listener.h" #include "views/view.h" #if defined(OS_WIN) diff --git a/chrome/browser/ui/views/generic_info_view.cc b/chrome/browser/ui/views/generic_info_view.cc index caedcf2..4ef36db 100644 --- a/chrome/browser/ui/views/generic_info_view.cc +++ b/chrome/browser/ui/views/generic_info_view.cc @@ -8,10 +8,10 @@ #include "base/utf_string_conversions.h" #include "ui/base/l10n/l10n_util.h" #include "ui/gfx/color_utils.h" +#include "ui/views/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 "views/controls/label.h" GenericInfoView::GenericInfoView(int number_of_rows) : number_of_rows_(number_of_rows), name_string_ids_(NULL) { diff --git a/chrome/browser/ui/views/generic_info_view_unittest.cc b/chrome/browser/ui/views/generic_info_view_unittest.cc index f3aa49c..babc540 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/controls/label.h" #include "ui/views/controls/textfield/textfield.h" #include "ui/views/widget/widget.h" -#include "views/controls/label.h" // This class is only used on windows for now. #if defined(OS_WIN) diff --git a/chrome/browser/ui/views/global_error_bubble_view.cc b/chrome/browser/ui/views/global_error_bubble_view.cc index 00e5861..4af108a 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/label.h" #include "ui/views/layout/grid_layout.h" #include "ui/views/layout/layout_constants.h" #include "views/controls/image_view.h" -#include "views/controls/label.h" namespace { diff --git a/chrome/browser/ui/views/hung_renderer_view.cc b/chrome/browser/ui/views/hung_renderer_view.cc index 422bdb5..cbd8056 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/label.h" #include "ui/views/controls/table/group_table_view.h" #include "ui/views/layout/grid_layout.h" #include "ui/views/layout/layout_constants.h" @@ -30,7 +31,6 @@ #include "ui/views/window/client_view.h" #include "ui/views/window/dialog_delegate.h" #include "views/controls/image_view.h" -#include "views/controls/label.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 1190752..ce404f2 100644 --- a/chrome/browser/ui/views/importer/import_lock_dialog_view.cc +++ b/chrome/browser/ui/views/importer/import_lock_dialog_view.cc @@ -14,9 +14,9 @@ #include "grit/generated_resources.h" #include "grit/locale_settings.h" #include "ui/base/l10n/l10n_util.h" +#include "ui/views/controls/label.h" #include "ui/views/layout/layout_constants.h" #include "ui/views/widget/widget.h" -#include "views/controls/label.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 638ec33..d9a86c6 100644 --- a/chrome/browser/ui/views/importer/import_progress_dialog_view.cc +++ b/chrome/browser/ui/views/importer/import_progress_dialog_view.cc @@ -12,10 +12,10 @@ #include "grit/generated_resources.h" #include "grit/locale_settings.h" #include "ui/base/l10n/l10n_util.h" +#include "ui/views/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/label.h" #include "views/controls/throbber.h" ImportProgressDialogView::ImportProgressDialogView( diff --git a/chrome/browser/ui/views/indexed_db_info_view.cc b/chrome/browser/ui/views/indexed_db_info_view.cc index fa451af..d6ef722 100644 --- a/chrome/browser/ui/views/indexed_db_info_view.cc +++ b/chrome/browser/ui/views/indexed_db_info_view.cc @@ -12,10 +12,10 @@ #include "ui/base/l10n/l10n_util.h" #include "ui/base/text/bytes_formatting.h" #include "ui/gfx/color_utils.h" +#include "ui/views/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 "views/controls/label.h" static const int kIndexedDBInfoViewBorderSize = 1; static const int kIndexedDBInfoViewInsetSize = 3; diff --git a/chrome/browser/ui/views/infobars/after_translate_infobar.cc b/chrome/browser/ui/views/infobars/after_translate_infobar.cc index f125333..55c4d73 100644 --- a/chrome/browser/ui/views/infobars/after_translate_infobar.cc +++ b/chrome/browser/ui/views/infobars/after_translate_infobar.cc @@ -9,8 +9,8 @@ #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" #include "ui/views/controls/button/menu_button.h" +#include "ui/views/controls/label.h" #include "ui/views/controls/menu/menu_item_view.h" -#include "views/controls/label.h" AfterTranslateInfoBar::AfterTranslateInfoBar( InfoBarTabHelper* owner, diff --git a/chrome/browser/ui/views/infobars/before_translate_infobar.cc b/chrome/browser/ui/views/infobars/before_translate_infobar.cc index 2e2e6f8..f772c37 100644 --- a/chrome/browser/ui/views/infobars/before_translate_infobar.cc +++ b/chrome/browser/ui/views/infobars/before_translate_infobar.cc @@ -9,8 +9,8 @@ #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" #include "ui/views/controls/button/menu_button.h" +#include "ui/views/controls/label.h" #include "ui/views/controls/menu/menu_item_view.h" -#include "views/controls/label.h" BeforeTranslateInfoBar::BeforeTranslateInfoBar( InfoBarTabHelper* owner, diff --git a/chrome/browser/ui/views/infobars/confirm_infobar.cc b/chrome/browser/ui/views/infobars/confirm_infobar.cc index 484d1c2..6b2418b 100644 --- a/chrome/browser/ui/views/infobars/confirm_infobar.cc +++ b/chrome/browser/ui/views/infobars/confirm_infobar.cc @@ -8,8 +8,8 @@ #include "chrome/browser/tab_contents/confirm_infobar_delegate.h" #include "chrome/browser/ui/views/event_utils.h" #include "ui/views/controls/button/text_button.h" -#include "views/controls/label.h" -#include "views/controls/link.h" +#include "ui/views/controls/label.h" +#include "ui/views/controls/link.h" // ConfirmInfoBarDelegate ----------------------------------------------------- diff --git a/chrome/browser/ui/views/infobars/confirm_infobar.h b/chrome/browser/ui/views/infobars/confirm_infobar.h index 9dd7aac..15762f6 100644 --- a/chrome/browser/ui/views/infobars/confirm_infobar.h +++ b/chrome/browser/ui/views/infobars/confirm_infobar.h @@ -9,7 +9,7 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" #include "chrome/browser/ui/views/infobars/infobar_view.h" -#include "views/controls/link_listener.h" +#include "ui/views/controls/link_listener.h" class ConfirmInfoBarDelegate; diff --git a/chrome/browser/ui/views/infobars/infobar_view.cc b/chrome/browser/ui/views/infobars/infobar_view.cc index 2fa3e94..f805591 100644 --- a/chrome/browser/ui/views/infobars/infobar_view.cc +++ b/chrome/browser/ui/views/infobars/infobar_view.cc @@ -27,14 +27,14 @@ #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/label.h" +#include "ui/views/controls/link.h" #include "ui/views/controls/menu/menu_model_adapter.h" #include "ui/views/controls/menu/menu_runner.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/image_view.h" -#include "views/controls/label.h" -#include "views/controls/link.h" #if defined(OS_WIN) #include "base/win/win_util.h" diff --git a/chrome/browser/ui/views/infobars/link_infobar.cc b/chrome/browser/ui/views/infobars/link_infobar.cc index 5558446..60c4fb9 100644 --- a/chrome/browser/ui/views/infobars/link_infobar.cc +++ b/chrome/browser/ui/views/infobars/link_infobar.cc @@ -7,8 +7,8 @@ #include "base/logging.h" #include "chrome/browser/tab_contents/link_infobar_delegate.h" #include "chrome/browser/ui/views/event_utils.h" -#include "views/controls/label.h" -#include "views/controls/link.h" +#include "ui/views/controls/label.h" +#include "ui/views/controls/link.h" // LinkInfoBarDelegate -------------------------------------------------------- diff --git a/chrome/browser/ui/views/infobars/link_infobar.h b/chrome/browser/ui/views/infobars/link_infobar.h index 4c10924..bd993dd 100644 --- a/chrome/browser/ui/views/infobars/link_infobar.h +++ b/chrome/browser/ui/views/infobars/link_infobar.h @@ -9,7 +9,7 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" #include "chrome/browser/ui/views/infobars/infobar_view.h" -#include "views/controls/link_listener.h" +#include "ui/views/controls/link_listener.h" class LinkInfoBarDelegate; diff --git a/chrome/browser/ui/views/infobars/translate_infobar_base.cc b/chrome/browser/ui/views/infobars/translate_infobar_base.cc index ab8420b..02c58c5 100644 --- a/chrome/browser/ui/views/infobars/translate_infobar_base.cc +++ b/chrome/browser/ui/views/infobars/translate_infobar_base.cc @@ -14,7 +14,7 @@ #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/canvas_skia.h" #include "ui/views/controls/button/menu_button.h" -#include "views/controls/label.h" +#include "ui/views/controls/label.h" // TranslateInfoBarDelegate --------------------------------------------------- diff --git a/chrome/browser/ui/views/infobars/translate_message_infobar.cc b/chrome/browser/ui/views/infobars/translate_message_infobar.cc index 6c69382..2f2c787 100644 --- a/chrome/browser/ui/views/infobars/translate_message_infobar.cc +++ b/chrome/browser/ui/views/infobars/translate_message_infobar.cc @@ -6,7 +6,7 @@ #include "chrome/browser/translate/translate_infobar_delegate.h" #include "ui/views/controls/button/text_button.h" -#include "views/controls/label.h" +#include "ui/views/controls/label.h" TranslateMessageInfoBar::TranslateMessageInfoBar( InfoBarTabHelper* owner, diff --git a/chrome/browser/ui/views/instant_confirm_view.cc b/chrome/browser/ui/views/instant_confirm_view.cc index 00bcd80..42f3c59 100644 --- a/chrome/browser/ui/views/instant_confirm_view.cc +++ b/chrome/browser/ui/views/instant_confirm_view.cc @@ -14,11 +14,11 @@ #include "grit/generated_resources.h" #include "grit/locale_settings.h" #include "ui/base/l10n/l10n_util.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 "ui/views/widget/widget.h" -#include "views/controls/label.h" -#include "views/controls/link.h" InstantConfirmView::InstantConfirmView(Profile* profile) : profile_(profile) { views::Label* description_label = new views::Label( diff --git a/chrome/browser/ui/views/instant_confirm_view.h b/chrome/browser/ui/views/instant_confirm_view.h index edf18e2..3cc4d43 100644 --- a/chrome/browser/ui/views/instant_confirm_view.h +++ b/chrome/browser/ui/views/instant_confirm_view.h @@ -8,8 +8,8 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" +#include "ui/views/controls/link_listener.h" #include "ui/views/window/dialog_delegate.h" -#include "views/controls/link_listener.h" #include "views/view.h" class Profile; diff --git a/chrome/browser/ui/views/local_storage_info_view.cc b/chrome/browser/ui/views/local_storage_info_view.cc index 19c21b8..73a0cf3 100644 --- a/chrome/browser/ui/views/local_storage_info_view.cc +++ b/chrome/browser/ui/views/local_storage_info_view.cc @@ -12,10 +12,10 @@ #include "ui/base/l10n/l10n_util.h" #include "ui/base/text/bytes_formatting.h" #include "ui/gfx/color_utils.h" +#include "ui/views/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 "views/controls/label.h" static const int kLocalStorageInfoViewBorderSize = 1; static const int kLocalStorageInfoViewInsetSize = 3; diff --git a/chrome/browser/ui/views/local_storage_set_item_info_view.cc b/chrome/browser/ui/views/local_storage_set_item_info_view.cc index e9e19a2..2c9e2ac 100644 --- a/chrome/browser/ui/views/local_storage_set_item_info_view.cc +++ b/chrome/browser/ui/views/local_storage_set_item_info_view.cc @@ -10,10 +10,10 @@ #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" #include "ui/gfx/color_utils.h" +#include "ui/views/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 "views/controls/label.h" static const int kLocalStorageSetItemInfoViewBorderSize = 1; static const int kLocalStorageSetItemInfoViewInsetSize = 3; 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 3333184..64dc948 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/label.h" #include "views/controls/image_view.h" -#include "views/controls/label.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/keyword_hint_view.cc b/chrome/browser/ui/views/location_bar/keyword_hint_view.cc index f9f764c..9c0ac20 100644 --- a/chrome/browser/ui/views/location_bar/keyword_hint_view.cc +++ b/chrome/browser/ui/views/location_bar/keyword_hint_view.cc @@ -19,7 +19,7 @@ #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/canvas.h" -#include "views/controls/label.h" +#include "ui/views/controls/label.h" // Amount of space to offset the tab image from the top of the view by. static const int kTabImageYOffset = 4; diff --git a/chrome/browser/ui/views/location_bar/location_bar_view.cc b/chrome/browser/ui/views/location_bar/location_bar_view.cc index 2c7f34f..14d6592 100644 --- a/chrome/browser/ui/views/location_bar/location_bar_view.cc +++ b/chrome/browser/ui/views/location_bar/location_bar_view.cc @@ -56,8 +56,8 @@ #include "ui/gfx/color_utils.h" #include "ui/gfx/image/image.h" #include "ui/gfx/skia_util.h" +#include "ui/views/controls/label.h" #include "ui/views/controls/textfield/native_textfield_views.h" -#include "views/controls/label.h" #include "views/drag_utils.h" #if !defined(OS_CHROMEOS) diff --git a/chrome/browser/ui/views/location_bar/selected_keyword_view.h b/chrome/browser/ui/views/location_bar/selected_keyword_view.h index ad4e2e1..9028ae0 100644 --- a/chrome/browser/ui/views/location_bar/selected_keyword_view.h +++ b/chrome/browser/ui/views/location_bar/selected_keyword_view.h @@ -10,7 +10,7 @@ #include "base/compiler_specific.h" #include "chrome/browser/ui/views/location_bar/icon_label_bubble_view.h" -#include "views/controls/label.h" +#include "ui/views/controls/label.h" class Profile; namespace gfx { diff --git a/chrome/browser/ui/views/location_bar/suggested_text_view.h b/chrome/browser/ui/views/location_bar/suggested_text_view.h index 91a1f4f..feafb0c 100644 --- a/chrome/browser/ui/views/location_bar/suggested_text_view.h +++ b/chrome/browser/ui/views/location_bar/suggested_text_view.h @@ -8,7 +8,7 @@ #include "base/compiler_specific.h" #include "ui/base/animation/animation_delegate.h" -#include "views/controls/label.h" +#include "ui/views/controls/label.h" class AutocompleteEditModel; diff --git a/chrome/browser/ui/views/login_view.cc b/chrome/browser/ui/views/login_view.cc index 0e3cbe0..3804376 100644 --- a/chrome/browser/ui/views/login_view.cc +++ b/chrome/browser/ui/views/login_view.cc @@ -11,11 +11,11 @@ #include "base/utf_string_conversions.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.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/root_view.h" -#include "views/controls/label.h" static const int kMessageWidth = 320; static const int kTextfieldStackHorizontalSpacing = 30; diff --git a/chrome/browser/ui/views/notifications/balloon_view.h b/chrome/browser/ui/views/notifications/balloon_view.h index e20d236..64e7cea 100644 --- a/chrome/browser/ui/views/notifications/balloon_view.h +++ b/chrome/browser/ui/views/notifications/balloon_view.h @@ -20,9 +20,9 @@ #include "ui/gfx/rect.h" #include "ui/gfx/size.h" #include "ui/views/controls/button/menu_button.h" +#include "ui/views/controls/label.h" #include "ui/views/controls/menu/view_menu_delegate.h" #include "ui/views/widget/widget_delegate.h" -#include "views/controls/label.h" #include "views/view.h" class BalloonCollection; diff --git a/chrome/browser/ui/views/page_info_bubble_view.cc b/chrome/browser/ui/views/page_info_bubble_view.cc index ea6e5e0..fe3a5b8 100644 --- a/chrome/browser/ui/views/page_info_bubble_view.cc +++ b/chrome/browser/ui/views/page_info_bubble_view.cc @@ -21,11 +21,11 @@ #include "ui/gfx/canvas.h" #include "ui/gfx/canvas_skia.h" #include "ui/gfx/image/image.h" +#include "ui/views/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" -#include "views/controls/label.h" -#include "views/controls/link.h" #include "views/controls/separator.h" namespace { diff --git a/chrome/browser/ui/views/page_info_bubble_view.h b/chrome/browser/ui/views/page_info_bubble_view.h index dc11086..8fd4bd5 100644 --- a/chrome/browser/ui/views/page_info_bubble_view.h +++ b/chrome/browser/ui/views/page_info_bubble_view.h @@ -11,7 +11,7 @@ #include "chrome/browser/page_info_model_observer.h" #include "ui/base/animation/slide_animation.h" #include "ui/views/bubble/bubble_delegate.h" -#include "views/controls/link_listener.h" +#include "ui/views/controls/link_listener.h" class PageInfoBubbleView : public views::BubbleDelegateView, public PageInfoModelObserver, diff --git a/chrome/browser/ui/views/sad_tab_view.cc b/chrome/browser/ui/views/sad_tab_view.cc index 0a88ff0..68d485d 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/label.h" +#include "ui/views/controls/link.h" #include "ui/views/layout/grid_layout.h" #include "views/controls/image_view.h" -#include "views/controls/label.h" -#include "views/controls/link.h" static const int kPadding = 20; static const float kMessageSize = 0.65f; diff --git a/chrome/browser/ui/views/sad_tab_view.h b/chrome/browser/ui/views/sad_tab_view.h index 3aeff23..5cdd467 100644 --- a/chrome/browser/ui/views/sad_tab_view.h +++ b/chrome/browser/ui/views/sad_tab_view.h @@ -9,7 +9,7 @@ #include "base/basictypes.h" #include "base/memory/scoped_ptr.h" #include "ui/views/controls/button/button.h" -#include "views/controls/link_listener.h" +#include "ui/views/controls/link_listener.h" #include "views/view.h" class TabContents; diff --git a/chrome/browser/ui/views/ssl_client_certificate_selector.cc b/chrome/browser/ui/views/ssl_client_certificate_selector.cc index d3782af..3beacb4 100644 --- a/chrome/browser/ui/views/ssl_client_certificate_selector.cc +++ b/chrome/browser/ui/views/ssl_client_certificate_selector.cc @@ -20,10 +20,10 @@ #include "ui/base/models/table_model_observer.h" #include "ui/gfx/native_widget_types.h" #include "ui/views/controls/button/text_button.h" +#include "ui/views/controls/label.h" #include "ui/views/controls/table/table_view.h" #include "ui/views/layout/grid_layout.h" #include "ui/views/layout/layout_constants.h" -#include "views/controls/label.h" using content::BrowserThread; diff --git a/chrome/browser/ui/views/status_bubble_views.cc b/chrome/browser/ui/views/status_bubble_views.cc index 2b01a26..aa566f8 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/controls/label.h" #include "ui/views/controls/scrollbar/native_scroll_bar.h" #include "ui/views/widget/root_view.h" #include "ui/views/widget/widget.h" -#include "views/controls/label.h" using views::Widget; diff --git a/chrome/browser/ui/views/task_manager_view.cc b/chrome/browser/ui/views/task_manager_view.cc index b8038e9..1f06ced 100644 --- a/chrome/browser/ui/views/task_manager_view.cc +++ b/chrome/browser/ui/views/task_manager_view.cc @@ -25,6 +25,8 @@ #include "ui/base/l10n/l10n_util.h" #include "ui/base/models/table_model_observer.h" #include "ui/views/controls/button/text_button.h" +#include "ui/views/controls/link.h" +#include "ui/views/controls/link_listener.h" #include "ui/views/controls/menu/menu.h" #include "ui/views/controls/table/group_table_view.h" #include "ui/views/controls/table/table_view_observer.h" @@ -33,8 +35,6 @@ #include "ui/views/window/dialog_delegate.h" #include "views/background.h" #include "views/context_menu_controller.h" -#include "views/controls/link.h" -#include "views/controls/link_listener.h" // The task manager window default size. static const int kDefaultWidth = 460; diff --git a/chrome/browser/ui/views/uninstall_view.cc b/chrome/browser/ui/views/uninstall_view.cc index 58bc1d8..b7fc343 100644 --- a/chrome/browser/ui/views/uninstall_view.cc +++ b/chrome/browser/ui/views/uninstall_view.cc @@ -16,9 +16,9 @@ #include "ui/base/l10n/l10n_util.h" #include "ui/views/controls/button/checkbox.h" #include "ui/views/controls/combobox/combobox.h" +#include "ui/views/controls/label.h" #include "ui/views/layout/grid_layout.h" #include "ui/views/layout/layout_constants.h" -#include "views/controls/label.h" UninstallView::UninstallView(int* user_selection) : confirm_label_(NULL), diff --git a/chrome/browser/ui/views/web_intent_picker_view.cc b/chrome/browser/ui/views/web_intent_picker_view.cc index e98435e..2063533 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/label.h" #include "ui/views/layout/box_layout.h" #include "views/controls/image_view.h" -#include "views/controls/label.h" namespace { diff --git a/chrome/browser/ui/views/wrench_menu.cc b/chrome/browser/ui/views/wrench_menu.cc index cc0cdc9..89620d6 100644 --- a/chrome/browser/ui/views/wrench_menu.cc +++ b/chrome/browser/ui/views/wrench_menu.cc @@ -35,6 +35,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/label.h" #include "ui/views/controls/menu/menu_config.h" #include "ui/views/controls/menu/menu_item_view.h" #include "ui/views/controls/menu/menu_runner.h" @@ -42,7 +43,6 @@ #include "ui/views/controls/menu/submenu_view.h" #include "ui/views/widget/widget.h" #include "views/background.h" -#include "views/controls/label.h" using ui::MenuModel; using views::CustomButton; |