diff options
Diffstat (limited to 'chrome/browser/ui')
49 files changed, 51 insertions, 51 deletions
diff --git a/chrome/browser/ui/tests/ui_gfx_image_unittest.cc b/chrome/browser/ui/tests/ui_gfx_image_unittest.cc index 640560c..6e0fe52 100644 --- a/chrome/browser/ui/tests/ui_gfx_image_unittest.cc +++ b/chrome/browser/ui/tests/ui_gfx_image_unittest.cc @@ -16,7 +16,7 @@ #if defined(TOOLKIT_VIEWS) #include "ui/views/controls/image_view.h" -#include "views/view.h" +#include "ui/views/view.h" #endif namespace { diff --git a/chrome/browser/ui/views/about_chrome_view.h b/chrome/browser/ui/views/about_chrome_view.h index 378ea2a..76b0896 100644 --- a/chrome/browser/ui/views/about_chrome_view.h +++ b/chrome/browser/ui/views/about_chrome_view.h @@ -13,8 +13,8 @@ #include "ui/views/controls/image_view.h" #include "ui/views/controls/label.h" #include "ui/views/controls/link_listener.h" +#include "ui/views/view.h" #include "ui/views/window/dialog_delegate.h" -#include "views/view.h" #if defined(OS_WIN) && !defined(USE_AURA) #include "chrome/browser/google/google_update.h" diff --git a/chrome/browser/ui/views/accessibility_event_router_views.cc b/chrome/browser/ui/views/accessibility_event_router_views.cc index 2162d85..cda7795 100644 --- a/chrome/browser/ui/views/accessibility_event_router_views.cc +++ b/chrome/browser/ui/views/accessibility_event_router_views.cc @@ -17,8 +17,8 @@ #include "ui/views/controls/button/text_button.h" #include "ui/views/controls/menu/menu_item_view.h" #include "ui/views/controls/menu/submenu_view.h" +#include "ui/views/view.h" #include "ui/views/widget/widget.h" -#include "views/view.h" using views::FocusManager; diff --git a/chrome/browser/ui/views/autocomplete/autocomplete_popup_contents_view.h b/chrome/browser/ui/views/autocomplete/autocomplete_popup_contents_view.h index 2a86a52..e326055 100644 --- a/chrome/browser/ui/views/autocomplete/autocomplete_popup_contents_view.h +++ b/chrome/browser/ui/views/autocomplete/autocomplete_popup_contents_view.h @@ -13,7 +13,7 @@ #include "ui/base/animation/animation_delegate.h" #include "ui/base/animation/slide_animation.h" #include "ui/gfx/font.h" -#include "views/view.h" +#include "ui/views/view.h" #include "webkit/glue/window_open_disposition.h" class AutocompleteEditModel; diff --git a/chrome/browser/ui/views/autocomplete/autocomplete_result_view.h b/chrome/browser/ui/views/autocomplete/autocomplete_result_view.h index d1efb6b..2c405929 100644 --- a/chrome/browser/ui/views/autocomplete/autocomplete_result_view.h +++ b/chrome/browser/ui/views/autocomplete/autocomplete_result_view.h @@ -10,7 +10,7 @@ #include "third_party/skia/include/core/SkColor.h" #include "ui/gfx/font.h" #include "ui/gfx/rect.h" -#include "views/view.h" +#include "ui/views/view.h" class AutocompleteResultViewModel; namespace gfx { diff --git a/chrome/browser/ui/views/autocomplete/touch_autocomplete_popup_contents_view.cc b/chrome/browser/ui/views/autocomplete/touch_autocomplete_popup_contents_view.cc index c49b4b1..cd810de 100644 --- a/chrome/browser/ui/views/autocomplete/touch_autocomplete_popup_contents_view.cc +++ b/chrome/browser/ui/views/autocomplete/touch_autocomplete_popup_contents_view.cc @@ -12,7 +12,7 @@ #include "ui/gfx/path.h" #include "ui/gfx/rect.h" #include "ui/gfx/size.h" -#include "views/view.h" +#include "ui/views/view.h" // TouchAutocompleteResultView ------------------------------------------------ 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 3e982a0..8ce2de8 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_bar_instructions_view.h +++ b/chrome/browser/ui/views/bookmarks/bookmark_bar_instructions_view.h @@ -10,7 +10,7 @@ #include "base/compiler_specific.h" #include "ui/base/accessibility/accessible_view_state.h" #include "ui/views/controls/link_listener.h" -#include "views/view.h" +#include "ui/views/view.h" namespace views { class Label; diff --git a/chrome/browser/ui/views/browser_actions_container.h b/chrome/browser/ui/views/browser_actions_container.h index a13a3d0..ca47cbb 100644 --- a/chrome/browser/ui/views/browser_actions_container.h +++ b/chrome/browser/ui/views/browser_actions_container.h @@ -26,7 +26,7 @@ #include "ui/views/controls/menu/view_menu_delegate.h" #include "ui/views/controls/resize_area_delegate.h" #include "ui/views/drag_controller.h" -#include "views/view.h" +#include "ui/views/view.h" class Browser; class BrowserActionOverflowMenuController; diff --git a/chrome/browser/ui/views/bubble/bubble.h b/chrome/browser/ui/views/bubble/bubble.h index 62ee096..edbd745 100644 --- a/chrome/browser/ui/views/bubble/bubble.h +++ b/chrome/browser/ui/views/bubble/bubble.h @@ -11,7 +11,7 @@ #include "ui/base/accelerators/accelerator.h" #include "ui/base/animation/animation_delegate.h" #include "ui/views/bubble/bubble_border.h" -#include "views/view.h" +#include "ui/views/view.h" #if defined(USE_AURA) #include "ui/views/widget/native_widget_aura.h" diff --git a/chrome/browser/ui/views/constrained_html_delegate_views.cc b/chrome/browser/ui/views/constrained_html_delegate_views.cc index bb7fdfc..ad68005 100644 --- a/chrome/browser/ui/views/constrained_html_delegate_views.cc +++ b/chrome/browser/ui/views/constrained_html_delegate_views.cc @@ -13,8 +13,8 @@ #include "chrome/browser/ui/webui/html_dialog_ui.h" #include "content/browser/tab_contents/tab_contents.h" #include "ui/gfx/rect.h" +#include "ui/views/view.h" #include "ui/views/widget/widget_delegate.h" -#include "views/view.h" class ConstrainedHtmlDelegateViews : public TabContentsContainer, public ConstrainedHtmlUIDelegate, diff --git a/chrome/browser/ui/views/cookie_info_view.h b/chrome/browser/ui/views/cookie_info_view.h index 0354abe..06c0259 100644 --- a/chrome/browser/ui/views/cookie_info_view.h +++ b/chrome/browser/ui/views/cookie_info_view.h @@ -15,7 +15,7 @@ #include "net/base/cookie_monster.h" #include "ui/base/models/combobox_model.h" #include "ui/views/controls/combobox/combobox_listener.h" -#include "views/view.h" +#include "ui/views/view.h" namespace views { class GridLayout; diff --git a/chrome/browser/ui/views/database_info_view.h b/chrome/browser/ui/views/database_info_view.h index 28aec02..93a1033 100644 --- a/chrome/browser/ui/views/database_info_view.h +++ b/chrome/browser/ui/views/database_info_view.h @@ -6,8 +6,8 @@ #define CHROME_BROWSER_UI_VIEWS_DATABASE_INFO_VIEW_H_ #pragma once -#include "views/view.h" #include "chrome/browser/browsing_data_database_helper.h" +#include "ui/views/view.h" namespace views { class Textfield; diff --git a/chrome/browser/ui/views/download/download_in_progress_dialog_view.h b/chrome/browser/ui/views/download/download_in_progress_dialog_view.h index 2124828..4fddbd4 100644 --- a/chrome/browser/ui/views/download/download_in_progress_dialog_view.h +++ b/chrome/browser/ui/views/download/download_in_progress_dialog_view.h @@ -11,8 +11,8 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" #include "base/string16.h" +#include "ui/views/view.h" #include "ui/views/window/dialog_delegate.h" -#include "views/view.h" class Browser; diff --git a/chrome/browser/ui/views/download/download_item_view.h b/chrome/browser/ui/views/download/download_item_view.h index 361fb1f..e190e60 100644 --- a/chrome/browser/ui/views/download/download_item_view.h +++ b/chrome/browser/ui/views/download/download_item_view.h @@ -33,7 +33,7 @@ #include "ui/gfx/font.h" #include "ui/views/controls/button/button.h" #include "ui/views/events/event.h" -#include "views/view.h" +#include "ui/views/view.h" class BaseDownloadItemModel; class DownloadShelfView; 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 ee06d5c..03e3552 100644 --- a/chrome/browser/ui/views/extensions/extension_install_dialog_view.cc +++ b/chrome/browser/ui/views/extensions/extension_install_dialog_view.cc @@ -24,10 +24,10 @@ #include "ui/views/layout/box_layout.h" #include "ui/views/layout/grid_layout.h" #include "ui/views/layout/layout_constants.h" +#include "ui/views/view.h" #include "ui/views/widget/widget.h" #include "ui/views/window/dialog_delegate.h" #include "views/border.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 352987e..88fb3dd 100644 --- a/chrome/browser/ui/views/extensions/extension_installed_bubble.cc +++ b/chrome/browser/ui/views/extensions/extension_installed_bubble.cc @@ -36,7 +36,7 @@ #include "ui/views/controls/link_listener.h" #include "ui/views/layout/fill_layout.h" #include "ui/views/layout/layout_constants.h" -#include "views/view.h" +#include "ui/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 71c2921..a7a122e 100644 --- a/chrome/browser/ui/views/extensions/extension_uninstall_dialog_view.cc +++ b/chrome/browser/ui/views/extensions/extension_uninstall_dialog_view.cc @@ -20,9 +20,9 @@ #include "ui/views/controls/image_view.h" #include "ui/views/controls/label.h" #include "ui/views/layout/layout_constants.h" +#include "ui/views/view.h" #include "ui/views/widget/widget.h" #include "ui/views/window/dialog_delegate.h" -#include "views/view.h" namespace { diff --git a/chrome/browser/ui/views/find_bar_host_interactive_uitest.cc b/chrome/browser/ui/views/find_bar_host_interactive_uitest.cc index e6eb370..134edf7 100644 --- a/chrome/browser/ui/views/find_bar_host_interactive_uitest.cc +++ b/chrome/browser/ui/views/find_bar_host_interactive_uitest.cc @@ -21,7 +21,7 @@ #include "ui/base/clipboard/clipboard.h" #include "ui/base/keycodes/keyboard_codes.h" #include "ui/views/focus/focus_manager.h" -#include "views/view.h" +#include "ui/views/view.h" #include "views/views_delegate.h" namespace { diff --git a/chrome/browser/ui/views/first_run_bubble_unittest.cc b/chrome/browser/ui/views/first_run_bubble_unittest.cc index d6bd67a..f069217 100644 --- a/chrome/browser/ui/views/first_run_bubble_unittest.cc +++ b/chrome/browser/ui/views/first_run_bubble_unittest.cc @@ -9,8 +9,8 @@ #include "chrome/test/base/testing_profile.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/views/test/views_test_base.h" +#include "ui/views/view.h" #include "ui/views/widget/widget.h" -#include "views/view.h" class FirstRunBubbleTest : public views::ViewsTestBase { public: diff --git a/chrome/browser/ui/views/first_run_search_engine_view.h b/chrome/browser/ui/views/first_run_search_engine_view.h index 9498fa7..28ef439 100644 --- a/chrome/browser/ui/views/first_run_search_engine_view.h +++ b/chrome/browser/ui/views/first_run_search_engine_view.h @@ -11,8 +11,8 @@ #include "chrome/browser/search_engines/template_url_service_observer.h" #include "ui/gfx/size.h" #include "ui/views/controls/button/text_button.h" +#include "ui/views/view.h" #include "ui/views/widget/widget_delegate.h" -#include "views/view.h" class Profile; class TemplateURL; diff --git a/chrome/browser/ui/views/frame/contents_container.h b/chrome/browser/ui/views/frame/contents_container.h index d8269d6..f36882f 100644 --- a/chrome/browser/ui/views/frame/contents_container.h +++ b/chrome/browser/ui/views/frame/contents_container.h @@ -6,7 +6,7 @@ #define CHROME_BROWSER_UI_VIEWS_FRAME_CONTENTS_CONTAINER_H_ #pragma once -#include "views/view.h" +#include "ui/views/view.h" class TabContents; diff --git a/chrome/browser/ui/views/fullscreen_exit_bubble_views.cc b/chrome/browser/ui/views/fullscreen_exit_bubble_views.cc index 85c276a..9b5df30 100644 --- a/chrome/browser/ui/views/fullscreen_exit_bubble_views.cc +++ b/chrome/browser/ui/views/fullscreen_exit_bubble_views.cc @@ -22,8 +22,8 @@ #include "ui/views/controls/link_listener.h" #include "ui/views/layout/box_layout.h" #include "ui/views/layout/grid_layout.h" +#include "ui/views/view.h" #include "ui/views/widget/widget.h" -#include "views/view.h" #if defined(OS_WIN) #include "ui/base/l10n/l10n_util_win.h" diff --git a/chrome/browser/ui/views/generic_info_view.h b/chrome/browser/ui/views/generic_info_view.h index fc0de27..a7dd290 100644 --- a/chrome/browser/ui/views/generic_info_view.h +++ b/chrome/browser/ui/views/generic_info_view.h @@ -9,7 +9,7 @@ #include "base/gtest_prod_util.h" #include "base/memory/scoped_ptr.h" #include "base/string16.h" -#include "views/view.h" +#include "ui/views/view.h" namespace views { class GridLayout; diff --git a/chrome/browser/ui/views/importer/import_lock_dialog_view.h b/chrome/browser/ui/views/importer/import_lock_dialog_view.h index 515e25e..de3dc0c 100644 --- a/chrome/browser/ui/views/importer/import_lock_dialog_view.h +++ b/chrome/browser/ui/views/importer/import_lock_dialog_view.h @@ -9,8 +9,8 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" #include "base/memory/ref_counted.h" +#include "ui/views/view.h" #include "ui/views/window/dialog_delegate.h" -#include "views/view.h" namespace views { class Label; diff --git a/chrome/browser/ui/views/importer/import_progress_dialog_view.h b/chrome/browser/ui/views/importer/import_progress_dialog_view.h index cbf5b6e..0db1ad8 100644 --- a/chrome/browser/ui/views/importer/import_progress_dialog_view.h +++ b/chrome/browser/ui/views/importer/import_progress_dialog_view.h @@ -12,8 +12,8 @@ #include "base/memory/scoped_ptr.h" #include "chrome/browser/importer/importer_data_types.h" #include "chrome/browser/importer/importer_progress_observer.h" +#include "ui/views/view.h" #include "ui/views/window/dialog_delegate.h" -#include "views/view.h" class ImporterHost; class ImporterObserver; diff --git a/chrome/browser/ui/views/indexed_db_info_view.h b/chrome/browser/ui/views/indexed_db_info_view.h index 341a094..e0c13cb 100644 --- a/chrome/browser/ui/views/indexed_db_info_view.h +++ b/chrome/browser/ui/views/indexed_db_info_view.h @@ -6,8 +6,8 @@ #define CHROME_BROWSER_UI_VIEWS_INDEXED_DB_INFO_VIEW_H_ #pragma once -#include "views/view.h" #include "chrome/browser/browsing_data_indexed_db_helper.h" +#include "ui/views/view.h" namespace views { class Textfield; diff --git a/chrome/browser/ui/views/infobars/infobar_background.cc b/chrome/browser/ui/views/infobars/infobar_background.cc index d345fa5..78a27a5 100644 --- a/chrome/browser/ui/views/infobars/infobar_background.cc +++ b/chrome/browser/ui/views/infobars/infobar_background.cc @@ -10,7 +10,7 @@ #include "ui/gfx/canvas.h" #include "ui/gfx/canvas_skia_paint.h" #include "ui/gfx/color_utils.h" -#include "views/view.h" +#include "ui/views/view.h" InfoBarBackground::InfoBarBackground(InfoBarDelegate::Type infobar_type) : separator_color_(SK_ColorBLACK), diff --git a/chrome/browser/ui/views/instant_confirm_view.h b/chrome/browser/ui/views/instant_confirm_view.h index 3cc4d43..c46e29d 100644 --- a/chrome/browser/ui/views/instant_confirm_view.h +++ b/chrome/browser/ui/views/instant_confirm_view.h @@ -9,8 +9,8 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" #include "ui/views/controls/link_listener.h" +#include "ui/views/view.h" #include "ui/views/window/dialog_delegate.h" -#include "views/view.h" class Profile; diff --git a/chrome/browser/ui/views/local_storage_info_view.h b/chrome/browser/ui/views/local_storage_info_view.h index a757e74..0ca663d 100644 --- a/chrome/browser/ui/views/local_storage_info_view.h +++ b/chrome/browser/ui/views/local_storage_info_view.h @@ -6,8 +6,8 @@ #define CHROME_BROWSER_UI_VIEWS_LOCAL_STORAGE_INFO_VIEW_H_ #pragma once -#include "views/view.h" #include "chrome/browser/browsing_data_local_storage_helper.h" +#include "ui/views/view.h" namespace views { class Textfield; diff --git a/chrome/browser/ui/views/local_storage_set_item_info_view.h b/chrome/browser/ui/views/local_storage_set_item_info_view.h index b696ce3..bfc993d 100644 --- a/chrome/browser/ui/views/local_storage_set_item_info_view.h +++ b/chrome/browser/ui/views/local_storage_set_item_info_view.h @@ -9,7 +9,7 @@ #include <string> #include "base/string16.h" -#include "views/view.h" +#include "ui/views/view.h" namespace views { class Textfield; diff --git a/chrome/browser/ui/views/location_bar/click_handler.cc b/chrome/browser/ui/views/location_bar/click_handler.cc index 87b5bfc..710ec09 100644 --- a/chrome/browser/ui/views/location_bar/click_handler.cc +++ b/chrome/browser/ui/views/location_bar/click_handler.cc @@ -8,7 +8,7 @@ #include "chrome/browser/ui/views/location_bar/location_bar_view.h" #include "content/browser/tab_contents/navigation_controller.h" #include "content/browser/tab_contents/tab_contents.h" -#include "views/view.h" +#include "ui/views/view.h" ClickHandler::ClickHandler(const views::View* owner, LocationBarView* location_bar) diff --git a/chrome/browser/ui/views/location_bar/icon_label_bubble_view.h b/chrome/browser/ui/views/location_bar/icon_label_bubble_view.h index 38458f5..9c28321 100644 --- a/chrome/browser/ui/views/location_bar/icon_label_bubble_view.h +++ b/chrome/browser/ui/views/location_bar/icon_label_bubble_view.h @@ -10,8 +10,8 @@ #include "base/string16.h" #include "ui/gfx/size.h" +#include "ui/views/view.h" #include "views/painter.h" -#include "views/view.h" namespace gfx { class Canvas; diff --git a/chrome/browser/ui/views/location_bar/keyword_hint_view.h b/chrome/browser/ui/views/location_bar/keyword_hint_view.h index 1a18fe8..3bf733a 100644 --- a/chrome/browser/ui/views/location_bar/keyword_hint_view.h +++ b/chrome/browser/ui/views/location_bar/keyword_hint_view.h @@ -10,7 +10,7 @@ #include "base/compiler_specific.h" #include "ui/gfx/size.h" -#include "views/view.h" +#include "ui/views/view.h" namespace gfx { class Font; diff --git a/chrome/browser/ui/views/location_bar/page_action_with_badge_view.h b/chrome/browser/ui/views/location_bar/page_action_with_badge_view.h index a988f7a..84931dc 100644 --- a/chrome/browser/ui/views/location_bar/page_action_with_badge_view.h +++ b/chrome/browser/ui/views/location_bar/page_action_with_badge_view.h @@ -8,7 +8,7 @@ #include "base/compiler_specific.h" #include "ui/gfx/size.h" -#include "views/view.h" +#include "ui/views/view.h" class GURL; class PageActionImageView; diff --git a/chrome/browser/ui/views/login_view.h b/chrome/browser/ui/views/login_view.h index e7b5b88..cb50699 100644 --- a/chrome/browser/ui/views/login_view.h +++ b/chrome/browser/ui/views/login_view.h @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -8,7 +8,7 @@ #include "base/task.h" #include "chrome/browser/ui/login/login_model.h" -#include "views/view.h" +#include "ui/views/view.h" namespace views { class Label; diff --git a/chrome/browser/ui/views/notifications/balloon_view.h b/chrome/browser/ui/views/notifications/balloon_view.h index 64e7cea..76ef55c 100644 --- a/chrome/browser/ui/views/notifications/balloon_view.h +++ b/chrome/browser/ui/views/notifications/balloon_view.h @@ -22,8 +22,8 @@ #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/view.h" #include "ui/views/widget/widget_delegate.h" -#include "views/view.h" class BalloonCollection; class NotificationOptionsMenuModel; diff --git a/chrome/browser/ui/views/omnibox/omnibox_view_views.h b/chrome/browser/ui/views/omnibox/omnibox_view_views.h index a3627ac..f9c165d 100644 --- a/chrome/browser/ui/views/omnibox/omnibox_view_views.h +++ b/chrome/browser/ui/views/omnibox/omnibox_view_views.h @@ -16,7 +16,7 @@ #include "content/public/browser/notification_observer.h" #include "ui/base/range/range.h" #include "ui/views/controls/textfield/textfield_controller.h" -#include "views/view.h" +#include "ui/views/view.h" #include "webkit/glue/window_open_disposition.h" class AutocompleteEditController; diff --git a/chrome/browser/ui/views/sad_tab_view.h b/chrome/browser/ui/views/sad_tab_view.h index 5cdd467..9eda1ed 100644 --- a/chrome/browser/ui/views/sad_tab_view.h +++ b/chrome/browser/ui/views/sad_tab_view.h @@ -10,7 +10,7 @@ #include "base/memory/scoped_ptr.h" #include "ui/views/controls/button/button.h" #include "ui/views/controls/link_listener.h" -#include "views/view.h" +#include "ui/views/view.h" class TabContents; diff --git a/chrome/browser/ui/views/ssl_client_certificate_selector.h b/chrome/browser/ui/views/ssl_client_certificate_selector.h index fd21a54..d06ee45 100644 --- a/chrome/browser/ui/views/ssl_client_certificate_selector.h +++ b/chrome/browser/ui/views/ssl_client_certificate_selector.h @@ -15,8 +15,8 @@ #include "content/browser/ssl/ssl_client_auth_handler.h" #include "ui/views/controls/button/button.h" #include "ui/views/controls/table/table_view_observer.h" +#include "ui/views/view.h" #include "ui/views/window/dialog_delegate.h" -#include "views/view.h" // This header file exists only for testing. Chrome should access the // certificate selector only through the cross-platform interface diff --git a/chrome/browser/ui/views/tab_contents/tab_contents_container.h b/chrome/browser/ui/views/tab_contents/tab_contents_container.h index ef96561..58353e6 100644 --- a/chrome/browser/ui/views/tab_contents/tab_contents_container.h +++ b/chrome/browser/ui/views/tab_contents/tab_contents_container.h @@ -9,7 +9,7 @@ #include "chrome/browser/ui/views/tab_contents/native_tab_contents_container.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" -#include "views/view.h" +#include "ui/views/view.h" class NativeTabContentsContainer; class RenderViewHost; diff --git a/chrome/browser/ui/views/tab_contents/tab_contents_container_native.h b/chrome/browser/ui/views/tab_contents/tab_contents_container_native.h index f4d0edb..db48ab6 100644 --- a/chrome/browser/ui/views/tab_contents/tab_contents_container_native.h +++ b/chrome/browser/ui/views/tab_contents/tab_contents_container_native.h @@ -9,7 +9,7 @@ #include "chrome/browser/ui/views/tab_contents/native_tab_contents_container.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" -#include "views/view.h" +#include "ui/views/view.h" class NativeTabContentsContainer; class RenderViewHost; diff --git a/chrome/browser/ui/views/tab_icon_view.h b/chrome/browser/ui/views/tab_icon_view.h index ef49649..2786599 100644 --- a/chrome/browser/ui/views/tab_icon_view.h +++ b/chrome/browser/ui/views/tab_icon_view.h @@ -7,7 +7,7 @@ #pragma once #include "base/compiler_specific.h" -#include "views/view.h" +#include "ui/views/view.h" class SkBitmap; diff --git a/chrome/browser/ui/views/tabs/abstract_tab_strip_view.h b/chrome/browser/ui/views/tabs/abstract_tab_strip_view.h index 1ce1814..3fc82c10 100644 --- a/chrome/browser/ui/views/tabs/abstract_tab_strip_view.h +++ b/chrome/browser/ui/views/tabs/abstract_tab_strip_view.h @@ -6,7 +6,7 @@ #define CHROME_BROWSER_UI_VIEWS_TABS_ABSTRACT_TAB_STRIP_VIEW_H_ #pragma once -#include "views/view.h" +#include "ui/views/view.h" // This interface is the way the browser view sees a tab strip's view. class AbstractTabStripView : public views::View { diff --git a/chrome/browser/ui/views/tabs/base_tab.h b/chrome/browser/ui/views/tabs/base_tab.h index bcf92c6..34dfaa5 100644 --- a/chrome/browser/ui/views/tabs/base_tab.h +++ b/chrome/browser/ui/views/tabs/base_tab.h @@ -12,7 +12,7 @@ #include "ui/base/animation/animation_delegate.h" #include "ui/views/context_menu_controller.h" #include "ui/views/controls/button/button.h" -#include "views/view.h" +#include "ui/views/view.h" class BaseTab; class TabController; diff --git a/chrome/browser/ui/views/tabs/base_tab_strip.h b/chrome/browser/ui/views/tabs/base_tab_strip.h index faeeeb7..73d1a8a 100644 --- a/chrome/browser/ui/views/tabs/base_tab_strip.h +++ b/chrome/browser/ui/views/tabs/base_tab_strip.h @@ -13,7 +13,7 @@ #include "chrome/browser/ui/views/tabs/base_tab.h" #include "chrome/browser/ui/views/tabs/tab_controller.h" #include "ui/views/animation/bounds_animator.h" -#include "views/view.h" +#include "ui/views/view.h" class BaseTab; class TabDragController; diff --git a/chrome/browser/ui/views/tabs/dragged_tab_view.h b/chrome/browser/ui/views/tabs/dragged_tab_view.h index e1ecacf..89339b9 100644 --- a/chrome/browser/ui/views/tabs/dragged_tab_view.h +++ b/chrome/browser/ui/views/tabs/dragged_tab_view.h @@ -12,7 +12,7 @@ #include "ui/gfx/point.h" #include "ui/gfx/rect.h" #include "ui/gfx/size.h" -#include "views/view.h" +#include "ui/views/view.h" class NativeViewPhotobooth; diff --git a/chrome/browser/ui/views/theme_background.cc b/chrome/browser/ui/views/theme_background.cc index 74b89be..05acbcd 100644 --- a/chrome/browser/ui/views/theme_background.cc +++ b/chrome/browser/ui/views/theme_background.cc @@ -14,7 +14,7 @@ #include "grit/ui_resources.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/canvas.h" -#include "views/view.h" +#include "ui/views/view.h" ThemeBackground::ThemeBackground(BrowserView* browser_view) : browser_view_(browser_view) { diff --git a/chrome/browser/ui/views/toolbar_view.h b/chrome/browser/ui/views/toolbar_view.h index 2b57d07..b6f33c0 100644 --- a/chrome/browser/ui/views/toolbar_view.h +++ b/chrome/browser/ui/views/toolbar_view.h @@ -20,8 +20,8 @@ #include "ui/base/animation/slide_animation.h" #include "ui/views/controls/button/menu_button.h" #include "ui/views/controls/menu/view_menu_delegate.h" +#include "ui/views/view.h" #include "views/accessible_pane_view.h" -#include "views/view.h" class BrowserActionsContainer; class Browser; diff --git a/chrome/browser/ui/views/unhandled_keyboard_event_handler.h b/chrome/browser/ui/views/unhandled_keyboard_event_handler.h index f5653d7..41f1a84 100644 --- a/chrome/browser/ui/views/unhandled_keyboard_event_handler.h +++ b/chrome/browser/ui/views/unhandled_keyboard_event_handler.h @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -7,7 +7,7 @@ #pragma once #include "content/public/browser/native_web_keyboard_event.h" -#include "views/view.h" +#include "ui/views/view.h" namespace views { class FocusManager; |