diff options
Diffstat (limited to 'chrome/browser/views')
62 files changed, 80 insertions, 80 deletions
diff --git a/chrome/browser/views/about_chrome_view.cc b/chrome/browser/views/about_chrome_view.cc index c997c1d..6547523 100644 --- a/chrome/browser/views/about_chrome_view.cc +++ b/chrome/browser/views/about_chrome_view.cc @@ -22,7 +22,7 @@ #include "chrome/installer/util/install_util.h" #include "chrome/views/text_field.h" #include "chrome/views/throbber.h" -#include "chrome/views/window.h" +#include "chrome/views/window/window.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" diff --git a/chrome/browser/views/about_chrome_view.h b/chrome/browser/views/about_chrome_view.h index e965c3c..5f775de7 100644 --- a/chrome/browser/views/about_chrome_view.h +++ b/chrome/browser/views/about_chrome_view.h @@ -6,11 +6,11 @@ #define CHROME_BROWSER_VIEWS_ABOUT_CHROME_VIEW_H_ #include "chrome/browser/google_update.h" -#include "chrome/views/dialog_delegate.h" #include "chrome/views/image_view.h" #include "chrome/views/label.h" #include "chrome/views/link.h" #include "chrome/views/view.h" +#include "chrome/views/window/dialog_delegate.h" namespace views { class TextField; diff --git a/chrome/browser/views/about_ipc_dialog.cc b/chrome/browser/views/about_ipc_dialog.cc index f4de76f..4e174c1 100644 --- a/chrome/browser/views/about_ipc_dialog.cc +++ b/chrome/browser/views/about_ipc_dialog.cc @@ -29,7 +29,7 @@ #include "chrome/views/text_button.h" #include "chrome/views/widget/root_view.h" #include "chrome/views/widget/widget.h" -#include "chrome/views/window.h" +#include "chrome/views/window/window.h" #include "net/url_request/url_request.h" #include "net/url_request/url_request_job.h" #include "net/url_request/url_request_job_tracker.h" diff --git a/chrome/browser/views/about_ipc_dialog.h b/chrome/browser/views/about_ipc_dialog.h index 15c41c2..a5ff38d 100644 --- a/chrome/browser/views/about_ipc_dialog.h +++ b/chrome/browser/views/about_ipc_dialog.h @@ -14,7 +14,7 @@ #include "base/singleton.h" #include "chrome/common/ipc_logging.h" #include "chrome/views/button.h" -#include "chrome/views/dialog_delegate.h" +#include "chrome/views/window/dialog_delegate.h" #include "chrome/views/table_view.h" #if defined(OS_WIN) && defined(IPC_MESSAGE_LOG_ENABLED) diff --git a/chrome/browser/views/about_network_dialog.cc b/chrome/browser/views/about_network_dialog.cc index 7028d2b..3386043a 100644 --- a/chrome/browser/views/about_network_dialog.cc +++ b/chrome/browser/views/about_network_dialog.cc @@ -11,7 +11,7 @@ #include "chrome/views/grid_layout.h" #include "chrome/views/text_button.h" #include "chrome/views/text_field.h" -#include "chrome/views/window.h" +#include "chrome/views/window/window.h" #include "net/url_request/url_request.h" #include "net/url_request/url_request_job.h" #include "net/url_request/url_request_job_tracker.h" diff --git a/chrome/browser/views/about_network_dialog.h b/chrome/browser/views/about_network_dialog.h index 768cd97..389e582 100644 --- a/chrome/browser/views/about_network_dialog.h +++ b/chrome/browser/views/about_network_dialog.h @@ -7,7 +7,7 @@ #include "base/singleton.h" #include "chrome/views/button.h" -#include "chrome/views/dialog_delegate.h" +#include "chrome/views/window/dialog_delegate.h" namespace views { class TextButton; diff --git a/chrome/browser/views/bookmark_bar_view.cc b/chrome/browser/views/bookmark_bar_view.cc index 7855ffc..79b3ce9 100644 --- a/chrome/browser/views/bookmark_bar_view.cc +++ b/chrome/browser/views/bookmark_bar_view.cc @@ -36,7 +36,7 @@ #include "chrome/views/view_constants.h" #include "chrome/views/widget/tooltip_manager.h" #include "chrome/views/widget/widget.h" -#include "chrome/views/window.h" +#include "chrome/views/window/window.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "skia/ext/skia_utils.h" diff --git a/chrome/browser/views/bookmark_editor_view.cc b/chrome/browser/views/bookmark_editor_view.cc index a233179..9407179 100644 --- a/chrome/browser/views/bookmark_editor_view.cc +++ b/chrome/browser/views/bookmark_editor_view.cc @@ -17,7 +17,7 @@ #include "chrome/views/grid_layout.h" #include "chrome/views/label.h" #include "chrome/views/widget/widget.h" -#include "chrome/views/window.h" +#include "chrome/views/window/window.h" #include "googleurl/src/gurl.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/views/bookmark_editor_view.h b/chrome/browser/views/bookmark_editor_view.h index 280e9cf..bf9be29 100644 --- a/chrome/browser/views/bookmark_editor_view.h +++ b/chrome/browser/views/bookmark_editor_view.h @@ -9,12 +9,12 @@ #include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/views/checkbox.h" -#include "chrome/views/dialog_delegate.h" #include "chrome/views/menu.h" #include "chrome/views/native_button.h" #include "chrome/views/text_field.h" #include "chrome/views/tree_node_model.h" #include "chrome/views/tree_view.h" +#include "chrome/views/window/dialog_delegate.h" namespace views { class Window; diff --git a/chrome/browser/views/bookmark_manager_view.cc b/chrome/browser/views/bookmark_manager_view.cc index cb4fe7c..1aec366 100644 --- a/chrome/browser/views/bookmark_manager_view.cc +++ b/chrome/browser/views/bookmark_manager_view.cc @@ -31,7 +31,7 @@ #include "chrome/views/menu_button.h" #include "chrome/views/single_split_view.h" #include "chrome/views/widget/widget.h" -#include "chrome/views/window.h" +#include "chrome/views/window/window.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" #include "skia/ext/skia_utils.h" diff --git a/chrome/browser/views/bookmark_manager_view.h b/chrome/browser/views/bookmark_manager_view.h index f8754bb..aef8896 100644 --- a/chrome/browser/views/bookmark_manager_view.h +++ b/chrome/browser/views/bookmark_manager_view.h @@ -15,7 +15,7 @@ #include "chrome/views/tree_view.h" #include "chrome/views/view.h" #include "chrome/views/view_menu_delegate.h" -#include "chrome/views/window_delegate.h" +#include "chrome/views/window/window_delegate.h" #include "webkit/glue/window_open_disposition.h" class BookmarkFolderTreeModel; diff --git a/chrome/browser/views/bug_report_view.cc b/chrome/browser/views/bug_report_view.cc index 63308aa..b5c3725 100644 --- a/chrome/browser/views/bug_report_view.cc +++ b/chrome/browser/views/bug_report_view.cc @@ -19,10 +19,10 @@ #include "chrome/common/pref_names.h" #include "chrome/common/pref_service.h" #include "chrome/views/checkbox.h" -#include "chrome/views/client_view.h" #include "chrome/views/grid_layout.h" #include "chrome/views/label.h" -#include "chrome/views/Window.h" +#include "chrome/views/window/client_view.h" +#include "chrome/views/window/window.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" diff --git a/chrome/browser/views/bug_report_view.h b/chrome/browser/views/bug_report_view.h index 3f2d8a3..b539b3c 100644 --- a/chrome/browser/views/bug_report_view.h +++ b/chrome/browser/views/bug_report_view.h @@ -7,10 +7,10 @@ #include "chrome/browser/net/url_fetcher.h" #include "chrome/views/combo_box.h" -#include "chrome/views/dialog_delegate.h" #include "chrome/views/native_button.h" #include "chrome/views/text_field.h" #include "chrome/views/view.h" +#include "chrome/views/window/dialog_delegate.h" #include "googleurl/src/gurl.h" namespace views { diff --git a/chrome/browser/views/clear_browsing_data.cc b/chrome/browser/views/clear_browsing_data.cc index cfcb7f5..d61faba 100644 --- a/chrome/browser/views/clear_browsing_data.cc +++ b/chrome/browser/views/clear_browsing_data.cc @@ -13,7 +13,7 @@ #include "chrome/views/label.h" #include "chrome/views/native_button.h" #include "chrome/views/throbber.h" -#include "chrome/views/window.h" +#include "chrome/views/window/window.h" #include "chrome/common/pref_names.h" #include "chrome/common/pref_service.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/views/clear_browsing_data.h b/chrome/browser/views/clear_browsing_data.h index 02e60d5..e70f058 100644 --- a/chrome/browser/views/clear_browsing_data.h +++ b/chrome/browser/views/clear_browsing_data.h @@ -7,10 +7,10 @@ #include "chrome/browser/browsing_data_remover.h" #include "chrome/views/combo_box.h" -#include "chrome/views/dialog_delegate.h" #include "chrome/views/label.h" #include "chrome/views/native_button.h" #include "chrome/views/view.h" +#include "chrome/views/window/dialog_delegate.h" namespace views { class CheckBox; diff --git a/chrome/browser/views/constrained_window_impl.cc b/chrome/browser/views/constrained_window_impl.cc index ba436f0..4c588c7 100644 --- a/chrome/browser/views/constrained_window_impl.cc +++ b/chrome/browser/views/constrained_window_impl.cc @@ -26,11 +26,11 @@ #include "chrome/common/resource_bundle.h" #include "chrome/common/win_util.h" #include "chrome/views/image_button.h" -#include "chrome/views/client_view.h" #include "chrome/views/focus_manager.h" #include "chrome/views/hwnd_view.h" -#include "chrome/views/non_client_view.h" -#include "chrome/views/window_resources.h" +#include "chrome/views/window/client_view.h" +#include "chrome/views/window/non_client_view.h" +#include "chrome/views/window/window_resources.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" diff --git a/chrome/browser/views/constrained_window_impl.h b/chrome/browser/views/constrained_window_impl.h index 0fb6763..4afec31 100644 --- a/chrome/browser/views/constrained_window_impl.h +++ b/chrome/browser/views/constrained_window_impl.h @@ -8,7 +8,7 @@ #include "base/gfx/rect.h" #include "chrome/browser/tab_contents/constrained_window.h" #include "chrome/browser/tab_contents/tab_contents_delegate.h" -#include "chrome/views/window_win.h" +#include "chrome/views/window/window_win.h" class ConstrainedTabContentsWindowDelegate; class ConstrainedWindowAnimation; diff --git a/chrome/browser/views/edit_keyword_controller.cc b/chrome/browser/views/edit_keyword_controller.cc index 05bf8fd..0f336d0 100644 --- a/chrome/browser/views/edit_keyword_controller.cc +++ b/chrome/browser/views/edit_keyword_controller.cc @@ -18,7 +18,7 @@ #include "chrome/views/grid_layout.h" #include "chrome/views/image_view.h" #include "chrome/views/table_view.h" -#include "chrome/views/window.h" +#include "chrome/views/window/window.h" #include "googleurl/src/gurl.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" diff --git a/chrome/browser/views/edit_keyword_controller.h b/chrome/browser/views/edit_keyword_controller.h index 34244b2..f6f693b 100644 --- a/chrome/browser/views/edit_keyword_controller.h +++ b/chrome/browser/views/edit_keyword_controller.h @@ -12,8 +12,8 @@ #include <Windows.h> -#include "chrome/views/dialog_delegate.h" #include "chrome/views/text_field.h" +#include "chrome/views/window/dialog_delegate.h" namespace views { class Label; diff --git a/chrome/browser/views/first_run_bubble.cc b/chrome/browser/views/first_run_bubble.cc index dc14153..313689d 100644 --- a/chrome/browser/views/first_run_bubble.cc +++ b/chrome/browser/views/first_run_bubble.cc @@ -17,7 +17,7 @@ #include "chrome/views/event.h" #include "chrome/views/label.h" #include "chrome/views/native_button.h" -#include "chrome/views/window.h" +#include "chrome/views/window/window.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" diff --git a/chrome/browser/views/first_run_customize_view.cc b/chrome/browser/views/first_run_customize_view.cc index e9ad65e..307753c 100644 --- a/chrome/browser/views/first_run_customize_view.cc +++ b/chrome/browser/views/first_run_customize_view.cc @@ -15,7 +15,7 @@ #include "chrome/views/image_view.h" #include "chrome/views/label.h" #include "chrome/views/throbber.h" -#include "chrome/views/window.h" +#include "chrome/views/window/window.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" diff --git a/chrome/browser/views/first_run_customize_view.h b/chrome/browser/views/first_run_customize_view.h index 4138d62..9a7a596 100644 --- a/chrome/browser/views/first_run_customize_view.h +++ b/chrome/browser/views/first_run_customize_view.h @@ -7,9 +7,9 @@ #include "chrome/browser/views/first_run_view_base.h" #include "chrome/views/combo_box.h" -#include "chrome/views/dialog_delegate.h" #include "chrome/views/native_button.h" #include "chrome/views/view.h" +#include "chrome/views/window/dialog_delegate.h" namespace views { class Label; diff --git a/chrome/browser/views/first_run_view.cc b/chrome/browser/views/first_run_view.cc index f2df7be..910cab6 100644 --- a/chrome/browser/views/first_run_view.cc +++ b/chrome/browser/views/first_run_view.cc @@ -16,7 +16,7 @@ #include "chrome/views/label.h" #include "chrome/views/throbber.h" #include "chrome/views/separator.h" -#include "chrome/views/window.h" +#include "chrome/views/window/window.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" diff --git a/chrome/browser/views/first_run_view.h b/chrome/browser/views/first_run_view.h index 5565b9a..e17f78d 100644 --- a/chrome/browser/views/first_run_view.h +++ b/chrome/browser/views/first_run_view.h @@ -7,9 +7,9 @@ #include "chrome/browser/views/first_run_view_base.h" #include "chrome/browser/views/first_run_customize_view.h" -#include "chrome/views/dialog_delegate.h" #include "chrome/views/link.h" #include "chrome/views/view.h" +#include "chrome/views/window/dialog_delegate.h" namespace views { class Label; diff --git a/chrome/browser/views/first_run_view_base.cc b/chrome/browser/views/first_run_view_base.cc index 2d4f68d..f0dc653 100644 --- a/chrome/browser/views/first_run_view_base.cc +++ b/chrome/browser/views/first_run_view_base.cc @@ -21,12 +21,12 @@ #include "chrome/common/resource_bundle.h" #include "chrome/views/background.h" #include "chrome/views/checkbox.h" -#include "chrome/views/client_view.h" #include "chrome/views/image_view.h" #include "chrome/views/label.h" #include "chrome/views/throbber.h" #include "chrome/views/separator.h" -#include "chrome/views/window.h" +#include "chrome/views/window/client_view.h" +#include "chrome/views/window/window.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" diff --git a/chrome/browser/views/first_run_view_base.h b/chrome/browser/views/first_run_view_base.h index ef7fdf3..0790414 100644 --- a/chrome/browser/views/first_run_view_base.h +++ b/chrome/browser/views/first_run_view_base.h @@ -6,8 +6,8 @@ #define CHROME_BROWSER_VIEWS_FIRST_RUN_VIEW_BASE_H_ #include "chrome/browser/importer/importer.h" -#include "chrome/views/dialog_delegate.h" #include "chrome/views/view.h" +#include "chrome/views/window/dialog_delegate.h" namespace views { class CheckBox; diff --git a/chrome/browser/views/frame/browser_frame.cc b/chrome/browser/views/frame/browser_frame.cc index 10003af..b837c4b 100644 --- a/chrome/browser/views/frame/browser_frame.cc +++ b/chrome/browser/views/frame/browser_frame.cc @@ -14,7 +14,7 @@ #include "chrome/browser/views/frame/opaque_browser_frame_view.h" #include "chrome/common/resource_bundle.h" #include "chrome/common/win_util.h" -#include "chrome/views/window_delegate.h" +#include "chrome/views/window/window_delegate.h" #include "grit/theme_resources.h" // static diff --git a/chrome/browser/views/frame/browser_frame.h b/chrome/browser/views/frame/browser_frame.h index 94d099b..17813af 100644 --- a/chrome/browser/views/frame/browser_frame.h +++ b/chrome/browser/views/frame/browser_frame.h @@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_VIEWS_FRAME_BROWSER_FRAME_ #define CHROME_BROWSER_VIEWS_FRAME_BROWSER_FRAME_ -#include "chrome/views/window_win.h" +#include "chrome/views/window/window_win.h" class AeroGlassNonClientView; class BrowserView; diff --git a/chrome/browser/views/frame/browser_view.cc b/chrome/browser/views/frame/browser_view.cc index 0a4d6e3..19e3e56 100644 --- a/chrome/browser/views/frame/browser_view.cc +++ b/chrome/browser/views/frame/browser_view.cc @@ -51,11 +51,11 @@ #include "chrome/common/resource_bundle.h" #include "chrome/common/win_util.h" #include "chrome/views/native_scroll_bar.h" -#include "chrome/views/non_client_view.h" #include "chrome/views/view.h" #include "chrome/views/widget/hwnd_notification_source.h" #include "chrome/views/widget/root_view.h" -#include "chrome/views/window.h" +#include "chrome/views/window/non_client_view.h" +#include "chrome/views/window/window.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" diff --git a/chrome/browser/views/frame/browser_view.h b/chrome/browser/views/frame/browser_view.h index 889ded3..0796ed9 100644 --- a/chrome/browser/views/frame/browser_view.h +++ b/chrome/browser/views/frame/browser_view.h @@ -11,11 +11,11 @@ #include "chrome/browser/hang_monitor/hung_window_detector.h" #include "chrome/browser/tabs/tab_strip_model.h" #include "chrome/browser/views/frame/browser_frame.h" -#include "chrome/views/client_view.h" -#include "chrome/views/window_delegate.h" #ifdef CHROME_PERSONALIZATION #include "chrome/personalization/personalization.h" #endif +#include "chrome/views/window/client_view.h" +#include "chrome/views/window/window_delegate.h" // NOTE: For more information about the objects and files in this directory, // view: https://sites.google.com/a/google.com/the-chrome-project/developers/design-documents/browser-window diff --git a/chrome/browser/views/frame/glass_browser_frame_view.cc b/chrome/browser/views/frame/glass_browser_frame_view.cc index c822aa1..1b736cf 100644 --- a/chrome/browser/views/frame/glass_browser_frame_view.cc +++ b/chrome/browser/views/frame/glass_browser_frame_view.cc @@ -8,8 +8,8 @@ #include "chrome/browser/views/tabs/tab_strip.h" #include "chrome/common/gfx/chrome_canvas.h" #include "chrome/common/resource_bundle.h" -#include "chrome/views/client_view.h" -#include "chrome/views/window_resources.h" +#include "chrome/views/window/client_view.h" +#include "chrome/views/window/window_resources.h" #include "grit/theme_resources.h" // An enumeration of bitmap resources used by this window. diff --git a/chrome/browser/views/frame/glass_browser_frame_view.h b/chrome/browser/views/frame/glass_browser_frame_view.h index 585e075..b2ca45b 100644 --- a/chrome/browser/views/frame/glass_browser_frame_view.h +++ b/chrome/browser/views/frame/glass_browser_frame_view.h @@ -7,7 +7,7 @@ #include "chrome/browser/views/frame/browser_frame.h" #include "chrome/views/button.h" -#include "chrome/views/non_client_view.h" +#include "chrome/views/window/non_client_view.h" class BrowserView; class GlassBrowserWindowResources; diff --git a/chrome/browser/views/frame/opaque_browser_frame_view.cc b/chrome/browser/views/frame/opaque_browser_frame_view.cc index 99d9d8d..665cefd 100644 --- a/chrome/browser/views/frame/opaque_browser_frame_view.cc +++ b/chrome/browser/views/frame/opaque_browser_frame_view.cc @@ -15,7 +15,7 @@ #include "chrome/common/win_util.h" #include "chrome/views/image_button.h" #include "chrome/views/widget/root_view.h" -#include "chrome/views/window_resources.h" +#include "chrome/views/window/window_resources.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" diff --git a/chrome/browser/views/frame/opaque_browser_frame_view.h b/chrome/browser/views/frame/opaque_browser_frame_view.h index 3a47ac4..df255fe 100644 --- a/chrome/browser/views/frame/opaque_browser_frame_view.h +++ b/chrome/browser/views/frame/opaque_browser_frame_view.h @@ -7,8 +7,8 @@ #include "chrome/browser/views/frame/browser_frame.h" #include "chrome/browser/views/tab_icon_view.h" -#include "chrome/views/non_client_view.h" #include "chrome/views/button.h" +#include "chrome/views/window/non_client_view.h" class BrowserView; class ChromeFont; diff --git a/chrome/browser/views/html_dialog_view.cc b/chrome/browser/views/html_dialog_view.cc index c18f002..c26bdaf 100644 --- a/chrome/browser/views/html_dialog_view.cc +++ b/chrome/browser/views/html_dialog_view.cc @@ -6,7 +6,7 @@ #include "chrome/browser/browser.h" #include "chrome/views/widget/root_view.h" -#include "chrome/views/window.h" +#include "chrome/views/window/window.h" //////////////////////////////////////////////////////////////////////////////// // HtmlDialogView, public: diff --git a/chrome/browser/views/html_dialog_view.h b/chrome/browser/views/html_dialog_view.h index c7a91fa..54bace6 100644 --- a/chrome/browser/views/html_dialog_view.h +++ b/chrome/browser/views/html_dialog_view.h @@ -11,7 +11,7 @@ #include "chrome/browser/dom_ui/html_dialog_contents.h" #include "chrome/browser/tab_contents/tab_contents_delegate.h" #include "chrome/browser/views/dom_view.h" -#include "chrome/views/window_delegate.h" +#include "chrome/views/window/window_delegate.h" class Browser; namespace views { diff --git a/chrome/browser/views/importer_view.cc b/chrome/browser/views/importer_view.cc index def2826..76fb533 100644 --- a/chrome/browser/views/importer_view.cc +++ b/chrome/browser/views/importer_view.cc @@ -10,7 +10,7 @@ #include "chrome/views/checkbox.h" #include "chrome/views/grid_layout.h" #include "chrome/views/label.h" -#include "chrome/views/window.h" +#include "chrome/views/window/window.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" diff --git a/chrome/browser/views/importer_view.h b/chrome/browser/views/importer_view.h index 1e9aaad..fcae46d 100644 --- a/chrome/browser/views/importer_view.h +++ b/chrome/browser/views/importer_view.h @@ -7,9 +7,9 @@ #include "chrome/browser/importer/importer.h" #include "chrome/views/combo_box.h" -#include "chrome/views/dialog_delegate.h" #include "chrome/views/native_button.h" #include "chrome/views/view.h" +#include "chrome/views/window/dialog_delegate.h" namespace views { class CheckBox; diff --git a/chrome/browser/views/info_bubble.cc b/chrome/browser/views/info_bubble.cc index 9638899..c4352c6 100644 --- a/chrome/browser/views/info_bubble.cc +++ b/chrome/browser/views/info_bubble.cc @@ -12,7 +12,7 @@ #include "chrome/common/resource_bundle.h" #include "chrome/common/win_util.h" #include "chrome/views/widget/root_view.h" -#include "chrome/views/window.h" +#include "chrome/views/window/window.h" #include "grit/theme_resources.h" using views::View; diff --git a/chrome/browser/views/input_window.cc b/chrome/browser/views/input_window.cc index a2bc55b..eb61945 100644 --- a/chrome/browser/views/input_window.cc +++ b/chrome/browser/views/input_window.cc @@ -11,7 +11,7 @@ #include "chrome/views/grid_layout.h" #include "chrome/views/label.h" #include "chrome/views/text_field.h" -#include "chrome/views/window.h" +#include "chrome/views/window/window.h" #include "grit/generated_resources.h" // Width to make the text field, in pixels. diff --git a/chrome/browser/views/input_window.h b/chrome/browser/views/input_window.h index 879ac92..d88ed98 100644 --- a/chrome/browser/views/input_window.h +++ b/chrome/browser/views/input_window.h @@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_VIEWS_INPUT_WINDOW_H__ #define CHROME_BROWSER_VIEWS_INPUT_WINDOW_H__ -#include "chrome/views/dialog_delegate.h" +#include "chrome/views/window/dialog_delegate.h" // InputWindowDelegate -------------------------------------------------------- diff --git a/chrome/browser/views/keyword_editor_view.cc b/chrome/browser/views/keyword_editor_view.cc index 61d81c2..e2267eb 100644 --- a/chrome/browser/views/keyword_editor_view.cc +++ b/chrome/browser/views/keyword_editor_view.cc @@ -22,11 +22,11 @@ #include "chrome/common/stl_util-inl.h" #include "chrome/views/background.h" #include "chrome/views/checkbox.h" -#include "chrome/views/dialog_delegate.h" #include "chrome/views/grid_layout.h" #include "chrome/views/text_field.h" #include "chrome/views/widget/widget.h" -#include "chrome/views/window.h" +#include "chrome/views/window/dialog_delegate.h" +#include "chrome/views/window/window.h" #include "googleurl/src/gurl.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" diff --git a/chrome/browser/views/keyword_editor_view.h b/chrome/browser/views/keyword_editor_view.h index a576430..8b0f1d1 100644 --- a/chrome/browser/views/keyword_editor_view.h +++ b/chrome/browser/views/keyword_editor_view.h @@ -9,10 +9,10 @@ #include <map> #include "chrome/browser/search_engines/template_url_model.h" -#include "chrome/views/dialog_delegate.h" #include "chrome/views/native_button.h" #include "chrome/views/table_view.h" #include "chrome/views/view.h" +#include "chrome/views/window/dialog_delegate.h" namespace views { class CheckBox; diff --git a/chrome/browser/views/new_profile_dialog.cc b/chrome/browser/views/new_profile_dialog.cc index 7574789..8690116 100644 --- a/chrome/browser/views/new_profile_dialog.cc +++ b/chrome/browser/views/new_profile_dialog.cc @@ -13,7 +13,7 @@ #include "chrome/views/message_box_view.h" #include "chrome/views/text_field.h" #include "chrome/views/view.h" -#include "chrome/views/window.h" +#include "chrome/views/window/window.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" diff --git a/chrome/browser/views/new_profile_dialog.h b/chrome/browser/views/new_profile_dialog.h index 737cce5..4e43570 100644 --- a/chrome/browser/views/new_profile_dialog.h +++ b/chrome/browser/views/new_profile_dialog.h @@ -11,8 +11,8 @@ #include "base/basictypes.h" #include "base/message_loop.h" #include "chrome/browser/shell_dialogs.h" -#include "chrome/views/dialog_delegate.h" #include "chrome/views/text_field.h" +#include "chrome/views/window/dialog_delegate.h" class MessageBoxView; namespace views { diff --git a/chrome/browser/views/options/cookies_view.h b/chrome/browser/views/options/cookies_view.h index 503bbfa..1f300cb 100644 --- a/chrome/browser/views/options/cookies_view.h +++ b/chrome/browser/views/options/cookies_view.h @@ -6,12 +6,12 @@ #define CHROME_BROWSER_VIEWS_OPTIONS_COOKIES_VIEW_H__ #include "base/task.h" -#include "chrome/views/dialog_delegate.h" #include "chrome/views/native_button.h" #include "chrome/views/table_view.h" #include "chrome/views/text_field.h" #include "chrome/views/view.h" -#include "chrome/views/window.h" +#include "chrome/views/window/dialog_delegate.h" +#include "chrome/views/window/window.h" namespace views { class Label; diff --git a/chrome/browser/views/options/fonts_languages_window_view.cc b/chrome/browser/views/options/fonts_languages_window_view.cc index 1e4372d..fd8ef61 100644 --- a/chrome/browser/views/options/fonts_languages_window_view.cc +++ b/chrome/browser/views/options/fonts_languages_window_view.cc @@ -12,7 +12,7 @@ #include "chrome/common/pref_names.h" #include "chrome/common/pref_service.h" #include "chrome/common/resource_bundle.h" -#include "chrome/views/window.h" +#include "chrome/views/window/window.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" diff --git a/chrome/browser/views/options/fonts_languages_window_view.h b/chrome/browser/views/options/fonts_languages_window_view.h index 8d27727..0ddc3d5 100644 --- a/chrome/browser/views/options/fonts_languages_window_view.h +++ b/chrome/browser/views/options/fonts_languages_window_view.h @@ -5,10 +5,10 @@ #ifndef CHROME_BROWSER_FONTS_LANGUAGE_WINDOW_H__ #define CHROME_BROWSER_FONTS_LANGUAGE_WINDOW_H__ -#include "chrome/views/dialog_delegate.h" #include "chrome/views/tabbed_pane.h" #include "chrome/views/view.h" -#include "chrome/views/window.h" +#include "chrome/views/window/dialog_delegate.h" +#include "chrome/views/window/window.h" class Profile; class FontsPageView; diff --git a/chrome/browser/views/options/options_window_view.cc b/chrome/browser/views/options/options_window_view.cc index 353b52e..bd423ec 100644 --- a/chrome/browser/views/options/options_window_view.cc +++ b/chrome/browser/views/options/options_window_view.cc @@ -18,10 +18,10 @@ #include "chrome/personalization/personalization.h" #include "chrome/personalization/views/user_data_page_view.h" #endif -#include "chrome/views/dialog_delegate.h" #include "chrome/views/tabbed_pane.h" #include "chrome/views/widget/root_view.h" -#include "chrome/views/window.h" +#include "chrome/views/window/dialog_delegate.h" +#include "chrome/views/window/window.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" diff --git a/chrome/browser/views/page_info_window.h b/chrome/browser/views/page_info_window.h index 1d3bbac..297b049 100644 --- a/chrome/browser/views/page_info_window.h +++ b/chrome/browser/views/page_info_window.h @@ -6,9 +6,9 @@ #define CHROME_BROWSER_VIEWS_PAGE_INFO_WINDOW_H__ #include "chrome/browser/tab_contents/navigation_entry.h" -#include "chrome/views/dialog_delegate.h" #include "chrome/views/native_button.h" -#include "chrome/views/window.h" +#include "chrome/views/window/dialog_delegate.h" +#include "chrome/views/window/window.h" #include "googleurl/src/gurl.h" // The page info window displays information regarding the current page, diff --git a/chrome/browser/views/password_manager_exceptions_view.h b/chrome/browser/views/password_manager_exceptions_view.h index 3313211..8efc422 100644 --- a/chrome/browser/views/password_manager_exceptions_view.h +++ b/chrome/browser/views/password_manager_exceptions_view.h @@ -11,11 +11,11 @@ #include "chrome/browser/webdata/web_data_service.h" #include "chrome/common/stl_util-inl.h" #include "chrome/common/gfx/text_elider.h" -#include "chrome/views/dialog_delegate.h" #include "chrome/views/label.h" #include "chrome/views/native_button.h" #include "chrome/views/table_view.h" -#include "chrome/views/window.h" +#include "chrome/views/window/dialog_delegate.h" +#include "chrome/views/window/window.h" #include "webkit/glue/password_form.h" class PasswordManagerExceptionsTableModel : public PasswordManagerTableModel { diff --git a/chrome/browser/views/password_manager_view.h b/chrome/browser/views/password_manager_view.h index 143567f..e382cec 100644 --- a/chrome/browser/views/password_manager_view.h +++ b/chrome/browser/views/password_manager_view.h @@ -11,11 +11,11 @@ #include "chrome/browser/webdata/web_data_service.h" #include "chrome/common/stl_util-inl.h" #include "chrome/common/gfx/text_elider.h" -#include "chrome/views/dialog_delegate.h" #include "chrome/views/label.h" #include "chrome/views/native_button.h" #include "chrome/views/table_view.h" -#include "chrome/views/window.h" +#include "chrome/views/window/dialog_delegate.h" +#include "chrome/views/window/window.h" #include "webkit/glue/password_form.h" class Profile; diff --git a/chrome/browser/views/restart_message_box.cc b/chrome/browser/views/restart_message_box.cc index bd0c8ff..199e5e9 100644 --- a/chrome/browser/views/restart_message_box.cc +++ b/chrome/browser/views/restart_message_box.cc @@ -6,7 +6,7 @@ #include "chrome/common/l10n_util.h" #include "chrome/views/message_box_view.h" -#include "chrome/views/window.h" +#include "chrome/views/window/window.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/views/restart_message_box.h b/chrome/browser/views/restart_message_box.h index 6721d20..893bf43 100644 --- a/chrome/browser/views/restart_message_box.h +++ b/chrome/browser/views/restart_message_box.h @@ -6,7 +6,7 @@ #define CHROME_BROWSER_VIEWS_RESTART_MESSAGE_BOX_H_ #include "base/basictypes.h" -#include "chrome/views/dialog_delegate.h" +#include "chrome/views/window/dialog_delegate.h" class MessageBoxView; diff --git a/chrome/browser/views/select_profile_dialog.cc b/chrome/browser/views/select_profile_dialog.cc index 0600cd8..c0b48b4 100644 --- a/chrome/browser/views/select_profile_dialog.cc +++ b/chrome/browser/views/select_profile_dialog.cc @@ -17,7 +17,7 @@ #include "chrome/views/label.h" #include "chrome/views/message_box_view.h" #include "chrome/views/view.h" -#include "chrome/views/window.h" +#include "chrome/views/window/window.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" diff --git a/chrome/browser/views/select_profile_dialog.h b/chrome/browser/views/select_profile_dialog.h index 179e754..dbfb355 100644 --- a/chrome/browser/views/select_profile_dialog.h +++ b/chrome/browser/views/select_profile_dialog.h @@ -16,7 +16,7 @@ #include "chrome/browser/shell_dialogs.h" #include "chrome/browser/user_data_manager.h" #include "chrome/views/combo_box.h" -#include "chrome/views/dialog_delegate.h" +#include "chrome/views/window/dialog_delegate.h" class SelectProfileDialogHelper; namespace views { diff --git a/chrome/browser/views/shelf_item_dialog.h b/chrome/browser/views/shelf_item_dialog.h index 8aff06c..8e61493 100644 --- a/chrome/browser/views/shelf_item_dialog.h +++ b/chrome/browser/views/shelf_item_dialog.h @@ -7,12 +7,12 @@ #include "chrome/browser/cancelable_request.h" #include "chrome/browser/history/history.h" -#include "chrome/views/dialog_delegate.h" #include "chrome/views/native_button.h" #include "chrome/views/table_view.h" #include "chrome/views/text_field.h" #include "chrome/views/view.h" -#include "chrome/views/window.h" +#include "chrome/views/window/dialog_delegate.h" +#include "chrome/views/window/window.h" namespace views { class Button; diff --git a/chrome/browser/views/tabs/tab_renderer.cc b/chrome/browser/views/tabs/tab_renderer.cc index 8bfec23..4ee10cf 100644 --- a/chrome/browser/views/tabs/tab_renderer.cc +++ b/chrome/browser/views/tabs/tab_renderer.cc @@ -15,9 +15,9 @@ #include "chrome/common/l10n_util.h" #include "chrome/common/resource_bundle.h" #include "chrome/common/win_util.h" -#include "chrome/views/non_client_view.h" #include "chrome/views/widget/widget.h" -#include "chrome/views/window.h" +#include "chrome/views/window/non_client_view.h" +#include "chrome/views/window/window.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "skia/ext/image_operations.h" diff --git a/chrome/browser/views/tabs/tab_strip.cc b/chrome/browser/views/tabs/tab_strip.cc index 2829289..037da49 100644 --- a/chrome/browser/views/tabs/tab_strip.cc +++ b/chrome/browser/views/tabs/tab_strip.cc @@ -25,8 +25,8 @@ #include "chrome/common/win_util.h" #include "chrome/views/image_view.h" #include "chrome/views/painter.h" -#include "chrome/views/non_client_view.h" -#include "chrome/views/window.h" +#include "chrome/views/window/non_client_view.h" +#include "chrome/views/window/window.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" diff --git a/chrome/browser/views/toolbar_view.cc b/chrome/browser/views/toolbar_view.cc index 1aa7b9f..1f80ed1 100644 --- a/chrome/browser/views/toolbar_view.cc +++ b/chrome/browser/views/toolbar_view.cc @@ -45,9 +45,9 @@ #include "chrome/views/button_dropdown.h" #include "chrome/views/hwnd_view.h" #include "chrome/views/label.h" -#include "chrome/views/non_client_view.h" #include "chrome/views/widget/tooltip_manager.h" -#include "chrome/views/window.h" +#include "chrome/views/window/non_client_view.h" +#include "chrome/views/window/window.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" diff --git a/chrome/browser/views/user_data_dir_dialog.cc b/chrome/browser/views/user_data_dir_dialog.cc index b45e0ca..3a19a64 100644 --- a/chrome/browser/views/user_data_dir_dialog.cc +++ b/chrome/browser/views/user_data_dir_dialog.cc @@ -7,7 +7,7 @@ #include "chrome/common/l10n_util.h" #include "chrome/views/message_box_view.h" #include "chrome/views/widget/widget.h" -#include "chrome/views/window.h" +#include "chrome/views/window/window.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/views/user_data_dir_dialog.h b/chrome/browser/views/user_data_dir_dialog.h index edc3894..87f0275 100644 --- a/chrome/browser/views/user_data_dir_dialog.h +++ b/chrome/browser/views/user_data_dir_dialog.h @@ -11,7 +11,7 @@ #include "base/basictypes.h" #include "base/message_loop.h" #include "chrome/browser/shell_dialogs.h" -#include "chrome/views/dialog_delegate.h" +#include "chrome/views/window/dialog_delegate.h" class MessageBoxView; namespace views { |