Move windowing related objects into chrome/views/window subdir.

TBR=sky

Review URL: http://codereview.chromium.org/42272

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@11819 0039d316-1c4b-4281-b951-d872f2087c98

108 files changed, 312 insertions, 300 deletions

diff --git a/chrome/browser/app_modal_dialog_queue.h b/chrome/browser/app_modal_dialog_queue.h
index 4926968..2482d5a 100644
--- a/chrome/browser/app_modal_dialog_queue.h
+++ b/chrome/browser/app_modal_dialog_queue.h
@@ -7,7 +7,7 @@
 
 #include <queue>
 
-#include "chrome/views/app_modal_dialog_delegate.h"
+#include "chrome/views/window/app_modal_dialog_delegate.h"
 
 // Keeps a queue of AppModalDialogDelegates, making sure only one app modal
 // dialog is shown at a time.
diff --git a/chrome/browser/automation/automation_provider.cc b/chrome/browser/automation/automation_provider.cc
index ca473d6..4ea5e283 100644
--- a/chrome/browser/automation/automation_provider.cc
+++ b/chrome/browser/automation/automation_provider.cc
@@ -42,8 +42,8 @@
 #include "chrome/browser/printing/print_job.h"
 #include "chrome/browser/views/bookmark_bar_view.h"
 #include "chrome/browser/views/location_bar_view.h"
-#include "chrome/views/app_modal_dialog_delegate.h"
-#include "chrome/views/window.h"
+#include "chrome/views/window/app_modal_dialog_delegate.h"
+#include "chrome/views/window/window.h"
 #endif  // defined(OS_WIN)
 
 using base::Time;
diff --git a/chrome/browser/bookmarks/bookmark_context_menu.cc b/chrome/browser/bookmarks/bookmark_context_menu.cc
index 7e9f525..6e00094 100644
--- a/chrome/browser/bookmarks/bookmark_context_menu.cc
+++ b/chrome/browser/bookmarks/bookmark_context_menu.cc
@@ -23,7 +23,7 @@
 #include "chrome/browser/views/bookmark_editor_view.h"
 #include "chrome/browser/views/bookmark_manager_view.h"
 #include "chrome/browser/views/input_window.h"
-#include "chrome/views/window.h"
+#include "chrome/views/window/window.h"
 #endif
 
 namespace {
diff --git a/chrome/browser/browser_focus_uitest.cc b/chrome/browser/browser_focus_uitest.cc
index 81edcc2..0cd1b1a 100644
--- a/chrome/browser/browser_focus_uitest.cc
+++ b/chrome/browser/browser_focus_uitest.cc
@@ -17,7 +17,7 @@
 #include "chrome/common/notification_type.h"
 #include "chrome/views/focus_manager.h"
 #include "chrome/views/view.h"
-#include "chrome/views/window.h"
+#include "chrome/views/window/window.h"
 #include "chrome/test/in_process_browser_test.h"
 #include "chrome/test/ui_test_utils.h"
 
diff --git a/chrome/browser/debugger/debugger_window.h b/chrome/browser/debugger/debugger_window.h
index 39158cb..ab916ff 100644
--- a/chrome/browser/debugger/debugger_window.h
+++ b/chrome/browser/debugger/debugger_window.h
@@ -6,8 +6,8 @@
 #define CHROME_BROWSER_DEBUGGER_DEBUGGER_WINDOW_H__
 
 #include "chrome/browser/debugger/debugger_io.h"
-#include "chrome/views/window.h"
-#include "chrome/views/window_delegate.h"
+#include "chrome/views/window/window.h"
+#include "chrome/views/window/window_delegate.h"
 
 class DebuggerView;
 class ListValue;
diff --git a/chrome/browser/first_run.cc b/chrome/browser/first_run.cc
index 5916928..84d0cb9 100644
--- a/chrome/browser/first_run.cc
+++ b/chrome/browser/first_run.cc
@@ -41,7 +41,7 @@
 #include "chrome/installer/util/shell_util.h"
 #include "chrome/installer/util/util_constants.h"
 #include "chrome/views/widget/accelerator_handler.h"
-#include "chrome/views/window.h"
+#include "chrome/views/window/window.h"
 
 #include "google_update_idl.h"
 
diff --git a/chrome/browser/jsmessage_box_handler_win.cc b/chrome/browser/jsmessage_box_handler_win.cc
index 5a6e02c..a31bed6 100644
--- a/chrome/browser/jsmessage_box_handler_win.cc
+++ b/chrome/browser/jsmessage_box_handler_win.cc
@@ -16,7 +16,7 @@
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
 #include "chrome/views/message_box_view.h"
-#include "chrome/views/window.h"
+#include "chrome/views/window/window.h"
 #include "grit/generated_resources.h"
 
 void RunJavascriptMessageBox(WebContents* web_contents,
diff --git a/chrome/browser/jsmessage_box_handler_win.h b/chrome/browser/jsmessage_box_handler_win.h
index 4bfc286..ff2b152 100644
--- a/chrome/browser/jsmessage_box_handler_win.h
+++ b/chrome/browser/jsmessage_box_handler_win.h
@@ -9,7 +9,7 @@
 #include "chrome/common/ipc_message.h"
 #include "chrome/common/notification_observer.h"
 #include "chrome/common/notification_registrar.h"
-#include "chrome/views/app_modal_dialog_delegate.h"
+#include "chrome/views/window/app_modal_dialog_delegate.h"
 #include "googleurl/src/gurl.h"
 
 class MessageBoxView;
diff --git a/chrome/browser/task_manager.cc b/chrome/browser/task_manager.cc
index 290a8a0..b2919d2 100644
--- a/chrome/browser/task_manager.cc
+++ b/chrome/browser/task_manager.cc
@@ -24,7 +24,7 @@
 #include "chrome/views/menu.h"
 #include "chrome/views/native_button.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"
 #include "grit/theme_resources.h"
diff --git a/chrome/browser/task_manager.h b/chrome/browser/task_manager.h
index 7776177..a1f54a3 100644
--- a/chrome/browser/task_manager.h
+++ b/chrome/browser/task_manager.h
@@ -13,10 +13,10 @@
 #include "base/singleton.h"
 #include "base/ref_counted.h"
 #include "base/timer.h"
-#include "chrome/views/dialog_delegate.h"
-#include "chrome/views/group_table_view.h"
 #include "chrome/browser/cache_manager_host.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
+#include "chrome/views/group_table_view.h"
+#include "chrome/views/window/dialog_delegate.h"
 #include "net/url_request/url_request_job_tracker.h"
 
 class MessageLoop;
diff --git a/chrome/browser/unload_uitest.cc b/chrome/browser/unload_uitest.cc
index d166c93..a0e5a24 100644
--- a/chrome/browser/unload_uitest.cc
+++ b/chrome/browser/unload_uitest.cc
@@ -8,7 +8,7 @@
 #include "chrome/common/chrome_switches.h"
 #include "chrome/test/automation/browser_proxy.h"
 #include "chrome/test/ui/ui_test.h"
-#include "chrome/views/dialog_delegate.h"
+#include "chrome/views/window/dialog_delegate.h"
 #include "net/url_request/url_request_unittest.h"
 
 const std::string NOLISTENERS_HTML =
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 {
diff --git a/chrome/test/automation/automation_proxy.cc b/chrome/test/automation/automation_proxy.cc
index 8f79680..35d44f8 100644
--- a/chrome/test/automation/automation_proxy.cc
+++ b/chrome/test/automation/automation_proxy.cc
@@ -20,7 +20,7 @@
 
 #if defined(OS_WIN)
 // TODO(port): Enable when dialog_delegate is ported.
-#include "chrome/views/dialog_delegate.h"
+#include "chrome/views/window/dialog_delegate.h"
 #endif
 
 using base::TimeDelta;
diff --git a/chrome/test/automation/automation_proxy.h b/chrome/test/automation/automation_proxy.h
index fa2d33f..e80259f 100644
--- a/chrome/test/automation/automation_proxy.h
+++ b/chrome/test/automation/automation_proxy.h
@@ -21,7 +21,7 @@
 
 #if defined(OS_WIN)
 // TODO(port): Enable this or equivalent.
-#include "chrome/views/dialog_delegate.h"
+#include "chrome/views/window/dialog_delegate.h"
 #endif
 
 class AutomationRequest;
diff --git a/chrome/test/automation/automation_proxy_uitest.cc b/chrome/test/automation/automation_proxy_uitest.cc
index 6b3cab5..1445061 100644
--- a/chrome/test/automation/automation_proxy_uitest.cc
+++ b/chrome/test/automation/automation_proxy_uitest.cc
@@ -17,8 +17,8 @@
 #include "chrome/test/automation/tab_proxy.h"
 #include "chrome/test/automation/window_proxy.h"
 #include "chrome/test/ui/ui_test.h"
-#include "chrome/views/dialog_delegate.h"
 #include "chrome/views/event.h"
+#include "chrome/views/window/dialog_delegate.h"
 #include "net/base/net_util.h"
 
 class AutomationProxyTest : public UITest {
diff --git a/chrome/views/SConscript b/chrome/views/SConscript
index 6030612..a4c541a 100644
--- a/chrome/views/SConscript
+++ b/chrome/views/SConscript
@@ -42,7 +42,6 @@ input_files = ChromeFileList([
   ]),
     'accelerator.cc',
     'accelerator.h',
-    'app_modal_dialog_delegate.h',
     'background.cc',
     'background.h',
     'base_button.cc',
@@ -59,19 +58,11 @@ input_files = ChromeFileList([
     'checkbox.h',
     'chrome_menu.cc',
     'chrome_menu.h',
-    'client_view.cc',
-    'client_view.h',
     'combo_box.cc',
     'combo_box.h',
     'controller.h',
-    'custom_frame_window.cc',
-    'custom_frame_window.h',
     'decision.cc',
     'decision.h',
-    'dialog_client_view.cc',
-    'dialog_client_view.h',
-    'dialog_delegate.cc',
-    'dialog_delegate.h',
     'event.cc',
     'event.h',
     'external_focus_tracker.cc',
@@ -104,8 +95,6 @@ input_files = ChromeFileList([
     'native_control.h',
     'native_scroll_bar.cc',
     'native_scroll_bar.h',
-    'non_client_view.cc',
-    'non_client_view.h',
     'painter.cc',
     'painter.h',
     '$CHROME_DIR/tools/build/win/precompiled_wtl$OBJSUFFIX',
@@ -160,11 +149,24 @@ input_files = ChromeFileList([
     'widget/widget.h',
     'widget/widget_win.cc',
     'widget/widget_win.h',
-    'window.cc',
-    'window.h',
-    'window_delegate.cc',
-    'window_delegate.h',
-    'window_resources.h',
+    'window/app_modal_dialog_delegate.h',
+    'window/client_view.cc',
+    'window/client_view.h',
+    'window/custom_frame_view.cc',
+    'window/custom_frame_view.h',
+    'window/dialog_client_view.cc',
+    'window/dialog_client_view.h',
+    'window/dialog_delegate.cc',
+    'window/dialog_delegate.h',
+    'window/native_frame_view.cc',
+    'window/native_frame_view.h',
+    'window/non_client_view.cc',
+    'window/non_client_view.h',
+    'window/window.cc',
+    'window/window.h',
+    'window/window_delegate.cc',
+    'window/window_delegate.h',
+    'window/window_resources.h',
 ])
 
 if not env.Bit('windows'):
@@ -220,11 +222,7 @@ if env.Bit('linux'):
       'button_dropdown.cc',
       'checkbox.cc',
       'chrome_menu.cc',
-      'client_view.cc',
       'combo_box.cc',
-      'custom_frame_window.cc',
-      'dialog_delegate.cc',
-      'dialog_client_view.cc',
       'decision.cc',
       'event.cc',
       'focus_manager.cc',
@@ -237,7 +235,6 @@ if env.Bit('linux'):
       'native_button.cc',
       'native_control.cc',
       'native_scroll_bar.cc',
-      'non_client_view.cc',
       'radio_button.cc',
       'resize_corner.cc',
       'separator.cc',
@@ -252,8 +249,14 @@ if env.Bit('linux'):
       'widget/root_view_drop_target.cc',
       'widget/tooltip_manager.cc',
       'widget/widget_win.cc',
-      'window.cc',
-      'window_delegate.cc',
+      'window/client_view.cc',
+      'window/custom_frame_view.cc',
+      'window/dialog_delegate.cc',
+      'window/dialog_client_view.cc',
+      'window/native_frame_view.cc',
+      'window/non_client_view.cc',
+      'window/window_delegate.cc',
+      'window/window_win.cc',
   )
 
 if env.Bit('mac'):
@@ -271,11 +274,7 @@ if env.Bit('mac'):
       'button_dropdown.cc',
       'checkbox.cc',
       'chrome_menu.cc',
-      'client_view.cc',
       'combo_box.cc',
-      'custom_frame_window.cc',
-      'dialog_delegate.cc',
-      'dialog_client_view.cc',
       'decision.cc',
       'event.cc',
       'external_focus_tracker.cc',
@@ -293,7 +292,6 @@ if env.Bit('mac'):
       'native_button.cc',
       'native_control.cc',
       'native_scroll_bar.cc',
-      'non_client_view.cc',
       'painter.cc',
       'radio_button.cc',
       'repeat_controller.cc',
@@ -315,8 +313,14 @@ if env.Bit('mac'):
       'widget/root_view_drop_target.cc',
       'widget/tooltip_manager.cc',
       'widget/widget_win.cc',
-      'window.cc',
-      'window_delegate.cc',
+      'window/client_view.cc',
+      'window/custom_frame_view.cc',
+      'window/dialog_delegate.cc',
+      'window/dialog_client_view.cc',
+      'window/native_frame_view.cc',
+      'window/non_client_view.cc',
+      'window/window_delegate.cc',
+      'window/window_win.cc',
   )
 
 env.ChromeLibrary('views', input_files)
diff --git a/chrome/views/focus_manager_unittest.cc b/chrome/views/focus_manager_unittest.cc
index b08e19a..e41920c 100644
--- a/chrome/views/focus_manager_unittest.cc
+++ b/chrome/views/focus_manager_unittest.cc
@@ -23,8 +23,8 @@
 #include "chrome/views/widget/accelerator_handler.h"
 #include "chrome/views/widget/root_view.h"
 #include "chrome/views/widget/widget_win.h"
-#include "chrome/views/window.h"
-#include "chrome/views/window_delegate.h"
+#include "chrome/views/window/window.h"
+#include "chrome/views/window/window_delegate.h"
 #include "SkColor.h"
 
 
diff --git a/chrome/views/table_view_unittest.cc b/chrome/views/table_view_unittest.cc
index 06f3458..f94e86d 100644
--- a/chrome/views/table_view_unittest.cc
+++ b/chrome/views/table_view_unittest.cc
@@ -7,8 +7,8 @@
 #include "base/message_loop.h"
 #include "base/string_util.h"
 #include "chrome/views/table_view.h"
-#include "chrome/views/window_win.h"
-#include "chrome/views/window_delegate.h"
+#include "chrome/views/window/window_delegate.h"
+#include "chrome/views/window/window_win.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using views::TableView;
diff --git a/chrome/views/view_unittest.cc b/chrome/views/view_unittest.cc
index 7da9f42..dcb49f7 100644
--- a/chrome/views/view_unittest.cc
+++ b/chrome/views/view_unittest.cc
@@ -8,12 +8,12 @@
 #include "chrome/common/notification_service.h"
 #include "chrome/views/background.h"
 #include "chrome/views/checkbox.h"
-#include "chrome/views/dialog_delegate.h"
 #include "chrome/views/event.h"
 #include "chrome/views/view.h"
 #include "chrome/views/widget/root_view.h"
 #include "chrome/views/widget/widget_win.h"
-#include "chrome/views/window.h"
+#include "chrome/views/window/dialog_delegate.h"
+#include "chrome/views/window/window.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using namespace views;
diff --git a/chrome/views/views.vcproj b/chrome/views/views.vcproj
index 890347a..a9c31cb 100644
--- a/chrome/views/views.vcproj
+++ b/chrome/views/views.vcproj
@@ -331,6 +331,86 @@
 				>
 			</File>
 		</Filter>
+		<Filter
+			Name="window"
+			>
+			<File
+				RelativePath=".\window\app_modal_dialog_delegate.h"
+				>
+			</File>
+			<File
+				RelativePath=".\window\client_view.cc"
+				>
+			</File>
+			<File
+				RelativePath=".\window\client_view.h"
+				>
+			</File>
+			<File
+				RelativePath=".\window\custom_frame_view.cc"
+				>
+			</File>
+			<File
+				RelativePath=".\window\custom_frame_view.h"
+				>
+			</File>
+			<File
+				RelativePath=".\window\dialog_client_view.cc"
+				>
+			</File>
+			<File
+				RelativePath=".\window\dialog_client_view.h"
+				>
+			</File>
+			<File
+				RelativePath=".\window\dialog_delegate.cc"
+				>
+			</File>
+			<File
+				RelativePath=".\window\dialog_delegate.h"
+				>
+			</File>
+			<File
+				RelativePath=".\window\native_frame_view.cc"
+				>
+			</File>
+			<File
+				RelativePath=".\window\native_frame_view.h"
+				>
+			</File>
+			<File
+				RelativePath=".\window\non_client_view.cc"
+				>
+			</File>
+			<File
+				RelativePath=".\window\non_client_view.h"
+				>
+			</File>
+			<File
+				RelativePath=".\window\window.h"
+				>
+			</File>
+			<File
+				RelativePath=".\window\window_delegate.cc"
+				>
+			</File>
+			<File
+				RelativePath=".\window\window_delegate.h"
+				>
+			</File>
+			<File
+				RelativePath=".\window\window_resources.h"
+				>
+			</File>
+			<File
+				RelativePath=".\window\window_win.cc"
+				>
+			</File>
+			<File
+				RelativePath=".\window\window_win.h"
+				>
+			</File>
+		</Filter>
 		<File
 			RelativePath=".\accelerator.cc"
 			>
@@ -400,14 +480,6 @@
 			>
 		</File>
 		<File
-			RelativePath=".\client_view.cc"
-			>
-		</File>
-		<File
-			RelativePath=".\client_view.h"
-			>
-		</File>
-		<File
 			RelativePath=".\combo_box.cc"
 			>
 		</File>
@@ -428,14 +500,6 @@
 			>
 		</File>
 		<File
-			RelativePath=".\custom_frame_view.cc"
-			>
-		</File>
-		<File
-			RelativePath=".\custom_frame_view.h"
-			>
-		</File>
-		<File
 			RelativePath=".\decision.cc"
 			>
 		</File>
@@ -444,22 +508,6 @@
 			>
 		</File>
 		<File
-			RelativePath=".\dialog_client_view.cc"
-			>
-		</File>
-		<File
-			RelativePath=".\dialog_client_view.h"
-			>
-		</File>
-		<File
-			RelativePath=".\dialog_delegate.cc"
-			>
-		</File>
-		<File
-			RelativePath=".\dialog_delegate.h"
-			>
-		</File>
-		<File
 			RelativePath=".\event.cc"
 			>
 		</File>
@@ -592,14 +640,6 @@
 			>
 		</File>
 		<File
-			RelativePath=".\native_frame_view.cc"
-			>
-		</File>
-		<File
-			RelativePath=".\native_frame_view.h"
-			>
-		</File>
-		<File
 			RelativePath=".\native_scroll_bar.cc"
 			>
 		</File>
@@ -608,14 +648,6 @@
 			>
 		</File>
 		<File
-			RelativePath=".\non_client_view.cc"
-			>
-		</File>
-		<File
-			RelativePath=".\non_client_view.h"
-			>
-		</File>
-		<File
 			RelativePath=".\painter.cc"
 			>
 		</File>
@@ -779,30 +811,6 @@
 			RelativePath=".\view_win.cc"
 			>
 		</File>
-		<File
-			RelativePath=".\window.h"
-			>
-		</File>
-		<File
-			RelativePath=".\window_delegate.cc"
-			>
-		</File>
-		<File
-			RelativePath=".\window_delegate.h"
-			>
-		</File>
-		<File
-			RelativePath=".\window_resources.h"
-			>
-		</File>
-		<File
-			RelativePath=".\window_win.cc"
-			>
-		</File>
-		<File
-			RelativePath=".\window_win.h"
-			>
-		</File>
 	</Files>
 	<Globals>
 	</Globals>
diff --git a/chrome/views/widget/accelerator_handler.h b/chrome/views/widget/accelerator_handler.h
index f71be26..6c2278c 100644
--- a/chrome/views/widget/accelerator_handler.h
+++ b/chrome/views/widget/accelerator_handler.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_VIEWS_ACCELERATOR_HANDLER_H__
-#define CHROME_VIEWS_ACCELERATOR_HANDLER_H__
+#ifndef CHROME_VIEWS_WIDGET_ACCELERATOR_HANDLER_H_
+#define CHROME_VIEWS_WIDGET_ACCELERATOR_HANDLER_H_
 
 #include "base/message_loop.h"
 
@@ -27,4 +27,4 @@ class AcceleratorHandler : public MessageLoopForUI::Dispatcher {
 
 }  // namespace views
 
-#endif  // CHROME_VIEWS_ACCELERATOR_HANDLER_H__
+#endif  // CHROME_VIEWS_WIDGET_ACCELERATOR_HANDLER_H_
diff --git a/chrome/views/widget/aero_tooltip_manager.h b/chrome/views/widget/aero_tooltip_manager.h
index 17fab05..fac5a39 100644
--- a/chrome/views/widget/aero_tooltip_manager.h
+++ b/chrome/views/widget/aero_tooltip_manager.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_VIEWS_AERO_TOOLTIP_MANAGER_H__
-#define CHROME_VIEWS_AERO_TOOLTIP_MANAGER_H__
+#ifndef CHROME_VIEWS_WIDGET_AERO_TOOLTIP_MANAGER_H_
+#define CHROME_VIEWS_WIDGET_AERO_TOOLTIP_MANAGER_H_
 
 #include "base/ref_counted.h"
 #include "base/task.h"
@@ -54,4 +54,4 @@ class AeroTooltipManager : public TooltipManager {
 
 }  // namespace views
 
-#endif  // #ifndef CHROME_VIEWS_AERO_TOOLTIP_MANAGER_H__
+#endif  // #ifndef CHROME_VIEWS_WIDGET_AERO_TOOLTIP_MANAGER_H_
diff --git a/chrome/views/widget/hwnd_notification_source.h b/chrome/views/widget/hwnd_notification_source.h
index 9f33c2b..602ae44 100644
--- a/chrome/views/widget/hwnd_notification_source.h
+++ b/chrome/views/widget/hwnd_notification_source.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_VIEWS_WIDGET_HWND_NOTIFICATION_SOURCE_H__
-#define CHROME_VIEWS_WIDGET_HWND_NOTIFICATION_SOURCE_H__
+#ifndef CHROME_VIEWS_WIDGET_HWND_NOTIFICATION_SOURCE_H_
+#define CHROME_VIEWS_WIDGET_HWND_NOTIFICATION_SOURCE_H_
 
 #include "chrome/common/notification_source.h"
 
@@ -21,4 +21,4 @@ class Source<HWND> : public NotificationSource {
   HWND ptr() const { return static_cast<HWND>(ptr_); }
 };
 
-#endif  // #define CHROME_VIEWS_WIDGET_HWND_NOTIFICATION_SOURCE_H__
+#endif  // #define CHROME_VIEWS_WIDGET_HWND_NOTIFICATION_SOURCE_H_
diff --git a/chrome/views/widget/root_view.h b/chrome/views/widget/root_view.h
index 57ea710..a97f2ec 100644
--- a/chrome/views/widget/root_view.h
+++ b/chrome/views/widget/root_view.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_VIEWS_ROOT_VIEW_H__
-#define CHROME_VIEWS_ROOT_VIEW_H__
+#ifndef CHROME_VIEWS_WIDGET_ROOT_VIEW_H_
+#define CHROME_VIEWS_WIDGET_ROOT_VIEW_H_
 
 #include "base/ref_counted.h"
 #include "chrome/views/focus_manager.h"
@@ -355,4 +355,4 @@ class RootView : public View,
 
 }  // namespace views
 
-#endif // CHROME_VIEWS_ROOT_VIEW_H__
+#endif // CHROME_VIEWS_WIDGET_ROOT_VIEW_H_
diff --git a/chrome/views/widget/root_view_drop_target.h b/chrome/views/widget/root_view_drop_target.h
index 72a5a87..02ce6c6 100644
--- a/chrome/views/widget/root_view_drop_target.h
+++ b/chrome/views/widget/root_view_drop_target.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_VIEWS_ROOT_VIEW_DROP_TARGET_H__
-#define CHROME_VIEWS_ROOT_VIEW_DROP_TARGET_H__
+#ifndef CHROME_VIEWS_WIDGET_ROOT_VIEW_DROP_TARGET_H_
+#define CHROME_VIEWS_WIDGET_ROOT_VIEW_DROP_TARGET_H_
 
 #include <atlbase.h>
 #include <atlapp.h>
@@ -72,4 +72,4 @@ class RootViewDropTarget : public BaseDropTarget {
 
 }  // namespace views
 
-#endif  // CHROME_VIEWS_ROOT_VIEW_DROP_TARGET_H__
+#endif  // CHROME_VIEWS_WIDGET_ROOT_VIEW_DROP_TARGET_H_
diff --git a/chrome/views/widget/tooltip_manager.h b/chrome/views/widget/tooltip_manager.h
index 2800fb0..312e30e 100644
--- a/chrome/views/widget/tooltip_manager.h
+++ b/chrome/views/widget/tooltip_manager.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_VIEWS_TOOLTIP_MANAGER_H_
-#define CHROME_VIEWS_TOOLTIP_MANAGER_H_
+#ifndef CHROME_VIEWS_WIDGET_TOOLTIP_MANAGER_H_
+#define CHROME_VIEWS_WIDGET_TOOLTIP_MANAGER_H_
 
 #include <windows.h>
 #include <string>
@@ -153,7 +153,7 @@ class TooltipManager {
   // control window for tooltip displayed using keyboard.
   HWND keyboard_tooltip_hwnd_;
 
-  // Used to register DestroyTooltipWindow function with postdelayedtask
+  // Used to register DestroyTooltipWindow function with PostDelayedTask
   // function.
   ScopedRunnableMethodFactory<TooltipManager> keyboard_tooltip_factory_;
 
@@ -162,4 +162,4 @@ class TooltipManager {
 
 }  // namespace views
 
-#endif // CHROME_VIEWS_TOOLTIP_MANAGER_H_
+#endif // CHROME_VIEWS_WIDGET_TOOLTIP_MANAGER_H_
diff --git a/chrome/views/widget/widget.h b/chrome/views/widget/widget.h
index 46aa754..d1d0fff 100644
--- a/chrome/views/widget/widget.h
+++ b/chrome/views/widget/widget.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_VIEWS_WIDGET_H_
-#define CHROME_VIEWS_WIDGET_H_
+#ifndef CHROME_VIEWS_WIDGET_WIDGET_H_
+#define CHROME_VIEWS_WIDGET_WIDGET_H_
 
 #include "base/gfx/native_widget_types.h"
 
@@ -82,4 +82,4 @@ class Widget {
 
 }  // namespace views
 
-#endif // CHROME_VIEWS_WIDGET_H_
+#endif // CHROME_VIEWS_WIDGET_WIDGET_H_
diff --git a/chrome/views/widget/widget_win.h b/chrome/views/widget/widget_win.h
index d5d5bad..c9fe810 100644
--- a/chrome/views/widget/widget_win.h
+++ b/chrome/views/widget/widget_win.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_VIEWS_WIDGET_WIN_H_
-#define CHROME_VIEWS_WIDGET_WIN_H_
+#ifndef CHROME_VIEWS_WIDGET_WIDGET_WIN_H_
+#define CHROME_VIEWS_WIDGET_WIDGET_WIN_H_
 
 #include <atlbase.h>
 #include <atlcrack.h>
@@ -632,4 +632,4 @@ class WidgetWin : public Widget,
 
 }  // namespace views
 
-#endif  // #ifndef CHROME_VIEWS_WIDGET_WIN_H_
+#endif  // #ifndef CHROME_VIEWS_WIDGET_WIDGET_WIN_H_
diff --git a/chrome/views/app_modal_dialog_delegate.h b/chrome/views/window/app_modal_dialog_delegate.h
index 399b593..6ccfc28 100644
--- a/chrome/views/app_modal_dialog_delegate.h
+++ b/chrome/views/window/app_modal_dialog_delegate.h
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_VIEWS_APP_MODAL_DIALOG_DELEGATE_H__
-#define CHROME_VIEWS_APP_MODAL_DIALOG_DELEGATE_H__
+#ifndef CHROME_VIEWS_WINDOW_APP_MODAL_DIALOG_DELEGATE_H_
+#define CHROME_VIEWS_WINDOW_APP_MODAL_DIALOG_DELEGATE_H_
 
-#include "chrome/views/dialog_delegate.h"
+#include "chrome/views/window/dialog_delegate.h"
 
 namespace views {
 
@@ -21,4 +21,4 @@ class AppModalDialogDelegate : public DialogDelegate {
 
 } // namespace views
 
-#endif  // #ifndef CHROME_VIEWS_APP_MODAL_DIALOG_DELEGATE_H__
+#endif  // #ifndef CHROME_VIEWS_WINDOW_APP_MODAL_DIALOG_DELEGATE_H_
diff --git a/chrome/views/client_view.cc b/chrome/views/window/client_view.cc
index 319dd56..37ae937 100644
--- a/chrome/views/client_view.cc
+++ b/chrome/views/window/client_view.cc
@@ -3,9 +3,9 @@
 // found in the LICENSE file.
 
 #include "base/logging.h"
-#include "chrome/views/client_view.h"
-#include "chrome/views/window.h"
-#include "chrome/views/window_delegate.h"
+#include "chrome/views/window/client_view.h"
+#include "chrome/views/window/window.h"
+#include "chrome/views/window/window_delegate.h"
 
 namespace views {
 
diff --git a/chrome/views/client_view.h b/chrome/views/window/client_view.h
index b9b60e3..9db0c69 100644
--- a/chrome/views/client_view.h
+++ b/chrome/views/window/client_view.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_VIEWS_CLIENT_VIEW_H_
-#define CHROME_VIEWS_CLIENT_VIEW_H_
+#ifndef CHROME_VIEWS_WINDOW_CLIENT_VIEW_H_
+#define CHROME_VIEWS_WINDOW_CLIENT_VIEW_H_
 
 #include "chrome/views/view.h"
 
@@ -81,4 +81,4 @@ class ClientView : public View {
 
 }  // namespace views
 
-#endif  // #ifndef CHROME_VIEWS_CLIENT_VIEW_H_
+#endif  // #ifndef CHROME_VIEWS_WINDOW_CLIENT_VIEW_H_
diff --git a/chrome/views/custom_frame_view.cc b/chrome/views/window/custom_frame_view.cc
index d330be0..d3843a4 100644
--- a/chrome/views/custom_frame_view.cc
+++ b/chrome/views/window/custom_frame_view.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/views/custom_frame_view.h"
+#include "chrome/views/window/custom_frame_view.h"
 
 #include "base/win_util.h"
 #include "chrome/common/gfx/path.h"
@@ -10,8 +10,8 @@
 #include "chrome/common/gfx/chrome_font.h"
 #include "chrome/common/resource_bundle.h"
 #include "chrome/common/win_util.h"
-#include "chrome/views/client_view.h"
-#include "chrome/views/window_delegate.h"
+#include "chrome/views/window/client_view.h"
+#include "chrome/views/window/window_delegate.h"
 #include "grit/theme_resources.h"
 
 namespace views {
diff --git a/chrome/views/custom_frame_view.h b/chrome/views/window/custom_frame_view.h
index 2edc3f9..9b06c3f 100644
--- a/chrome/views/custom_frame_view.h
+++ b/chrome/views/window/custom_frame_view.h
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_VIEWS_CUSTOM_FRAME_VIEW_H_
-#define CHROME_VIEWS_CUSTOM_FRAME_VIEW_H_
+#ifndef CHROME_VIEWS_WINDOW_CUSTOM_FRAME_VIEW_H_
+#define CHROME_VIEWS_WINDOW_CUSTOM_FRAME_VIEW_H_
 
 #include "chrome/views/image_button.h"
-#include "chrome/views/non_client_view.h"
-#include "chrome/views/window.h"
-#include "chrome/views/window_resources.h"
+#include "chrome/views/window/non_client_view.h"
+#include "chrome/views/window/window.h"
+#include "chrome/views/window/window_resources.h"
 
 namespace gfx{
 class Size;
@@ -119,4 +119,4 @@ class CustomFrameView : public NonClientFrameView,
 
 }  // namespace views
 
-#endif  // #ifndef CHROME_VIEWS_CUSTOM_FRAME_VIEW_H_
+#endif  // #ifndef CHROME_VIEWS_WINDOW_CUSTOM_FRAME_VIEW_H_
diff --git a/chrome/views/dialog_client_view.cc b/chrome/views/window/dialog_client_view.cc
index 74732a3..dbc3b179 100644
--- a/chrome/views/dialog_client_view.cc
+++ b/chrome/views/window/dialog_client_view.cc
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "chrome/views/window/dialog_client_view.h"
+
 #include <windows.h>
 #include <uxtheme.h>
 #include <vsstyle.h>
 
-#include "chrome/views/dialog_client_view.h"
-
 #include "base/gfx/native_theme.h"
 #include "chrome/browser/views/standard_layout.h"
 #include "chrome/common/gfx/chrome_canvas.h"
@@ -15,8 +15,8 @@
 #include "chrome/common/l10n_util.h"
 #include "chrome/common/resource_bundle.h"
 #include "chrome/common/win_util.h"
-#include "chrome/views/dialog_delegate.h"
-#include "chrome/views/window.h"
+#include "chrome/views/window/dialog_delegate.h"
+#include "chrome/views/window/window.h"
 #include "grit/generated_resources.h"
 
 namespace views {
diff --git a/chrome/views/dialog_client_view.h b/chrome/views/window/dialog_client_view.h
index e8bbdc2..0b4da5f 100644
--- a/chrome/views/dialog_client_view.h
+++ b/chrome/views/window/dialog_client_view.h
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_VIEWS_DIALOG_CLIENT_VIEW_H_
-#define CHROME_VIEWS_DIALOG_CLIENT_VIEW_H_
+#ifndef CHROME_VIEWS_WINDOW_DIALOG_CLIENT_VIEW_H_
+#define CHROME_VIEWS_WINDOW_DIALOG_CLIENT_VIEW_H_
 
 #include "chrome/common/gfx/chrome_font.h"
-#include "chrome/views/client_view.h"
 #include "chrome/views/focus_manager.h"
 #include "chrome/views/native_button.h"
+#include "chrome/views/window/client_view.h"
 
 namespace views {
 
@@ -119,4 +119,4 @@ class DialogClientView : public ClientView,
 
 }  // namespace views
 
-#endif  // #ifndef CHROME_VIEWS_DIALOG_CLIENT_VIEW_H_
+#endif  // #ifndef CHROME_VIEWS_WINDOW_DIALOG_CLIENT_VIEW_H_
diff --git a/chrome/views/dialog_delegate.cc b/chrome/views/window/dialog_delegate.cc
index d873318..8a1c671 100644
--- a/chrome/views/dialog_delegate.cc
+++ b/chrome/views/window/dialog_delegate.cc
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/views/dialog_delegate.h"
+#include "chrome/views/window/dialog_delegate.h"
 
 #include "base/logging.h"
-#include "chrome/views/window.h"
+#include "chrome/views/window/window.h"
 
 namespace views {
 
diff --git a/chrome/views/dialog_delegate.h b/chrome/views/window/dialog_delegate.h
index d077e60..b8b2d1b 100644
--- a/chrome/views/dialog_delegate.h
+++ b/chrome/views/window/dialog_delegate.h
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_VIEWS_DIALOG_DELEGATE_H_
-#define CHROME_VIEWS_DIALOG_DELEGATE_H_
+#ifndef CHROME_VIEWS_WINDOW_DIALOG_DELEGATE_H_
+#define CHROME_VIEWS_WINDOW_DIALOG_DELEGATE_H_
 
-#include "chrome/views/dialog_client_view.h"
-#include "chrome/views/window_delegate.h"
+#include "chrome/views/window/dialog_client_view.h"
+#include "chrome/views/window/window_delegate.h"
 
 namespace views {
 
@@ -108,4 +108,4 @@ class DialogDelegate : public WindowDelegate {
 
 }  // namespace views
 
-#endif  // CHROME_VIEWS_DIALOG_DELEGATE_H_
+#endif  // CHROME_VIEWS_WINDOW_DIALOG_DELEGATE_H_
diff --git a/chrome/views/native_frame_view.cc b/chrome/views/window/native_frame_view.cc
index 898e105..4446f30 100644
--- a/chrome/views/native_frame_view.cc
+++ b/chrome/views/window/native_frame_view.cc
@@ -2,9 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/views/native_frame_view.h"
+#include "chrome/views/window/native_frame_view.h"
 
-#include "chrome/views/window_win.h"
+#include "chrome/views/window/window_win.h"
 
 namespace views {
 
diff --git a/chrome/views/native_frame_view.h b/chrome/views/window/native_frame_view.h
index c13784d..336d7c4 100644
--- a/chrome/views/native_frame_view.h
+++ b/chrome/views/window/native_frame_view.h
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_VIEWS_NATIVE_FRAME_VIEW_H_
-#define CHROME_VIEWS_NATIVE_FRAME_VIEW_H_
+#ifndef CHROME_VIEWS_WINDOW_NATIVE_FRAME_VIEW_H_
+#define CHROME_VIEWS_WINDOW_NATIVE_FRAME_VIEW_H_
 
-#include "chrome/views/non_client_view.h"
+#include "chrome/views/window/non_client_view.h"
 
 namespace views {
 
@@ -36,4 +36,4 @@ class NativeFrameView : public NonClientFrameView {
 
 }  // namespace views
 
-#endif  // #ifndef CHROME_VIEWS_NATIVE_FRAME_VIEW_H_
+#endif  // #ifndef CHROME_VIEWS_WINDOW_NATIVE_FRAME_VIEW_H_
diff --git a/chrome/views/non_client_view.cc b/chrome/views/window/non_client_view.cc
index c234f23..327656b 100644
--- a/chrome/views/non_client_view.cc
+++ b/chrome/views/window/non_client_view.cc
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/views/non_client_view.h"
+#include "chrome/views/window/non_client_view.h"
 
 #include "chrome/common/win_util.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"
 
 namespace views {
 
diff --git a/chrome/views/non_client_view.h b/chrome/views/window/non_client_view.h
index d2ed5c1..45a089f 100644
--- a/chrome/views/non_client_view.h
+++ b/chrome/views/window/non_client_view.h
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_VIEWS_NON_CLIENT_VIEW_H_
-#define CHROME_VIEWS_NON_CLIENT_VIEW_H_
+#ifndef CHROME_VIEWS_WINDOW_NON_CLIENT_VIEW_H_
+#define CHROME_VIEWS_WINDOW_NON_CLIENT_VIEW_H_
 
 #include "base/task.h"
 #include "chrome/views/view.h"
-#include "chrome/views/client_view.h"
+#include "chrome/views/window/client_view.h"
 
 namespace gfx {
 class Path;
@@ -218,4 +218,4 @@ class NonClientView : public View {
 
 }  // namespace views
 
-#endif  // #ifndef CHROME_VIEWS_NON_CLIENT_VIEW_H_
+#endif  // #ifndef CHROME_VIEWS_WINDOW_NON_CLIENT_VIEW_H_
diff --git a/chrome/views/window.h b/chrome/views/window/window.h
index 6ac5fb7..48c1ad8 100644
--- a/chrome/views/window.h
+++ b/chrome/views/window/window.h
@@ -2,8 +2,8 @@
 // source code is governed by a BSD-style license that can be found in the
 // LICENSE file.
 
-#ifndef CHROME_VIEWS_WINDOW_H__
-#define CHROME_VIEWS_WINDOW_H__
+#ifndef CHROME_VIEWS_WINDOW_WINDOW_H_
+#define CHROME_VIEWS_WINDOW_WINDOW_H_
 
 #include "base/gfx/native_widget_types.h"
 
@@ -115,4 +115,4 @@ class Window {
 
 }  // namespace views
 
-#endif  // #ifndef CHROME_VIEWS_WINDOW_H__
+#endif  // #ifndef CHROME_VIEWS_WINDOW_WINDOW_H_
diff --git a/chrome/views/window_delegate.cc b/chrome/views/window/window_delegate.cc
index 1ac5d31..917836f 100644
--- a/chrome/views/window_delegate.cc
+++ b/chrome/views/window/window_delegate.cc
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/views/window_delegate.h"
+#include "chrome/views/window/window_delegate.h"
 
 // TODO(beng): hrmp. Fix this in http://crbug.com/4406
 #include "chrome/browser/browser_process.h"
 #include "chrome/common/pref_service.h"
-#include "chrome/views/client_view.h"
-#include "chrome/views/window.h"
+#include "chrome/views/window/client_view.h"
+#include "chrome/views/window/window.h"
 #include "skia/include/SkBitmap.h"
 
 namespace views {
diff --git a/chrome/views/window_delegate.h b/chrome/views/window/window_delegate.h
index 985ed60..52dd86a8 100644
--- a/chrome/views/window_delegate.h
+++ b/chrome/views/window/window_delegate.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_VIEWS_WINDOW_DELEGATE_H_
-#define CHROME_VIEWS_WINDOW_DELEGATE_H_
+#ifndef CHROME_VIEWS_WINDOW_WINDOW_DELEGATE_H_
+#define CHROME_VIEWS_WINDOW_WINDOW_DELEGATE_H_
 
 #include <string>
 
@@ -159,4 +159,4 @@ class WindowDelegate {
 
 }  // namespace views
 
-#endif  // CHROME_VIEWS_WINDOW_DELEGATE_H_
+#endif  // CHROME_VIEWS_WINDOW_WINDOW_DELEGATE_H_
diff --git a/chrome/views/window_resources.h b/chrome/views/window/window_resources.h
index 6face56..9db078e 100644
--- a/chrome/views/window_resources.h
+++ b/chrome/views/window/window_resources.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_VIEWS_WINDOW_RESOURCES_H_
-#define CHROME_BROWSER_VIEWS_WINDOW_RESOURCES_H_
+#ifndef CHROME_VIEWS_WINDOW_WINDOW_RESOURCES_H_
+#define CHROME_VIEWS_WINDOW_WINDOW_RESOURCES_H_
 
 class SkBitmap;
 
@@ -27,4 +27,4 @@ class WindowResources {
 
 }  // namespace views
 
-#endif  // CHROME_BROWSER_VIEWS_WINDOW_RESOURCES_H_
+#endif  // CHROME_VIEWS_WINDOW_WINDOW_RESOURCES_H_
diff --git a/chrome/views/window_win.cc b/chrome/views/window/window_win.cc
index fda6eb7..7d2fc9a 100644
--- a/chrome/views/window_win.cc
+++ b/chrome/views/window/window_win.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/views/window_win.h"
+#include "chrome/views/window/window_win.h"
 
 #include <shellapi.h>
 
@@ -17,12 +17,12 @@
 #include "chrome/common/pref_service.h"
 #include "chrome/common/resource_bundle.h"
 #include "chrome/common/win_util.h"
-#include "chrome/views/client_view.h"
-#include "chrome/views/custom_frame_view.h"
-#include "chrome/views/native_frame_view.h"
-#include "chrome/views/non_client_view.h"
 #include "chrome/views/widget/root_view.h"
-#include "chrome/views/window_delegate.h"
+#include "chrome/views/window/client_view.h"
+#include "chrome/views/window/custom_frame_view.h"
+#include "chrome/views/window/native_frame_view.h"
+#include "chrome/views/window/non_client_view.h"
+#include "chrome/views/window/window_delegate.h"
 #include "grit/generated_resources.h"
 
 namespace views {
diff --git a/chrome/views/window_win.h b/chrome/views/window/window_win.h
index 7b27ee0..6c33093 100644
--- a/chrome/views/window_win.h
+++ b/chrome/views/window/window_win.h
@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_VIEWS_WINDOW_WIN_H__
-#define CHROME_VIEWS_WINDOW_WIN_H__
+#ifndef CHROME_VIEWS_WINDOW_WINDOW_WIN_H__
+#define CHROME_VIEWS_WINDOW_WINDOW_WIN_H__
 
 #include "chrome/common/notification_registrar.h"
-#include "chrome/views/client_view.h"
-#include "chrome/views/non_client_view.h"
 #include "chrome/views/widget/widget_win.h"
-#include "chrome/views/window.h"
+#include "chrome/views/window/client_view.h"
+#include "chrome/views/window/non_client_view.h"
+#include "chrome/views/window/window.h"
 
 namespace gfx {
 class Point;
@@ -275,4 +275,4 @@ class WindowWin : public WidgetWin,
 
 }  // namespace views
 
-#endif  // CHROME_VIEWS_WINDOW_WIN_H__
+#endif  // CHROME_VIEWS_WINDOW_WINDOW_WIN_H__