Move controls into their own dir under chrome/views/controls

TBR=sky Review URL: http://codereview.chromium.org/48058 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@11841 0039d316-1c4b-4281-b951-d872f2087c98
author: ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> 2009-03-17 04:56:55 +0000
committer: ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> 2009-03-17 04:56:55 +0000
commit: 6f3290938a0f8a839ce75df6359d36145ba3b6af (patch)
tree: 338c21aafe3f28f94a3d7134cf96ad4a13f63459
parent: 0520d327302fe86f633191d68d56925fd64719fc (diff)
download: chromium_src-6f3290938a0f8a839ce75df6359d36145ba3b6af.zip
chromium_src-6f3290938a0f8a839ce75df6359d36145ba3b6af.tar.gz
chromium_src-6f3290938a0f8a839ce75df6359d36145ba3b6af.tar.bz2
214 files changed, 780 insertions, 1005 deletions
diff --git a/chrome/browser/autocomplete/autocomplete_edit_view_win.h b/chrome/browser/autocomplete/autocomplete_edit_view_win.h
index e4c1b02..b69005a 100644
--- a/chrome/browser/autocomplete/autocomplete_edit_view_win.h
+++ b/chrome/browser/autocomplete/autocomplete_edit_view_win.h
@@ -18,7 +18,7 @@
 #include "chrome/browser/toolbar_model.h"
 #include "chrome/common/gfx/chrome_font.h"
 #include "chrome/common/page_transition_types.h"
-#include "chrome/views/menu.h"
+#include "chrome/views/controls/menu/menu.h"
 #include "webkit/glue/window_open_disposition.h"
 
 class AutocompletePopupModel;
diff --git a/chrome/browser/back_forward_menu_model_win.h b/chrome/browser/back_forward_menu_model_win.h
index e4f54e0..c144862 100644
--- a/chrome/browser/back_forward_menu_model_win.h
+++ b/chrome/browser/back_forward_menu_model_win.h
@@ -8,7 +8,7 @@
 #include "base/basictypes.h"
 
 #include "chrome/browser/back_forward_menu_model.h"
-#include "chrome/views/menu.h"
+#include "chrome/views/controls/menu/menu.h"
 
 class SkBitmap;
 
diff --git a/chrome/browser/bookmarks/bookmark_context_menu.h b/chrome/browser/bookmarks/bookmark_context_menu.h
index 460f01d..464e0e0 100644
--- a/chrome/browser/bookmarks/bookmark_context_menu.h
+++ b/chrome/browser/bookmarks/bookmark_context_menu.h
@@ -13,7 +13,7 @@
 
 // TODO(port): Port this file.
 #if defined(OS_WIN)
-#include "chrome/views/chrome_menu.h"
+#include "chrome/views/controls/menu/chrome_menu.h"
 #else
 #include "chrome/common/temp_scaffolding_stubs.h"
 #endif
diff --git a/chrome/browser/bookmarks/bookmark_folder_tree_model.h b/chrome/browser/bookmarks/bookmark_folder_tree_model.h
index e82c114..aa83756 100644
--- a/chrome/browser/bookmarks/bookmark_folder_tree_model.h
+++ b/chrome/browser/bookmarks/bookmark_folder_tree_model.h
@@ -6,7 +6,7 @@
 #define CHROME_BROWSER_BOOKMARKS_BOOKMARK_FOLDER_TREE_MODEL_H_
 
 #include "chrome/browser/bookmarks/bookmark_model.h"
-#include "chrome/views/tree_node_model.h"
+#include "chrome/views/controls/tree/tree_node_model.h"
 
 // The type of nodes created by BookmarkFolderTreeModel.
 typedef views::TreeNodeWithValue<BookmarkNode*> FolderNode;
diff --git a/chrome/browser/bookmarks/bookmark_folder_tree_model_unittest.cc b/chrome/browser/bookmarks/bookmark_folder_tree_model_unittest.cc
index 3fb7567..693069d 100644
--- a/chrome/browser/bookmarks/bookmark_folder_tree_model_unittest.cc
+++ b/chrome/browser/bookmarks/bookmark_folder_tree_model_unittest.cc
@@ -5,7 +5,7 @@
 #include "base/string_util.h"
 #include "chrome/browser/bookmarks/bookmark_folder_tree_model.h"
 #include "chrome/test/testing_profile.h"
-#include "chrome/views/tree_view.h"
+#include "chrome/views/controls/tree/tree_view.h"
 #include "grit/generated_resources.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
diff --git a/chrome/browser/bookmarks/bookmark_menu_controller.h b/chrome/browser/bookmarks/bookmark_menu_controller.h
index 27636a7..71d3a74 100644
--- a/chrome/browser/bookmarks/bookmark_menu_controller.h
+++ b/chrome/browser/bookmarks/bookmark_menu_controller.h
@@ -10,7 +10,7 @@
 #include "chrome/browser/bookmarks/base_bookmark_model_observer.h"
 #include "chrome/browser/bookmarks/bookmark_context_menu.h"
 #include "chrome/browser/bookmarks/bookmark_drag_data.h"
-#include "chrome/views/chrome_menu.h"
+#include "chrome/views/controls/menu/chrome_menu.h"
 
 class BookmarkContextMenu;
 class BookmarkNode;
diff --git a/chrome/browser/bookmarks/bookmark_model.h b/chrome/browser/bookmarks/bookmark_model.h
index bd94c12..f3b05a5 100644
--- a/chrome/browser/bookmarks/bookmark_model.h
+++ b/chrome/browser/bookmarks/bookmark_model.h
@@ -16,7 +16,7 @@
 #include "chrome/browser/history/history.h"
 #include "chrome/browser/history/history_types.h"
 #include "chrome/common/notification_observer.h"
-#include "chrome/views/tree_node_model.h"
+#include "chrome/views/controls/tree/tree_node_model.h"
 #include "googleurl/src/gurl.h"
 #include "skia/include/SkBitmap.h"
 
diff --git a/chrome/browser/bookmarks/bookmark_model_unittest.cc b/chrome/browser/bookmarks/bookmark_model_unittest.cc
index 974e618..09b14bb 100644
--- a/chrome/browser/bookmarks/bookmark_model_unittest.cc
+++ b/chrome/browser/bookmarks/bookmark_model_unittest.cc
@@ -11,7 +11,7 @@
 #include "chrome/common/notification_registrar.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/test/testing_profile.h"
-#include "chrome/views/tree_node_model.h"
+#include "chrome/views/controls/tree/tree_node_model.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using base::Time;
diff --git a/chrome/browser/bookmarks/bookmark_table_model.h b/chrome/browser/bookmarks/bookmark_table_model.h
index d5b4a2b..4b55759 100644
--- a/chrome/browser/bookmarks/bookmark_table_model.h
+++ b/chrome/browser/bookmarks/bookmark_table_model.h
@@ -10,7 +10,7 @@
 #include "build/build_config.h"
 
 #if defined(OS_WIN)
-#include "chrome/views/table_view.h"
+#include "chrome/views/controls/table/table_view.h"
 #elif defined(OS_POSIX)
 #include "chrome/common/temp_scaffolding_stubs.h"
 #endif
diff --git a/chrome/browser/bookmarks/bookmark_utils.cc b/chrome/browser/bookmarks/bookmark_utils.cc
index 3fbbbb9..429c06d 100644
--- a/chrome/browser/bookmarks/bookmark_utils.cc
+++ b/chrome/browser/bookmarks/bookmark_utils.cc
@@ -16,8 +16,8 @@
 #include "chrome/browser/tab_contents/page_navigator.h"
 #include "chrome/common/drag_drop_types.h"
 #include "chrome/common/l10n_util.h"
+#include "chrome/views/controls/tree/tree_node_iterator.h"
 #include "chrome/views/event.h"
-#include "chrome/views/tree_node_iterator.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 
diff --git a/chrome/browser/debugger/debugger_view.cc b/chrome/browser/debugger/debugger_view.cc
index 19c9196..9ada4eb 100644
--- a/chrome/browser/debugger/debugger_view.cc
+++ b/chrome/browser/debugger/debugger_view.cc
@@ -23,9 +23,9 @@
 #include "chrome/common/gfx/chrome_canvas.h"
 #include "chrome/common/resource_bundle.h"
 #include "chrome/views/grid_layout.h"
-#include "chrome/views/native_scroll_bar.h"
-#include "chrome/views/scroll_view.h"
-#include "chrome/views/text_field.h"
+#include "chrome/views/controls/scrollbar/native_scroll_bar.h"
+#include "chrome/views/controls/scroll_view.h"
+#include "chrome/views/controls/text_field.h"
 #include "chrome/views/view.h"
 
 #include "grit/debugger_resources.h"
diff --git a/chrome/browser/debugger/debugger_view.h b/chrome/browser/debugger/debugger_view.h
index 6c6457e..be2350c 100644
--- a/chrome/browser/debugger/debugger_view.h
+++ b/chrome/browser/debugger/debugger_view.h
@@ -13,7 +13,7 @@
 #include "base/gfx/size.h"
 #include "chrome/browser/tab_contents/tab_contents_delegate.h"
 #include "chrome/views/view.h"
-#include "chrome/views/text_field.h"
+#include "chrome/views/controls/text_field.h"
 
 class DebuggerView;
 class DebuggerWindow;
diff --git a/chrome/browser/download/download_request_dialog_delegate_win.cc b/chrome/browser/download/download_request_dialog_delegate_win.cc
index 13cdc42..2ff9a24 100644
--- a/chrome/browser/download/download_request_dialog_delegate_win.cc
+++ b/chrome/browser/download/download_request_dialog_delegate_win.cc
@@ -7,7 +7,7 @@
 #include "chrome/browser/tab_contents/constrained_window.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/common/l10n_util.h"
-#include "chrome/views/message_box_view.h"
+#include "chrome/views/controls/message_box_view.h"
 #include "grit/generated_resources.h"
 
 // static
diff --git a/chrome/browser/download/download_util.h b/chrome/browser/download/download_util.h
index 3d0f5c9..1b3f777 100644
--- a/chrome/browser/download/download_util.h
+++ b/chrome/browser/download/download_util.h
@@ -14,8 +14,8 @@
 
 #include "base/basictypes.h"
 #include "base/task.h"
+#include "chrome/views/controls/menu/menu.h"
 #include "chrome/views/event.h"
-#include "chrome/views/menu.h"
 #include "chrome/views/view.h"
 
 class BaseDownloadItemModel;
diff --git a/chrome/browser/encoding_menu_controller_delegate.h b/chrome/browser/encoding_menu_controller_delegate.h
index e1fa213..12d9bf4 100644
--- a/chrome/browser/encoding_menu_controller_delegate.h
+++ b/chrome/browser/encoding_menu_controller_delegate.h
@@ -5,7 +5,7 @@
 #ifndef CHORME_BROWSER_ENCODING_MENU_CONTROLLER_DELEGATE_H__
 #define CHORME_BROWSER_ENCODING_MENU_CONTROLLER_DELEGATE_H__
 
-#include "chrome/views/menu.h"
+#include "chrome/views/controls/menu/menu.h"
 
 class Browser;
 class Controller;
diff --git a/chrome/browser/history/starred_url_database.h b/chrome/browser/history/starred_url_database.h
index e827cc1..434fab7 100644
--- a/chrome/browser/history/starred_url_database.h
+++ b/chrome/browser/history/starred_url_database.h
@@ -11,7 +11,7 @@
 #include "base/basictypes.h"
 #include "chrome/browser/history/history_types.h"
 #include "chrome/browser/history/url_database.h"
-#include "chrome/views/tree_node_model.h"
+#include "chrome/views/controls/tree/tree_node_model.h"
 #include "testing/gtest/include/gtest/gtest_prod.h"
 
 struct sqlite3;
diff --git a/chrome/browser/js_before_unload_handler_win.cc b/chrome/browser/js_before_unload_handler_win.cc
index 88a3eec..e550018 100644
--- a/chrome/browser/js_before_unload_handler_win.cc
+++ b/chrome/browser/js_before_unload_handler_win.cc
@@ -6,7 +6,7 @@
 
 #include "chrome/browser/app_modal_dialog_queue.h"
 #include "chrome/common/l10n_util.h"
-#include "chrome/views/message_box_view.h"
+#include "chrome/views/controls/message_box_view.h"
 #include "grit/generated_resources.h"
 
 void RunBeforeUnloadDialog(WebContents* web_contents,
diff --git a/chrome/browser/jsmessage_box_handler_win.cc b/chrome/browser/jsmessage_box_handler_win.cc
index a31bed6..1b6ef07 100644
--- a/chrome/browser/jsmessage_box_handler_win.cc
+++ b/chrome/browser/jsmessage_box_handler_win.cc
@@ -15,7 +15,7 @@
 #include "chrome/common/notification_type.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
-#include "chrome/views/message_box_view.h"
+#include "chrome/views/controls/message_box_view.h"
 #include "chrome/views/window/window.h"
 #include "grit/generated_resources.h"
 
diff --git a/chrome/browser/ssl/ssl_manager.cc b/chrome/browser/ssl/ssl_manager.cc
index 26e4fde..2d6e8d2 100644
--- a/chrome/browser/ssl/ssl_manager.cc
+++ b/chrome/browser/ssl/ssl_manager.cc
@@ -35,8 +35,7 @@
 #include "chrome/browser/load_notification_details.h"
 #include "chrome/browser/tab_contents/infobar_delegate.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
-#include "chrome/views/decision.h"
-#include "chrome/views/link.h"
+#include "chrome/views/controls/link.h"
 #else
 #include "chrome/common/temp_scaffolding_stubs.h"
 #endif
diff --git a/chrome/browser/tab_contents/render_view_context_menu_win.h b/chrome/browser/tab_contents/render_view_context_menu_win.h
index a53d2ef..db74b5e 100644
--- a/chrome/browser/tab_contents/render_view_context_menu_win.h
+++ b/chrome/browser/tab_contents/render_view_context_menu_win.h
@@ -7,7 +7,7 @@
 
 #include "chrome/browser/tab_contents/render_view_context_menu.h"
 #include "chrome/views/accelerator.h"
-#include "chrome/views/menu.h"
+#include "chrome/views/controls/menu/menu.h"
 
 class RenderViewContextMenuWin : public RenderViewContextMenu,
                                  public Menu::Delegate{
diff --git a/chrome/browser/tab_contents/tab_contents.cc b/chrome/browser/tab_contents/tab_contents.cc
index 0e8f6e4..d7dacb2 100644
--- a/chrome/browser/tab_contents/tab_contents.cc
+++ b/chrome/browser/tab_contents/tab_contents.cc
@@ -21,7 +21,7 @@
 #include "chrome/browser/tab_contents/infobar_delegate.h"
 #include "chrome/browser/views/download_started_animation.h"
 #include "chrome/browser/views/blocked_popup_container.h"
-#include "chrome/views/native_scroll_bar.h"
+#include "chrome/views/controls/scrollbar/native_scroll_bar.h"
 #endif
 
 #if defined(OS_WIN)
diff --git a/chrome/browser/task_manager.h b/chrome/browser/task_manager.h
index a1f54a3..ab27fef 100644
--- a/chrome/browser/task_manager.h
+++ b/chrome/browser/task_manager.h
@@ -15,7 +15,7 @@
 #include "base/timer.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/controls/table/group_table_view.h"
 #include "chrome/views/window/dialog_delegate.h"
 #include "net/url_request/url_request_job_tracker.h"
 
diff --git a/chrome/browser/views/about_chrome_view.cc b/chrome/browser/views/about_chrome_view.cc
index 6547523..fe9eb5d 100644
--- a/chrome/browser/views/about_chrome_view.cc
+++ b/chrome/browser/views/about_chrome_view.cc
@@ -20,8 +20,8 @@
 #include "chrome/common/resource_bundle.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/installer/util/install_util.h"
-#include "chrome/views/text_field.h"
-#include "chrome/views/throbber.h"
+#include "chrome/views/controls/text_field.h"
+#include "chrome/views/controls/throbber.h"
 #include "chrome/views/window/window.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
diff --git a/chrome/browser/views/about_chrome_view.h b/chrome/browser/views/about_chrome_view.h
index 5f775de7..2118e76 100644
--- a/chrome/browser/views/about_chrome_view.h
+++ b/chrome/browser/views/about_chrome_view.h
@@ -6,9 +6,9 @@
 #define CHROME_BROWSER_VIEWS_ABOUT_CHROME_VIEW_H_
 
 #include "chrome/browser/google_update.h"
-#include "chrome/views/image_view.h"
-#include "chrome/views/label.h"
-#include "chrome/views/link.h"
+#include "chrome/views/controls/image_view.h"
+#include "chrome/views/controls/label.h"
+#include "chrome/views/controls/link.h"
 #include "chrome/views/view.h"
 #include "chrome/views/window/dialog_delegate.h"
 
diff --git a/chrome/browser/views/about_ipc_dialog.cc b/chrome/browser/views/about_ipc_dialog.cc
index 4e174c1..6bbd356 100644
--- a/chrome/browser/views/about_ipc_dialog.cc
+++ b/chrome/browser/views/about_ipc_dialog.cc
@@ -25,8 +25,8 @@
 #include "chrome/common/plugin_messages.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/views/grid_layout.h"
-#include "chrome/views/hwnd_view.h"
-#include "chrome/views/text_button.h"
+#include "chrome/views/controls/button/text_button.h"
+#include "chrome/views/controls/hwnd_view.h"
 #include "chrome/views/widget/root_view.h"
 #include "chrome/views/widget/widget.h"
 #include "chrome/views/window/window.h"
diff --git a/chrome/browser/views/about_ipc_dialog.h b/chrome/browser/views/about_ipc_dialog.h
index a5ff38d..92cc284 100644
--- a/chrome/browser/views/about_ipc_dialog.h
+++ b/chrome/browser/views/about_ipc_dialog.h
@@ -5,17 +5,11 @@
 #ifndef CHROME_BROWSER_VIEWS_ABOUT_IPC_DIALOG_H_
 #define CHROME_BROWSER_VIEWS_ABOUT_IPC_DIALOG_H_
 
-#include <atlbase.h>
-#include <atlapp.h>
-#include <atlcrack.h>
-#include <atlctrls.h>
-#include <atlmisc.h>
-
 #include "base/singleton.h"
 #include "chrome/common/ipc_logging.h"
-#include "chrome/views/button.h"
+#include "chrome/views/controls/button/button.h"
+#include "chrome/views/controls/table/table_view.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 3386043a..b11ae0b 100644
--- a/chrome/browser/views/about_network_dialog.cc
+++ b/chrome/browser/views/about_network_dialog.cc
@@ -9,8 +9,8 @@
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/views/standard_layout.h"
 #include "chrome/views/grid_layout.h"
-#include "chrome/views/text_button.h"
-#include "chrome/views/text_field.h"
+#include "chrome/views/controls/button/text_button.h"
+#include "chrome/views/controls/text_field.h"
 #include "chrome/views/window/window.h"
 #include "net/url_request/url_request.h"
 #include "net/url_request/url_request_job.h"
diff --git a/chrome/browser/views/about_network_dialog.h b/chrome/browser/views/about_network_dialog.h
index 389e582..b10cf04 100644
--- a/chrome/browser/views/about_network_dialog.h
+++ b/chrome/browser/views/about_network_dialog.h
@@ -6,7 +6,7 @@
 #define CHROME_BROWSER_VIEWS_ABOUT_NETWORK_DIALOG_H_
 
 #include "base/singleton.h"
-#include "chrome/views/button.h"
+#include "chrome/views/controls/button/button.h"
 #include "chrome/views/window/dialog_delegate.h"
 
 namespace views {
diff --git a/chrome/browser/views/blocked_popup_container.cc b/chrome/browser/views/blocked_popup_container.cc
index 8ae1801..5a80f03 100644
--- a/chrome/browser/views/blocked_popup_container.cc
+++ b/chrome/browser/views/blocked_popup_container.cc
@@ -22,8 +22,8 @@
 #include "chrome/common/pref_names.h"
 #include "chrome/common/resource_bundle.h"
 #include "chrome/views/background.h"
-#include "chrome/views/image_button.h"
-#include "chrome/views/menu_button.h"
+#include "chrome/views/controls/button/image_button.h"
+#include "chrome/views/controls/button/menu_button.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 
diff --git a/chrome/browser/views/blocked_popup_container.h b/chrome/browser/views/blocked_popup_container.h
index 829e19a..b853b6d 100644
--- a/chrome/browser/views/blocked_popup_container.h
+++ b/chrome/browser/views/blocked_popup_container.h
@@ -18,8 +18,8 @@
 #include "chrome/browser/tab_contents/tab_contents_delegate.h"
 #include "chrome/common/animation.h"
 #include "chrome/common/pref_member.h"
-#include "chrome/views/button.h"
-#include "chrome/views/menu.h"
+#include "chrome/views/controls/button/button.h"
+#include "chrome/views/controls/menu/menu.h"
 #include "chrome/views/view.h"
 #include "chrome/views/widget/widget_win.h"
 
diff --git a/chrome/browser/views/bookmark_bar_view.cc b/chrome/browser/views/bookmark_bar_view.cc
index 79b3ce9..3fe0dbf 100644
--- a/chrome/browser/views/bookmark_bar_view.cc
+++ b/chrome/browser/views/bookmark_bar_view.cc
@@ -31,8 +31,8 @@
 #include "chrome/common/pref_service.h"
 #include "chrome/common/resource_bundle.h"
 #include "chrome/common/win_util.h"
-#include "chrome/views/chrome_menu.h"
-#include "chrome/views/menu_button.h"
+#include "chrome/views/controls/button/menu_button.h"
+#include "chrome/views/controls/menu/chrome_menu.h"
 #include "chrome/views/view_constants.h"
 #include "chrome/views/widget/tooltip_manager.h"
 #include "chrome/views/widget/widget.h"
diff --git a/chrome/browser/views/bookmark_bar_view.h b/chrome/browser/views/bookmark_bar_view.h
index 14d7c81..358ce6f 100644
--- a/chrome/browser/views/bookmark_bar_view.h
+++ b/chrome/browser/views/bookmark_bar_view.h
@@ -10,11 +10,11 @@
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/extensions/extensions_service.h"
 #include "chrome/common/slide_animation.h"
-#include "chrome/views/label.h"
-#include "chrome/views/menu.h"
-#include "chrome/views/menu_button.h"
+#include "chrome/views/controls/button/menu_button.h"
+#include "chrome/views/controls/label.h"
+#include "chrome/views/controls/menu/menu.h"
+#include "chrome/views/controls/menu/view_menu_delegate.h"
 #include "chrome/views/view.h"
-#include "chrome/views/view_menu_delegate.h"
 
 class Browser;
 class PageNavigator;
diff --git a/chrome/browser/views/bookmark_bar_view_test.cc b/chrome/browser/views/bookmark_bar_view_test.cc
index 579c037..3fe05c1 100644
--- a/chrome/browser/views/bookmark_bar_view_test.cc
+++ b/chrome/browser/views/bookmark_bar_view_test.cc
@@ -13,8 +13,8 @@
 #include "chrome/common/pref_service.h"
 #include "chrome/test/testing_profile.h"
 #include "chrome/test/interactive_ui/view_event_test_base.h"
-#include "chrome/views/chrome_menu.h"
-#include "chrome/views/text_button.h"
+#include "chrome/views/controls/button/text_button.h"
+#include "chrome/views/controls/menu/chrome_menu.h"
 #include "chrome/views/window/window.h"
 
 namespace {
diff --git a/chrome/browser/views/bookmark_bubble_view.cc b/chrome/browser/views/bookmark_bubble_view.cc
index 899b5be..3e4db18 100644
--- a/chrome/browser/views/bookmark_bubble_view.cc
+++ b/chrome/browser/views/bookmark_bubble_view.cc
@@ -16,10 +16,10 @@
 #include "chrome/common/l10n_util.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/resource_bundle.h"
-#include "chrome/views/button.h"
-#include "chrome/views/checkbox.h"
-#include "chrome/views/native_button.h"
-#include "chrome/views/text_field.h"
+#include "chrome/views/controls/button/button.h"
+#include "chrome/views/controls/button/checkbox.h"
+#include "chrome/views/controls/button/native_button.h"
+#include "chrome/views/controls/text_field.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 
diff --git a/chrome/browser/views/bookmark_bubble_view.h b/chrome/browser/views/bookmark_bubble_view.h
index 31c8c8c..3109d8e 100644
--- a/chrome/browser/views/bookmark_bubble_view.h
+++ b/chrome/browser/views/bookmark_bubble_view.h
@@ -7,9 +7,9 @@
 
 #include "base/gfx/rect.h"
 #include "chrome/browser/views/info_bubble.h"
-#include "chrome/views/combo_box.h"
-#include "chrome/views/link.h"
-#include "chrome/views/native_button.h"
+#include "chrome/views/controls/button/native_button.h"
+#include "chrome/views/controls/combo_box.h"
+#include "chrome/views/controls/link.h"
 #include "chrome/views/view.h"
 #include "googleurl/src/gurl.h"
 
diff --git a/chrome/browser/views/bookmark_editor_view.cc b/chrome/browser/views/bookmark_editor_view.cc
index 3c030ba..d88aa9b7 100644
--- a/chrome/browser/views/bookmark_editor_view.cc
+++ b/chrome/browser/views/bookmark_editor_view.cc
@@ -15,7 +15,7 @@
 #include "chrome/views/background.h"
 #include "chrome/views/focus/focus_manager.h"
 #include "chrome/views/grid_layout.h"
-#include "chrome/views/label.h"
+#include "chrome/views/controls/label.h"
 #include "chrome/views/widget/widget.h"
 #include "chrome/views/window/window.h"
 #include "googleurl/src/gurl.h"
diff --git a/chrome/browser/views/bookmark_editor_view.h b/chrome/browser/views/bookmark_editor_view.h
index bf9be29..932d9b7 100644
--- a/chrome/browser/views/bookmark_editor_view.h
+++ b/chrome/browser/views/bookmark_editor_view.h
@@ -8,12 +8,12 @@
 #include <set>
 
 #include "chrome/browser/bookmarks/bookmark_model.h"
-#include "chrome/views/checkbox.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/controls/button/checkbox.h"
+#include "chrome/views/controls/button/native_button.h"
+#include "chrome/views/controls/menu/menu.h"
+#include "chrome/views/controls/text_field.h"
+#include "chrome/views/controls/tree/tree_node_model.h"
+#include "chrome/views/controls/tree/tree_view.h"
 #include "chrome/views/window/dialog_delegate.h"
 
 namespace views {
diff --git a/chrome/browser/views/bookmark_folder_tree_view.h b/chrome/browser/views/bookmark_folder_tree_view.h
index f024e75..cfae928 100644
--- a/chrome/browser/views/bookmark_folder_tree_view.h
+++ b/chrome/browser/views/bookmark_folder_tree_view.h
@@ -9,7 +9,7 @@
 #include "chrome/browser/bookmarks/bookmark_drag_data.h"
 #include "chrome/browser/bookmarks/bookmark_drop_info.h"
 #include "chrome/browser/bookmarks/bookmark_folder_tree_model.h"
-#include "chrome/views/tree_view.h"
+#include "chrome/views/controls/tree/tree_view.h"
 
 class BookmarkModel;
 class BookmarkNode;
diff --git a/chrome/browser/views/bookmark_manager_view.cc b/chrome/browser/views/bookmark_manager_view.cc
index 1aec366..d59de81 100644
--- a/chrome/browser/views/bookmark_manager_view.cc
+++ b/chrome/browser/views/bookmark_manager_view.cc
@@ -27,9 +27,9 @@
 #include "chrome/common/pref_service.h"
 #include "chrome/common/win_util.h"
 #include "chrome/views/grid_layout.h"
-#include "chrome/views/label.h"
-#include "chrome/views/menu_button.h"
-#include "chrome/views/single_split_view.h"
+#include "chrome/views/controls/button/menu_button.h"
+#include "chrome/views/controls/label.h"
+#include "chrome/views/controls/single_split_view.h"
 #include "chrome/views/widget/widget.h"
 #include "chrome/views/window/window.h"
 #include "grit/generated_resources.h"
diff --git a/chrome/browser/views/bookmark_manager_view.h b/chrome/browser/views/bookmark_manager_view.h
index aef8896..1b044bd 100644
--- a/chrome/browser/views/bookmark_manager_view.h
+++ b/chrome/browser/views/bookmark_manager_view.h
@@ -10,11 +10,11 @@
 #include "chrome/browser/bookmarks/bookmark_context_menu.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/shell_dialogs.h"
-#include "chrome/views/table_view.h"
-#include "chrome/views/text_field.h"
-#include "chrome/views/tree_view.h"
+#include "chrome/views/controls/menu/view_menu_delegate.h"
+#include "chrome/views/controls/table/table_view.h"
+#include "chrome/views/controls/text_field.h"
+#include "chrome/views/controls/tree/tree_view.h"
 #include "chrome/views/view.h"
-#include "chrome/views/view_menu_delegate.h"
 #include "chrome/views/window/window_delegate.h"
 #include "webkit/glue/window_open_disposition.h"
 
diff --git a/chrome/browser/views/bookmark_table_view.h b/chrome/browser/views/bookmark_table_view.h
index 9568bb4..272bba3 100644
--- a/chrome/browser/views/bookmark_table_view.h
+++ b/chrome/browser/views/bookmark_table_view.h
@@ -7,8 +7,8 @@
 
 #include "chrome/browser/bookmarks/bookmark_drag_data.h"
 #include "chrome/browser/bookmarks/bookmark_drop_info.h"
-#include "chrome/views/menu.h"
-#include "chrome/views/table_view.h"
+#include "chrome/views/controls/menu/menu.h"
+#include "chrome/views/controls/table/table_view.h"
 
 class BookmarkModel;
 class BookmarkNode;
diff --git a/chrome/browser/views/bug_report_view.cc b/chrome/browser/views/bug_report_view.cc
index b5c3725..0256758 100644
--- a/chrome/browser/views/bug_report_view.cc
+++ b/chrome/browser/views/bug_report_view.cc
@@ -18,9 +18,9 @@
 #include "chrome/common/l10n_util.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
-#include "chrome/views/checkbox.h"
+#include "chrome/views/controls/button/checkbox.h"
+#include "chrome/views/controls/label.h"
 #include "chrome/views/grid_layout.h"
-#include "chrome/views/label.h"
 #include "chrome/views/window/client_view.h"
 #include "chrome/views/window/window.h"
 #include "grit/chromium_strings.h"
diff --git a/chrome/browser/views/bug_report_view.h b/chrome/browser/views/bug_report_view.h
index b539b3c..859f7fe 100644
--- a/chrome/browser/views/bug_report_view.h
+++ b/chrome/browser/views/bug_report_view.h
@@ -6,9 +6,9 @@
 #define CHROME_BROWSER_VIEWS_BUGREPORT_VIEW_H_
 
 #include "chrome/browser/net/url_fetcher.h"
-#include "chrome/views/combo_box.h"
-#include "chrome/views/native_button.h"
-#include "chrome/views/text_field.h"
+#include "chrome/views/controls/button/native_button.h"
+#include "chrome/views/controls/combo_box.h"
+#include "chrome/views/controls/text_field.h"
 #include "chrome/views/view.h"
 #include "chrome/views/window/dialog_delegate.h"
 #include "googleurl/src/gurl.h"
diff --git a/chrome/browser/views/clear_browsing_data.cc b/chrome/browser/views/clear_browsing_data.cc
index d61faba..bbfba5d 100644
--- a/chrome/browser/views/clear_browsing_data.cc
+++ b/chrome/browser/views/clear_browsing_data.cc
@@ -9,10 +9,10 @@
 #include "chrome/browser/views/standard_layout.h"
 #include "chrome/common/l10n_util.h"
 #include "chrome/views/background.h"
-#include "chrome/views/checkbox.h"
-#include "chrome/views/label.h"
-#include "chrome/views/native_button.h"
-#include "chrome/views/throbber.h"
+#include "chrome/views/controls/button/checkbox.h"
+#include "chrome/views/controls/button/native_button.h"
+#include "chrome/views/controls/label.h"
+#include "chrome/views/controls/throbber.h"
 #include "chrome/views/window/window.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
diff --git a/chrome/browser/views/clear_browsing_data.h b/chrome/browser/views/clear_browsing_data.h
index e70f058..3a387fd 100644
--- a/chrome/browser/views/clear_browsing_data.h
+++ b/chrome/browser/views/clear_browsing_data.h
@@ -6,9 +6,9 @@
 #define CHROME_BROWSER_VIEWS_CLEAR_BROWSING_DATA_H__
 
 #include "chrome/browser/browsing_data_remover.h"
-#include "chrome/views/combo_box.h"
-#include "chrome/views/label.h"
-#include "chrome/views/native_button.h"
+#include "chrome/views/controls/button/native_button.h"
+#include "chrome/views/controls/combo_box.h"
+#include "chrome/views/controls/label.h"
 #include "chrome/views/view.h"
 #include "chrome/views/window/dialog_delegate.h"
 
diff --git a/chrome/browser/views/constrained_window_impl.cc b/chrome/browser/views/constrained_window_impl.cc
index b4da000..a6cd377 100644
--- a/chrome/browser/views/constrained_window_impl.cc
+++ b/chrome/browser/views/constrained_window_impl.cc
@@ -25,9 +25,9 @@
 #include "chrome/common/pref_service.h"
 #include "chrome/common/resource_bundle.h"
 #include "chrome/common/win_util.h"
-#include "chrome/views/image_button.h"
+#include "chrome/views/controls/button/image_button.h"
+#include "chrome/views/controls/hwnd_view.h"
 #include "chrome/views/focus/focus_manager.h"
-#include "chrome/views/hwnd_view.h"
 #include "chrome/views/window/client_view.h"
 #include "chrome/views/window/non_client_view.h"
 #include "chrome/views/window/window_resources.h"
diff --git a/chrome/browser/views/dom_view.h b/chrome/browser/views/dom_view.h
index d79c012..3a4e6d0 100644
--- a/chrome/browser/views/dom_view.h
+++ b/chrome/browser/views/dom_view.h
@@ -8,7 +8,7 @@
 #ifndef CHROME_BROWSER_VIEWS_DOM_VIEW_H_
 #define CHROME_BROWSER_VIEWS_DOM_VIEW_H_
 
-#include "chrome/views/hwnd_view.h"
+#include "chrome/views/controls/hwnd_view.h"
 #include "googleurl/src/gurl.h"
 
 class DOMUIHost;
diff --git a/chrome/browser/views/download_item_view.cc b/chrome/browser/views/download_item_view.cc
index dec54e0..de402da 100644
--- a/chrome/browser/views/download_item_view.cc
+++ b/chrome/browser/views/download_item_view.cc
@@ -17,8 +17,8 @@
 #include "chrome/common/l10n_util.h"
 #include "chrome/common/resource_bundle.h"
 #include "chrome/common/win_util.h"
-#include "chrome/views/menu.h"
-#include "chrome/views/native_button.h"
+#include "chrome/views/controls/button/native_button.h"
+#include "chrome/views/controls/menu/menu.h"
 #include "chrome/views/widget/root_view.h"
 #include "chrome/views/widget/widget.h"
 #include "grit/generated_resources.h"
diff --git a/chrome/browser/views/download_item_view.h b/chrome/browser/views/download_item_view.h
index b7a95dc..8f87c04 100644
--- a/chrome/browser/views/download_item_view.h
+++ b/chrome/browser/views/download_item_view.h
@@ -26,7 +26,7 @@
 #include "chrome/browser/download/download_manager.h"
 #include "chrome/browser/icon_manager.h"
 #include "chrome/views/event.h"
-#include "chrome/views/native_button.h"
+#include "chrome/views/controls/button/native_button.h"
 #include "chrome/views/view.h"
 
 namespace views {
diff --git a/chrome/browser/views/download_shelf_view.cc b/chrome/browser/views/download_shelf_view.cc
index 21cd338..b5045c9 100644
--- a/chrome/browser/views/download_shelf_view.cc
+++ b/chrome/browser/views/download_shelf_view.cc
@@ -16,8 +16,8 @@
 #include "chrome/common/l10n_util.h"
 #include "chrome/common/resource_bundle.h"
 #include "chrome/views/background.h"
-#include "chrome/views/image_button.h"
-#include "chrome/views/image_view.h"
+#include "chrome/views/controls/button/image_button.h"
+#include "chrome/views/controls/image_view.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 
diff --git a/chrome/browser/views/download_shelf_view.h b/chrome/browser/views/download_shelf_view.h
index 1cd7907..d73aa9f 100644
--- a/chrome/browser/views/download_shelf_view.h
+++ b/chrome/browser/views/download_shelf_view.h
@@ -7,8 +7,8 @@
 
 #include "chrome/browser/download/download_shelf.h"
 #include "chrome/common/slide_animation.h"
-#include "chrome/views/button.h"
-#include "chrome/views/link.h"
+#include "chrome/views/controls/button/button.h"
+#include "chrome/views/controls/link.h"
 
 namespace views {
 class ImageButton;
diff --git a/chrome/browser/views/download_started_animation.h b/chrome/browser/views/download_started_animation.h
index e083d67..f2c7916 100644
--- a/chrome/browser/views/download_started_animation.h
+++ b/chrome/browser/views/download_started_animation.h
@@ -8,7 +8,7 @@
 #include "base/gfx/rect.h"
 #include "chrome/common/animation.h"
 #include "chrome/common/notification_observer.h"
-#include "chrome/views/image_view.h"
+#include "chrome/views/controls/image_view.h"
 
 namespace views {
 class WidgetWin;
diff --git a/chrome/browser/views/edit_keyword_controller.cc b/chrome/browser/views/edit_keyword_controller.cc
index 0f336d0..1968d27 100644
--- a/chrome/browser/views/edit_keyword_controller.cc
+++ b/chrome/browser/views/edit_keyword_controller.cc
@@ -14,10 +14,10 @@
 #include "chrome/browser/views/standard_layout.h"
 #include "chrome/common/l10n_util.h"
 #include "chrome/common/resource_bundle.h"
-#include "chrome/views/label.h"
+#include "chrome/views/controls/label.h"
+#include "chrome/views/controls/image_view.h"
+#include "chrome/views/controls/table/table_view.h"
 #include "chrome/views/grid_layout.h"
-#include "chrome/views/image_view.h"
-#include "chrome/views/table_view.h"
 #include "chrome/views/window/window.h"
 #include "googleurl/src/gurl.h"
 #include "grit/generated_resources.h"
diff --git a/chrome/browser/views/edit_keyword_controller.h b/chrome/browser/views/edit_keyword_controller.h
index f6f693b..a94422e 100644
--- a/chrome/browser/views/edit_keyword_controller.h
+++ b/chrome/browser/views/edit_keyword_controller.h
@@ -12,7 +12,7 @@
 
 #include <Windows.h>
 
-#include "chrome/views/text_field.h"
+#include "chrome/views/controls/text_field.h"
 #include "chrome/views/window/dialog_delegate.h"
 
 namespace views {
diff --git a/chrome/browser/views/external_protocol_dialog.cc b/chrome/browser/views/external_protocol_dialog.cc
index 5b4ee4c..99ee16a 100644
--- a/chrome/browser/views/external_protocol_dialog.cc
+++ b/chrome/browser/views/external_protocol_dialog.cc
@@ -12,7 +12,7 @@
 #include "chrome/browser/tab_contents/tab_util.h"
 #include "chrome/browser/tab_contents/web_contents.h"
 #include "chrome/common/l10n_util.h"
-#include "chrome/views/message_box_view.h"
+#include "chrome/views/controls/message_box_view.h"
 #include "chrome/views/window/window.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
diff --git a/chrome/browser/views/find_bar_view.cc b/chrome/browser/views/find_bar_view.cc
index 56dfd29..646b49c 100644
--- a/chrome/browser/views/find_bar_view.cc
+++ b/chrome/browser/views/find_bar_view.cc
@@ -15,8 +15,8 @@
 #include "chrome/common/gfx/chrome_canvas.h"
 #include "chrome/common/resource_bundle.h"
 #include "chrome/views/background.h"
-#include "chrome/views/image_button.h"
-#include "chrome/views/label.h"
+#include "chrome/views/controls/button/image_button.h"
+#include "chrome/views/controls/label.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "skia/include/SkGradientShader.h"
diff --git a/chrome/browser/views/find_bar_view.h b/chrome/browser/views/find_bar_view.h
index 2b5748a..148fa83d 100644
--- a/chrome/browser/views/find_bar_view.h
+++ b/chrome/browser/views/find_bar_view.h
@@ -7,8 +7,8 @@
 
 #include "base/gfx/size.h"
 #include "chrome/browser/find_notification_details.h"
-#include "chrome/views/button.h"
-#include "chrome/views/text_field.h"
+#include "chrome/views/controls/button/button.h"
+#include "chrome/views/controls/text_field.h"
 
 class FindBarWin;
 
diff --git a/chrome/browser/views/find_bar_win.cc b/chrome/browser/views/find_bar_win.cc
index b10c5e3..d653df4 100644
--- a/chrome/browser/views/find_bar_win.cc
+++ b/chrome/browser/views/find_bar_win.cc
@@ -16,7 +16,7 @@
 #include "chrome/browser/tab_contents/web_contents_view.h"
 #include "chrome/views/focus/external_focus_tracker.h"
 #include "chrome/views/focus/view_storage.h"
-#include "chrome/views/native_scroll_bar.h"
+#include "chrome/views/controls/scrollbar/native_scroll_bar.h"
 #include "chrome/views/widget/root_view.h"
 #include "chrome/views/widget/widget_win.h"
 
diff --git a/chrome/browser/views/first_run_bubble.cc b/chrome/browser/views/first_run_bubble.cc
index 313689d..043a972 100644
--- a/chrome/browser/views/first_run_bubble.cc
+++ b/chrome/browser/views/first_run_bubble.cc
@@ -15,8 +15,8 @@
 #include "chrome/common/l10n_util.h"
 #include "chrome/common/resource_bundle.h"
 #include "chrome/views/event.h"
-#include "chrome/views/label.h"
-#include "chrome/views/native_button.h"
+#include "chrome/views/controls/button/native_button.h"
+#include "chrome/views/controls/label.h"
 #include "chrome/views/window/window.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
diff --git a/chrome/browser/views/first_run_customize_view.cc b/chrome/browser/views/first_run_customize_view.cc
index 307753c..1ec7af9 100644
--- a/chrome/browser/views/first_run_customize_view.cc
+++ b/chrome/browser/views/first_run_customize_view.cc
@@ -10,11 +10,11 @@
 #include "chrome/browser/views/standard_layout.h"
 #include "chrome/common/l10n_util.h"
 #include "chrome/common/resource_bundle.h"
-#include "chrome/views/checkbox.h"
-#include "chrome/views/combo_box.h"
-#include "chrome/views/image_view.h"
-#include "chrome/views/label.h"
-#include "chrome/views/throbber.h"
+#include "chrome/views/controls/button/checkbox.h"
+#include "chrome/views/controls/combo_box.h"
+#include "chrome/views/controls/image_view.h"
+#include "chrome/views/controls/label.h"
+#include "chrome/views/controls/throbber.h"
 #include "chrome/views/window/window.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
diff --git a/chrome/browser/views/first_run_customize_view.h b/chrome/browser/views/first_run_customize_view.h
index 9a7a596..9727bd8 100644
--- a/chrome/browser/views/first_run_customize_view.h
+++ b/chrome/browser/views/first_run_customize_view.h
@@ -6,8 +6,8 @@
 #define CHROME_BROWSER_VIEWS_FIRST_RUN_CUSTOMIZE_VIEW_H_
 
 #include "chrome/browser/views/first_run_view_base.h"
-#include "chrome/views/combo_box.h"
-#include "chrome/views/native_button.h"
+#include "chrome/views/controls/button/native_button.h"
+#include "chrome/views/controls/combo_box.h"
 #include "chrome/views/view.h"
 #include "chrome/views/window/dialog_delegate.h"
 
diff --git a/chrome/browser/views/first_run_view.cc b/chrome/browser/views/first_run_view.cc
index 910cab6..d67f8b1 100644
--- a/chrome/browser/views/first_run_view.cc
+++ b/chrome/browser/views/first_run_view.cc
@@ -11,11 +11,11 @@
 #include "chrome/browser/views/standard_layout.h"
 #include "chrome/common/l10n_util.h"
 #include "chrome/common/resource_bundle.h"
-#include "chrome/views/checkbox.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/controls/button/checkbox.h"
+#include "chrome/views/controls/image_view.h"
+#include "chrome/views/controls/label.h"
+#include "chrome/views/controls/throbber.h"
+#include "chrome/views/controls/separator.h"
 #include "chrome/views/window/window.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
diff --git a/chrome/browser/views/first_run_view.h b/chrome/browser/views/first_run_view.h
index e17f78d..267756b 100644
--- a/chrome/browser/views/first_run_view.h
+++ b/chrome/browser/views/first_run_view.h
@@ -7,7 +7,7 @@
 
 #include "chrome/browser/views/first_run_view_base.h"
 #include "chrome/browser/views/first_run_customize_view.h"
-#include "chrome/views/link.h"
+#include "chrome/views/controls/link.h"
 #include "chrome/views/view.h"
 #include "chrome/views/window/dialog_delegate.h"
 
diff --git a/chrome/browser/views/first_run_view_base.cc b/chrome/browser/views/first_run_view_base.cc
index f0dc653..124c05e 100644
--- a/chrome/browser/views/first_run_view_base.cc
+++ b/chrome/browser/views/first_run_view_base.cc
@@ -20,11 +20,11 @@
 #include "chrome/common/pref_service.h"
 #include "chrome/common/resource_bundle.h"
 #include "chrome/views/background.h"
-#include "chrome/views/checkbox.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/controls/button/checkbox.h"
+#include "chrome/views/controls/image_view.h"
+#include "chrome/views/controls/label.h"
+#include "chrome/views/controls/throbber.h"
+#include "chrome/views/controls/separator.h"
 #include "chrome/views/window/client_view.h"
 #include "chrome/views/window/window.h"
 #include "grit/chromium_strings.h"
diff --git a/chrome/browser/views/frame/browser_view.cc b/chrome/browser/views/frame/browser_view.cc
index 19e3e56..7af2338 100644
--- a/chrome/browser/views/frame/browser_view.cc
+++ b/chrome/browser/views/frame/browser_view.cc
@@ -50,7 +50,7 @@
 #include "chrome/common/pref_service.h"
 #include "chrome/common/resource_bundle.h"
 #include "chrome/common/win_util.h"
-#include "chrome/views/native_scroll_bar.h"
+#include "chrome/views/controls/scrollbar/native_scroll_bar.h"
 #include "chrome/views/view.h"
 #include "chrome/views/widget/hwnd_notification_source.h"
 #include "chrome/views/widget/root_view.h"
diff --git a/chrome/browser/views/frame/browser_view.h b/chrome/browser/views/frame/browser_view.h
index 0796ed9..d1a57a5 100644
--- a/chrome/browser/views/frame/browser_view.h
+++ b/chrome/browser/views/frame/browser_view.h
@@ -9,11 +9,11 @@
 #include "chrome/browser/browser_window.h"
 #include "chrome/browser/hang_monitor/hung_plugin_action.h"
 #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"
 #ifdef CHROME_PERSONALIZATION
 #include "chrome/personalization/personalization.h"
 #endif
+#include "chrome/browser/tabs/tab_strip_model.h"
+#include "chrome/browser/views/frame/browser_frame.h"
 #include "chrome/views/window/client_view.h"
 #include "chrome/views/window/window_delegate.h"
 
diff --git a/chrome/browser/views/frame/glass_browser_frame_view.h b/chrome/browser/views/frame/glass_browser_frame_view.h
index b2ca45b..b6aa5f9 100644
--- a/chrome/browser/views/frame/glass_browser_frame_view.h
+++ b/chrome/browser/views/frame/glass_browser_frame_view.h
@@ -6,7 +6,7 @@
 #define CHROME_BROWSER_VIEWS_FRAME_GLASS_BROWSER_FRAME_VIEW_H_
 
 #include "chrome/browser/views/frame/browser_frame.h"
-#include "chrome/views/button.h"
+#include "chrome/views/controls/button/button.h"
 #include "chrome/views/window/non_client_view.h"
 
 class BrowserView;
diff --git a/chrome/browser/views/frame/opaque_browser_frame_view.cc b/chrome/browser/views/frame/opaque_browser_frame_view.cc
index 665cefd..e2093f8 100644
--- a/chrome/browser/views/frame/opaque_browser_frame_view.cc
+++ b/chrome/browser/views/frame/opaque_browser_frame_view.cc
@@ -13,7 +13,7 @@
 #include "chrome/common/l10n_util.h"
 #include "chrome/common/resource_bundle.h"
 #include "chrome/common/win_util.h"
-#include "chrome/views/image_button.h"
+#include "chrome/views/controls/button/image_button.h"
 #include "chrome/views/widget/root_view.h"
 #include "chrome/views/window/window_resources.h"
 #include "grit/chromium_strings.h"
diff --git a/chrome/browser/views/frame/opaque_browser_frame_view.h b/chrome/browser/views/frame/opaque_browser_frame_view.h
index df255fe..83a84c5 100644
--- a/chrome/browser/views/frame/opaque_browser_frame_view.h
+++ b/chrome/browser/views/frame/opaque_browser_frame_view.h
@@ -7,7 +7,7 @@
 
 #include "chrome/browser/views/frame/browser_frame.h"
 #include "chrome/browser/views/tab_icon_view.h"
-#include "chrome/views/button.h"
+#include "chrome/views/controls/button/button.h"
 #include "chrome/views/window/non_client_view.h"
 
 class BrowserView;
diff --git a/chrome/browser/views/fullscreen_exit_bubble.h b/chrome/browser/views/fullscreen_exit_bubble.h
index 146eed8..b5e6b1e 100644
--- a/chrome/browser/views/fullscreen_exit_bubble.h
+++ b/chrome/browser/views/fullscreen_exit_bubble.h
@@ -8,7 +8,7 @@
 #include "base/scoped_ptr.h"
 #include "chrome/browser/command_updater.h"
 #include "chrome/common/slide_animation.h"
-#include "chrome/views/link.h"
+#include "chrome/views/controls/link.h"
 #include "chrome/views/widget/widget_win.h"
 
 // FullscreenExitBubble is responsible for showing a bubble atop the screen in
diff --git a/chrome/browser/views/go_button.h b/chrome/browser/views/go_button.h
index 306ae59..c9d8252 100644
--- a/chrome/browser/views/go_button.h
+++ b/chrome/browser/views/go_button.h
@@ -5,7 +5,7 @@
 #ifndef CHROME_BROWSER_VIEWS_GO_BUTTON_H__
 #define CHROME_BROWSER_VIEWS_GO_BUTTON_H__
 
-#include "chrome/views/image_button.h"
+#include "chrome/views/controls/button/image_button.h"
 #include "base/task.h"
 
 class CommandUpdater;
diff --git a/chrome/browser/views/hung_renderer_view.cc b/chrome/browser/views/hung_renderer_view.cc
index 3ef3214..bf0555a4 100644
--- a/chrome/browser/views/hung_renderer_view.cc
+++ b/chrome/browser/views/hung_renderer_view.cc
@@ -16,10 +16,10 @@
 #include "chrome/common/resource_bundle.h"
 #include "chrome/common/result_codes.h"
 #include "chrome/views/grid_layout.h"
-#include "chrome/views/group_table_view.h"
-#include "chrome/views/image_view.h"
-#include "chrome/views/label.h"
-#include "chrome/views/native_button.h"
+#include "chrome/views/controls/button/native_button.h"
+#include "chrome/views/controls/image_view.h"
+#include "chrome/views/controls/label.h"
+#include "chrome/views/controls/table/group_table_view.h"
 #include "chrome/views/window/client_view.h"
 #include "chrome/views/window/dialog_delegate.h"
 #include "chrome/views/window/window.h"
diff --git a/chrome/browser/views/hwnd_html_view.h b/chrome/browser/views/hwnd_html_view.h
index 49c6e34..b4a0d6a 100644
--- a/chrome/browser/views/hwnd_html_view.h
+++ b/chrome/browser/views/hwnd_html_view.h
@@ -6,7 +6,7 @@
 #define CHROME_BROWSER_VIEWS_HWND_HTML_VIEW_H_
 
 #include "googleurl/src/gurl.h"
-#include "chrome/views/hwnd_view.h"
+#include "chrome/views/controls/hwnd_view.h"
 
 class RenderViewHost;
 class RenderViewHostDelegate;
diff --git a/chrome/browser/views/importer_lock_view.cc b/chrome/browser/views/importer_lock_view.cc
index 060ffca..7c6b809 100644
--- a/chrome/browser/views/importer_lock_view.cc
+++ b/chrome/browser/views/importer_lock_view.cc
@@ -7,7 +7,7 @@
 #include "chrome/browser/importer/importer.h"
 #include "chrome/browser/views/standard_layout.h"
 #include "chrome/common/l10n_util.h"
-#include "chrome/views/label.h"
+#include "chrome/views/controls/label.h"
 #include "chrome/views/window/window.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
diff --git a/chrome/browser/views/importer_view.cc b/chrome/browser/views/importer_view.cc
index 76fb533..9dbd9a4 100644
--- a/chrome/browser/views/importer_view.cc
+++ b/chrome/browser/views/importer_view.cc
@@ -7,9 +7,9 @@
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/views/standard_layout.h"
 #include "chrome/common/l10n_util.h"
-#include "chrome/views/checkbox.h"
+#include "chrome/views/controls/button/checkbox.h"
+#include "chrome/views/controls/label.h"
 #include "chrome/views/grid_layout.h"
-#include "chrome/views/label.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 fcae46d..ef80f9d 100644
--- a/chrome/browser/views/importer_view.h
+++ b/chrome/browser/views/importer_view.h
@@ -6,8 +6,8 @@
 #define CHROME_BROWSER_VIEWS_IMPORTER_VIEW_H__
 
 #include "chrome/browser/importer/importer.h"
-#include "chrome/views/combo_box.h"
-#include "chrome/views/native_button.h"
+#include "chrome/views/controls/button/native_button.h"
+#include "chrome/views/controls/combo_box.h"
 #include "chrome/views/view.h"
 #include "chrome/views/window/dialog_delegate.h"
 
diff --git a/chrome/browser/views/importing_progress_view.cc b/chrome/browser/views/importing_progress_view.cc
index b097cb3..d7dcf81 100644
--- a/chrome/browser/views/importing_progress_view.cc
+++ b/chrome/browser/views/importing_progress_view.cc
@@ -7,8 +7,8 @@
 #include "chrome/browser/views/standard_layout.h"
 #include "chrome/common/l10n_util.h"
 #include "chrome/views/grid_layout.h"
-#include "chrome/views/label.h"
-#include "chrome/views/throbber.h"
+#include "chrome/views/controls/label.h"
+#include "chrome/views/controls/throbber.h"
 #include "chrome/views/window/window.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
diff --git a/chrome/browser/views/infobars/infobars.cc b/chrome/browser/views/infobars/infobars.cc
index 7dea4c9..52af060 100644
--- a/chrome/browser/views/infobars/infobars.cc
+++ b/chrome/browser/views/infobars/infobars.cc
@@ -12,10 +12,10 @@
 #include "chrome/common/resource_bundle.h"
 #include "chrome/common/slide_animation.h"
 #include "chrome/views/background.h"
-#include "chrome/views/image_button.h"
+#include "chrome/views/controls/button/image_button.h"
+#include "chrome/views/controls/image_view.h"
+#include "chrome/views/controls/label.h"
 #include "chrome/views/focus/external_focus_tracker.h"
-#include "chrome/views/image_view.h"
-#include "chrome/views/label.h"
 #include "chrome/views/widget/widget.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
diff --git a/chrome/browser/views/infobars/infobars.h b/chrome/browser/views/infobars/infobars.h
index c7a0d38..c8b721dc 100644
--- a/chrome/browser/views/infobars/infobars.h
+++ b/chrome/browser/views/infobars/infobars.h
@@ -7,9 +7,9 @@
 
 #include "chrome/browser/tab_contents/infobar_delegate.h"
 #include "chrome/common/animation.h"
-#include "chrome/views/button.h"
-#include "chrome/views/link.h"
-#include "chrome/views/native_button.h"
+#include "chrome/views/controls/button/button.h"
+#include "chrome/views/controls/button/native_button.h"
+#include "chrome/views/controls/link.h"
 
 class InfoBarContainer;
 class SlideAnimation;
diff --git a/chrome/browser/views/input_window.cc b/chrome/browser/views/input_window.cc
index eb61945..f650320 100644
--- a/chrome/browser/views/input_window.cc
+++ b/chrome/browser/views/input_window.cc
@@ -9,8 +9,8 @@
 #include "chrome/browser/views/standard_layout.h"
 #include "chrome/common/l10n_util.h"
 #include "chrome/views/grid_layout.h"
-#include "chrome/views/label.h"
-#include "chrome/views/text_field.h"
+#include "chrome/views/controls/label.h"
+#include "chrome/views/controls/text_field.h"
 #include "chrome/views/window/window.h"
 #include "grit/generated_resources.h"
 
diff --git a/chrome/browser/views/keyword_editor_view.cc b/chrome/browser/views/keyword_editor_view.cc
index e2267eb..b646f10 100644
--- a/chrome/browser/views/keyword_editor_view.cc
+++ b/chrome/browser/views/keyword_editor_view.cc
@@ -21,9 +21,9 @@
 #include "chrome/common/resource_bundle.h"
 #include "chrome/common/stl_util-inl.h"
 #include "chrome/views/background.h"
-#include "chrome/views/checkbox.h"
+#include "chrome/views/controls/button/checkbox.h"
 #include "chrome/views/grid_layout.h"
-#include "chrome/views/text_field.h"
+#include "chrome/views/controls/text_field.h"
 #include "chrome/views/widget/widget.h"
 #include "chrome/views/window/dialog_delegate.h"
 #include "chrome/views/window/window.h"
diff --git a/chrome/browser/views/keyword_editor_view.h b/chrome/browser/views/keyword_editor_view.h
index 8b0f1d1..a011d61 100644
--- a/chrome/browser/views/keyword_editor_view.h
+++ b/chrome/browser/views/keyword_editor_view.h
@@ -9,8 +9,8 @@
 #include <map>
 
 #include "chrome/browser/search_engines/template_url_model.h"
-#include "chrome/views/native_button.h"
-#include "chrome/views/table_view.h"
+#include "chrome/views/controls/button/native_button.h"
+#include "chrome/views/controls/table/table_view.h"
 #include "chrome/views/view.h"
 #include "chrome/views/window/dialog_delegate.h"
 
diff --git a/chrome/browser/views/location_bar_view.h b/chrome/browser/views/location_bar_view.h
index 99822f4..920fc88 100644
--- a/chrome/browser/views/location_bar_view.h
+++ b/chrome/browser/views/location_bar_view.h
@@ -15,9 +15,9 @@
 #include "chrome/browser/toolbar_model.h"
 #include "chrome/browser/views/info_bubble.h"
 #include "chrome/common/gfx/chrome_font.h"
-#include "chrome/views/hwnd_view.h"
-#include "chrome/views/image_view.h"
-#include "chrome/views/label.h"
+#include "chrome/views/controls/hwnd_view.h"
+#include "chrome/views/controls/image_view.h"
+#include "chrome/views/controls/label.h"
 #include "chrome/views/painter.h"
 
 class CommandUpdater;
diff --git a/chrome/browser/views/login_view.cc b/chrome/browser/views/login_view.cc
index f03afa3..47626cf 100644
--- a/chrome/browser/views/login_view.cc
+++ b/chrome/browser/views/login_view.cc
@@ -10,8 +10,8 @@
 #include "chrome/browser/views/standard_layout.h"
 #include "chrome/common/l10n_util.h"
 #include "chrome/views/grid_layout.h"
-#include "chrome/views/label.h"
-#include "chrome/views/text_field.h"
+#include "chrome/views/controls/label.h"
+#include "chrome/views/controls/text_field.h"
 #include "chrome/views/widget/root_view.h"
 #include "grit/generated_resources.h"
 
diff --git a/chrome/browser/views/new_profile_dialog.cc b/chrome/browser/views/new_profile_dialog.cc
index 8690116..8b2faea 100644
--- a/chrome/browser/views/new_profile_dialog.cc
+++ b/chrome/browser/views/new_profile_dialog.cc
@@ -10,8 +10,8 @@
 #include "base/file_util.h"
 #include "chrome/browser/user_data_manager.h"
 #include "chrome/common/l10n_util.h"
-#include "chrome/views/message_box_view.h"
-#include "chrome/views/text_field.h"
+#include "chrome/views/controls/message_box_view.h"
+#include "chrome/views/controls/text_field.h"
 #include "chrome/views/view.h"
 #include "chrome/views/window/window.h"
 #include "grit/chromium_strings.h"
diff --git a/chrome/browser/views/new_profile_dialog.h b/chrome/browser/views/new_profile_dialog.h
index 4e43570..da36728 100644
--- a/chrome/browser/views/new_profile_dialog.h
+++ b/chrome/browser/views/new_profile_dialog.h
@@ -11,7 +11,7 @@
 #include "base/basictypes.h"
 #include "base/message_loop.h"
 #include "chrome/browser/shell_dialogs.h"
-#include "chrome/views/text_field.h"
+#include "chrome/views/controls/text_field.h"
 #include "chrome/views/window/dialog_delegate.h"
 
 class MessageBoxView;
diff --git a/chrome/browser/views/options/advanced_contents_view.cc b/chrome/browser/views/options/advanced_contents_view.cc
index fb5ed93..45e0cc2 100644
--- a/chrome/browser/views/options/advanced_contents_view.cc
+++ b/chrome/browser/views/options/advanced_contents_view.cc
@@ -34,10 +34,10 @@
 #include "chrome/common/resource_bundle.h"
 #include "chrome/installer/util/google_update_settings.h"
 #include "chrome/views/background.h"
-#include "chrome/views/checkbox.h"
-#include "chrome/views/combo_box.h"
+#include "chrome/views/controls/button/checkbox.h"
+#include "chrome/views/controls/combo_box.h"
+#include "chrome/views/controls/scroll_view.h"
 #include "chrome/views/grid_layout.h"
-#include "chrome/views/scroll_view.h"
 #include "chrome/views/widget/widget.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
diff --git a/chrome/browser/views/options/advanced_page_view.cc b/chrome/browser/views/options/advanced_page_view.cc
index c2ac09f..9e9f1e3 100644
--- a/chrome/browser/views/options/advanced_page_view.cc
+++ b/chrome/browser/views/options/advanced_page_view.cc
@@ -13,10 +13,10 @@
 #include "chrome/common/l10n_util.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
+#include "chrome/views/controls/message_box_view.h"
+#include "chrome/views/controls/button/native_button.h"
+#include "chrome/views/controls/scroll_view.h"
 #include "chrome/views/grid_layout.h"
-#include "chrome/views/message_box_view.h"
-#include "chrome/views/native_button.h"
-#include "chrome/views/scroll_view.h"
 #include "chrome/views/window/dialog_delegate.h"
 #include "chrome/views/window/window.h"
 #include "grit/chromium_strings.h"
diff --git a/chrome/browser/views/options/advanced_page_view.h b/chrome/browser/views/options/advanced_page_view.h
index ac2fb80..54aa8a1 100644
--- a/chrome/browser/views/options/advanced_page_view.h
+++ b/chrome/browser/views/options/advanced_page_view.h
@@ -6,7 +6,7 @@
 #define CHROME_BROWSER_VIEWS_OPTIONS_ADVANCED_PAGE_VIEW_H_
 
 #include "chrome/browser/views/options/options_page_view.h"
-#include "chrome/views/native_button.h"
+#include "chrome/views/controls/button/native_button.h"
 
 class AdvancedOptionsListModel;
 class AdvancedScrollViewContainer;
diff --git a/chrome/browser/views/options/content_page_view.cc b/chrome/browser/views/options/content_page_view.cc
index 70f6f36..18a7550 100644
--- a/chrome/browser/views/options/content_page_view.cc
+++ b/chrome/browser/views/options/content_page_view.cc
@@ -23,11 +23,11 @@
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
 #include "chrome/common/resource_bundle.h"
-#include "chrome/views/checkbox.h"
+#include "chrome/views/controls/button/checkbox.h"
+#include "chrome/views/controls/button/native_button.h"
+#include "chrome/views/controls/button/radio_button.h"
+#include "chrome/views/controls/text_field.h"
 #include "chrome/views/grid_layout.h"
-#include "chrome/views/native_button.h"
-#include "chrome/views/radio_button.h"
-#include "chrome/views/text_field.h"
 #include "chrome/views/widget/widget.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
diff --git a/chrome/browser/views/options/content_page_view.h b/chrome/browser/views/options/content_page_view.h
index ed9b45b..3d68bb5 100644
--- a/chrome/browser/views/options/content_page_view.h
+++ b/chrome/browser/views/options/content_page_view.h
@@ -8,7 +8,7 @@
 #include "chrome/browser/views/options/options_page_view.h"
 #include "chrome/browser/shell_dialogs.h"
 #include "chrome/common/pref_member.h"
-#include "chrome/views/native_button.h"
+#include "chrome/views/controls/button/native_button.h"
 #include "chrome/views/view.h"
 
 namespace views {
diff --git a/chrome/browser/views/options/cookies_view.cc b/chrome/browser/views/options/cookies_view.cc
index 594e5e2..e31fc1e0 100644
--- a/chrome/browser/views/options/cookies_view.cc
+++ b/chrome/browser/views/options/cookies_view.cc
@@ -17,9 +17,9 @@
 #include "chrome/common/win_util.h"
 #include "chrome/views/border.h"
 #include "chrome/views/grid_layout.h"
-#include "chrome/views/label.h"
-#include "chrome/views/text_field.h"
-#include "chrome/views/table_view.h"
+#include "chrome/views/controls/label.h"
+#include "chrome/views/controls/text_field.h"
+#include "chrome/views/controls/table/table_view.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
 #include "grit/theme_resources.h"
diff --git a/chrome/browser/views/options/cookies_view.h b/chrome/browser/views/options/cookies_view.h
index 1f300cb..1c6aacc 100644
--- a/chrome/browser/views/options/cookies_view.h
+++ b/chrome/browser/views/options/cookies_view.h
@@ -6,9 +6,9 @@
 #define CHROME_BROWSER_VIEWS_OPTIONS_COOKIES_VIEW_H__
 
 #include "base/task.h"
-#include "chrome/views/native_button.h"
-#include "chrome/views/table_view.h"
-#include "chrome/views/text_field.h"
+#include "chrome/views/controls/button/native_button.h"
+#include "chrome/views/controls/table/table_view.h"
+#include "chrome/views/controls/text_field.h"
 #include "chrome/views/view.h"
 #include "chrome/views/window/dialog_delegate.h"
 #include "chrome/views/window/window.h"
diff --git a/chrome/browser/views/options/fonts_languages_window_view.h b/chrome/browser/views/options/fonts_languages_window_view.h
index 0ddc3d5..5d0fae3 100644
--- a/chrome/browser/views/options/fonts_languages_window_view.h
+++ b/chrome/browser/views/options/fonts_languages_window_view.h
@@ -5,7 +5,7 @@
 #ifndef CHROME_BROWSER_FONTS_LANGUAGE_WINDOW_H__
 #define CHROME_BROWSER_FONTS_LANGUAGE_WINDOW_H__
 
-#include "chrome/views/tabbed_pane.h"
+#include "chrome/views/controls/tabbed_pane.h"
 #include "chrome/views/view.h"
 #include "chrome/views/window/dialog_delegate.h"
 #include "chrome/views/window/window.h"
diff --git a/chrome/browser/views/options/fonts_page_view.cc b/chrome/browser/views/options/fonts_page_view.cc
index a3a31e9..d33b23c 100644
--- a/chrome/browser/views/options/fonts_page_view.cc
+++ b/chrome/browser/views/options/fonts_page_view.cc
@@ -24,11 +24,11 @@
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
 #include "chrome/common/resource_bundle.h"
-#include "chrome/views/checkbox.h"
+#include "chrome/views/controls/button/checkbox.h"
+#include "chrome/views/controls/button/native_button.h"
+#include "chrome/views/controls/button/radio_button.h"
+#include "chrome/views/controls/text_field.h"
 #include "chrome/views/grid_layout.h"
-#include "chrome/views/native_button.h"
-#include "chrome/views/radio_button.h"
-#include "chrome/views/text_field.h"
 #include "chrome/views/widget/widget.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
diff --git a/chrome/browser/views/options/fonts_page_view.h b/chrome/browser/views/options/fonts_page_view.h
index ddc0e62..eb348e6 100644
--- a/chrome/browser/views/options/fonts_page_view.h
+++ b/chrome/browser/views/options/fonts_page_view.h
@@ -8,8 +8,8 @@
 #include "chrome/browser/views/options/options_page_view.h"
 #include "chrome/browser/shell_dialogs.h"
 #include "chrome/common/pref_member.h"
-#include "chrome/views/combo_box.h"
-#include "chrome/views/native_button.h"
+#include "chrome/views/controls/combo_box.h"
+#include "chrome/views/controls/button/native_button.h"
 #include "chrome/views/view.h"
 
 
diff --git a/chrome/browser/views/options/general_page_view.cc b/chrome/browser/views/options/general_page_view.cc
index 3fbc161c..a1abb9b 100644
--- a/chrome/browser/views/options/general_page_view.cc
+++ b/chrome/browser/views/options/general_page_view.cc
@@ -28,12 +28,12 @@
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
 #include "chrome/common/resource_bundle.h"
-#include "chrome/views/checkbox.h"
+#include "chrome/views/controls/button/checkbox.h"
+#include "chrome/views/controls/button/radio_button.h"
+#include "chrome/views/controls/label.h"
+#include "chrome/views/controls/table/table_view.h"
+#include "chrome/views/controls/text_field.h"
 #include "chrome/views/grid_layout.h"
-#include "chrome/views/label.h"
-#include "chrome/views/radio_button.h"
-#include "chrome/views/table_view.h"
-#include "chrome/views/text_field.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
diff --git a/chrome/browser/views/options/general_page_view.h b/chrome/browser/views/options/general_page_view.h
index 9bee7fe..eea9cf1 100644
--- a/chrome/browser/views/options/general_page_view.h
+++ b/chrome/browser/views/options/general_page_view.h
@@ -8,8 +8,8 @@
 #include "chrome/browser/views/options/options_page_view.h"
 #include "chrome/browser/views/shelf_item_dialog.h"
 #include "chrome/common/pref_member.h"
-#include "chrome/views/combo_box.h"
-#include "chrome/views/native_button.h"
+#include "chrome/views/controls/combo_box.h"
+#include "chrome/views/controls/button/native_button.h"
 #include "chrome/views/view.h"
 
 namespace views {
diff --git a/chrome/browser/views/options/language_combobox_model.h b/chrome/browser/views/options/language_combobox_model.h
index de23de8..e10af90 100644
--- a/chrome/browser/views/options/language_combobox_model.h
+++ b/chrome/browser/views/options/language_combobox_model.h
@@ -6,7 +6,7 @@
 #define CHROME_BROWSER_VIEWS_OPTIONS_LANGUAGE_COMBOBOX_MODEL_H__
 
 #include "chrome/browser/profile.h"
-#include "chrome/views/combo_box.h"
+#include "chrome/views/controls/combo_box.h"
 
 ///////////////////////////////////////////////////////////////////////////////
 // LanguageComboboxModel
diff --git a/chrome/browser/views/options/languages_page_view.cc b/chrome/browser/views/options/languages_page_view.cc
index e0d137a..b156523 100644
--- a/chrome/browser/views/options/languages_page_view.cc
+++ b/chrome/browser/views/options/languages_page_view.cc
@@ -25,13 +25,13 @@
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
 #include "chrome/common/resource_bundle.h"
-#include "chrome/views/checkbox.h"
-#include "chrome/views/combo_box.h"
+#include "chrome/views/controls/button/checkbox.h"
+#include "chrome/views/controls/button/native_button.h"
+#include "chrome/views/controls/button/radio_button.h"
+#include "chrome/views/controls/combo_box.h"
+#include "chrome/views/controls/tabbed_pane.h"
+#include "chrome/views/controls/text_field.h"
 #include "chrome/views/grid_layout.h"
-#include "chrome/views/native_button.h"
-#include "chrome/views/radio_button.h"
-#include "chrome/views/tabbed_pane.h"
-#include "chrome/views/text_field.h"
 #include "chrome/views/widget/widget.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
diff --git a/chrome/browser/views/options/languages_page_view.h b/chrome/browser/views/options/languages_page_view.h
index 9623317..a58cb99 100644
--- a/chrome/browser/views/options/languages_page_view.h
+++ b/chrome/browser/views/options/languages_page_view.h
@@ -7,9 +7,9 @@
 
 #include "chrome/browser/views/options/options_page_view.h"
 #include "chrome/common/pref_member.h"
-#include "chrome/views/combo_box.h"
-#include "chrome/views/native_button.h"
-#include "chrome/views/table_view.h"
+#include "chrome/views/controls/combo_box.h"
+#include "chrome/views/controls/button/native_button.h"
+#include "chrome/views/controls/table/table_view.h"
 #include "chrome/views/view.h"
 
 namespace views {
diff --git a/chrome/browser/views/options/options_group_view.cc b/chrome/browser/views/options/options_group_view.cc
index 19d3887..c666f2a 100644
--- a/chrome/browser/views/options/options_group_view.cc
+++ b/chrome/browser/views/options/options_group_view.cc
@@ -14,8 +14,8 @@
 #include "chrome/common/l10n_util.h"
 #include "chrome/common/resource_bundle.h"
 #include "chrome/views/grid_layout.h"
-#include "chrome/views/label.h"
-#include "chrome/views/separator.h"
+#include "chrome/views/controls/label.h"
+#include "chrome/views/controls/separator.h"
 #include "grit/locale_settings.h"
 #include "grit/generated_resources.h"
 
diff --git a/chrome/browser/views/options/options_page_view.h b/chrome/browser/views/options/options_page_view.h
index ecb403d..6c7c4fd 100644
--- a/chrome/browser/views/options/options_page_view.h
+++ b/chrome/browser/views/options/options_page_view.h
@@ -8,8 +8,8 @@
 #include "chrome/browser/options_window.h"
 #include "chrome/browser/profile.h"
 #include "chrome/common/notification_observer.h"
-#include "chrome/views/link.h"
-#include "chrome/views/native_button.h"
+#include "chrome/views/controls/link.h"
+#include "chrome/views/controls/button/native_button.h"
 
 class PrefService;
 
diff --git a/chrome/browser/views/options/options_window_view.cc b/chrome/browser/views/options/options_window_view.cc
index bd423ec..f7f492f 100644
--- a/chrome/browser/views/options/options_window_view.cc
+++ b/chrome/browser/views/options/options_window_view.cc
@@ -18,7 +18,7 @@
 #include "chrome/personalization/personalization.h"
 #include "chrome/personalization/views/user_data_page_view.h"
 #endif
-#include "chrome/views/tabbed_pane.h"
+#include "chrome/views/controls/tabbed_pane.h"
 #include "chrome/views/widget/root_view.h"
 #include "chrome/views/window/dialog_delegate.h"
 #include "chrome/views/window/window.h"
diff --git a/chrome/browser/views/page_info_window.cc b/chrome/browser/views/page_info_window.cc
index 99a44c3..4a4c53d 100644
--- a/chrome/browser/views/page_info_window.cc
+++ b/chrome/browser/views/page_info_window.cc
@@ -22,10 +22,10 @@
 #include "chrome/common/win_util.h"
 #include "chrome/views/background.h"
 #include "chrome/views/grid_layout.h"
-#include "chrome/views/image_view.h"
-#include "chrome/views/label.h"
-#include "chrome/views/native_button.h"
-#include "chrome/views/separator.h"
+#include "chrome/views/controls/button/native_button.h"
+#include "chrome/views/controls/image_view.h"
+#include "chrome/views/controls/label.h"
+#include "chrome/views/controls/separator.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
 #include "grit/theme_resources.h"
diff --git a/chrome/browser/views/page_info_window.h b/chrome/browser/views/page_info_window.h
index 297b049..e82130f 100644
--- a/chrome/browser/views/page_info_window.h
+++ b/chrome/browser/views/page_info_window.h
@@ -6,7 +6,7 @@
 #define CHROME_BROWSER_VIEWS_PAGE_INFO_WINDOW_H__
 
 #include "chrome/browser/tab_contents/navigation_entry.h"
-#include "chrome/views/native_button.h"
+#include "chrome/views/controls/button/native_button.h"
 #include "chrome/views/window/dialog_delegate.h"
 #include "chrome/views/window/window.h"
 #include "googleurl/src/gurl.h"
diff --git a/chrome/browser/views/password_manager_exceptions_view.cc b/chrome/browser/views/password_manager_exceptions_view.cc
index a501a60..5af5f7d 100644
--- a/chrome/browser/views/password_manager_exceptions_view.cc
+++ b/chrome/browser/views/password_manager_exceptions_view.cc
@@ -2,16 +2,17 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "chrome/browser/views/password_manager_exceptions_view.h"
+
 #include "base/string_util.h"
 #include "chrome/common/l10n_util.h"
 #include "chrome/browser/profile.h"
-#include "chrome/browser/views/password_manager_exceptions_view.h"
 #include "chrome/browser/views/standard_layout.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
 #include "chrome/views/background.h"
+#include "chrome/views/controls/button/native_button.h"
 #include "chrome/views/grid_layout.h"
-#include "chrome/views/native_button.h"
 #include "grit/generated_resources.h"
 
 using views::ColumnSet;
diff --git a/chrome/browser/views/password_manager_exceptions_view.h b/chrome/browser/views/password_manager_exceptions_view.h
index 8efc422..cfd9297 100644
--- a/chrome/browser/views/password_manager_exceptions_view.h
+++ b/chrome/browser/views/password_manager_exceptions_view.h
@@ -11,9 +11,9 @@
 #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/label.h"
-#include "chrome/views/native_button.h"
-#include "chrome/views/table_view.h"
+#include "chrome/views/controls/button/native_button.h"
+#include "chrome/views/controls/label.h"
+#include "chrome/views/controls/table/table_view.h"
 #include "chrome/views/window/dialog_delegate.h"
 #include "chrome/views/window/window.h"
 #include "webkit/glue/password_form.h"
diff --git a/chrome/browser/views/password_manager_view.cc b/chrome/browser/views/password_manager_view.cc
index 63d8c73..eb7f5eb 100644
--- a/chrome/browser/views/password_manager_view.cc
+++ b/chrome/browser/views/password_manager_view.cc
@@ -2,16 +2,17 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "chrome/browser/views/password_manager_view.h"
+
 #include "base/string_util.h"
 #include "chrome/common/l10n_util.h"
 #include "chrome/browser/profile.h"
-#include "chrome/browser/views/password_manager_view.h"
 #include "chrome/browser/views/standard_layout.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
 #include "chrome/views/background.h"
+#include "chrome/views/controls/button/native_button.h"
 #include "chrome/views/grid_layout.h"
-#include "chrome/views/native_button.h"
 #include "grit/generated_resources.h"
 
 using views::ColumnSet;
diff --git a/chrome/browser/views/password_manager_view.h b/chrome/browser/views/password_manager_view.h
index e382cec..40bb8ba 100644
--- a/chrome/browser/views/password_manager_view.h
+++ b/chrome/browser/views/password_manager_view.h
@@ -8,12 +8,13 @@
 #include <vector>
 
 #include "base/scoped_ptr.h"
+#include "chrome/browser/profile.h"
 #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/label.h"
-#include "chrome/views/native_button.h"
-#include "chrome/views/table_view.h"
+#include "chrome/views/controls/button/native_button.h"
+#include "chrome/views/controls/label.h"
+#include "chrome/views/controls/table/table_view.h"
 #include "chrome/views/window/dialog_delegate.h"
 #include "chrome/views/window/window.h"
 #include "webkit/glue/password_form.h"
diff --git a/chrome/browser/views/repost_form_warning_view.cc b/chrome/browser/views/repost_form_warning_view.cc
index f190097..583de4c 100644
--- a/chrome/browser/views/repost_form_warning_view.cc
+++ b/chrome/browser/views/repost_form_warning_view.cc
@@ -8,7 +8,7 @@
 #include "chrome/browser/tab_contents/navigation_controller.h"
 #include "chrome/common/l10n_util.h"
 #include "chrome/common/notification_service.h"
-#include "chrome/views/message_box_view.h"
+#include "chrome/views/controls/message_box_view.h"
 #include "chrome/views/window/window.h"
 #include "grit/generated_resources.h"
 
diff --git a/chrome/browser/views/restart_message_box.cc b/chrome/browser/views/restart_message_box.cc
index 199e5e9..42f734d 100644
--- a/chrome/browser/views/restart_message_box.cc
+++ b/chrome/browser/views/restart_message_box.cc
@@ -5,7 +5,7 @@
 #include "chrome/browser/views/restart_message_box.h"
 
 #include "chrome/common/l10n_util.h"
-#include "chrome/views/message_box_view.h"
+#include "chrome/views/controls/message_box_view.h"
 #include "chrome/views/window/window.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
diff --git a/chrome/browser/views/select_profile_dialog.cc b/chrome/browser/views/select_profile_dialog.cc
index c0b48b4..b10c262 100644
--- a/chrome/browser/views/select_profile_dialog.cc
+++ b/chrome/browser/views/select_profile_dialog.cc
@@ -12,10 +12,10 @@
 #include "chrome/browser/views/new_profile_dialog.h"
 #include "chrome/browser/views/standard_layout.h"
 #include "chrome/common/l10n_util.h"
-#include "chrome/views/combo_box.h"
+#include "chrome/views/controls/combo_box.h"
+#include "chrome/views/controls/label.h"
+#include "chrome/views/controls/message_box_view.h"
 #include "chrome/views/grid_layout.h"
-#include "chrome/views/label.h"
-#include "chrome/views/message_box_view.h"
 #include "chrome/views/view.h"
 #include "chrome/views/window/window.h"
 #include "grit/chromium_strings.h"
diff --git a/chrome/browser/views/select_profile_dialog.h b/chrome/browser/views/select_profile_dialog.h
index dbfb355..a761623 100644
--- a/chrome/browser/views/select_profile_dialog.h
+++ b/chrome/browser/views/select_profile_dialog.h
@@ -15,7 +15,7 @@
 #include "base/ref_counted.h"
 #include "chrome/browser/shell_dialogs.h"
 #include "chrome/browser/user_data_manager.h"
-#include "chrome/views/combo_box.h"
+#include "chrome/views/controls/combo_box.h"
 #include "chrome/views/window/dialog_delegate.h"
 
 class SelectProfileDialogHelper;
diff --git a/chrome/browser/views/shelf_item_dialog.cc b/chrome/browser/views/shelf_item_dialog.cc
index b243bbd..68050b1 100644
--- a/chrome/browser/views/shelf_item_dialog.cc
+++ b/chrome/browser/views/shelf_item_dialog.cc
@@ -17,10 +17,10 @@
 #include "chrome/common/resource_bundle.h"
 #include "chrome/common/stl_util-inl.h"
 #include "chrome/views/background.h"
+#include "chrome/views/controls/label.h"
+#include "chrome/views/controls/text_field.h"
 #include "chrome/views/focus/focus_manager.h"
 #include "chrome/views/grid_layout.h"
-#include "chrome/views/label.h"
-#include "chrome/views/text_field.h"
 #include "chrome/views/widget/widget.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
diff --git a/chrome/browser/views/shelf_item_dialog.h b/chrome/browser/views/shelf_item_dialog.h
index 8e61493..a90b593 100644
--- a/chrome/browser/views/shelf_item_dialog.h
+++ b/chrome/browser/views/shelf_item_dialog.h
@@ -7,9 +7,9 @@
 
 #include "chrome/browser/cancelable_request.h"
 #include "chrome/browser/history/history.h"
-#include "chrome/views/native_button.h"
-#include "chrome/views/table_view.h"
-#include "chrome/views/text_field.h"
+#include "chrome/views/controls/button/native_button.h"
+#include "chrome/views/controls/table/table_view.h"
+#include "chrome/views/controls/text_field.h"
 #include "chrome/views/view.h"
 #include "chrome/views/window/dialog_delegate.h"
 #include "chrome/views/window/window.h"
diff --git a/chrome/browser/views/status_bubble_views.cc b/chrome/browser/views/status_bubble_views.cc
index a71ec1c..4117cb0 100644
--- a/chrome/browser/views/status_bubble_views.cc
+++ b/chrome/browser/views/status_bubble_views.cc
@@ -13,7 +13,7 @@
 #include "chrome/common/l10n_util.h"
 #include "chrome/common/l10n_util_win.h"
 #include "chrome/common/resource_bundle.h"
-#include "chrome/views/label.h"
+#include "chrome/views/controls/label.h"
 #include "chrome/views/widget/root_view.h"
 #include "chrome/views/widget/widget_win.h"
 #include "googleurl/src/gurl.h"
diff --git a/chrome/browser/views/tab_contents_container_view.cc b/chrome/browser/views/tab_contents_container_view.cc
index 2752250..fb26ad9 100644
--- a/chrome/browser/views/tab_contents_container_view.cc
+++ b/chrome/browser/views/tab_contents_container_view.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 <algorithm>
-
 #include "chrome/browser/views/tab_contents_container_view.h"
 
+#include <algorithm>
+
 #include "base/logging.h"
 #include "chrome/browser/renderer_host/render_view_host.h"
 #include "chrome/browser/renderer_host/render_widget_host_view.h"
diff --git a/chrome/browser/views/tab_contents_container_view.h b/chrome/browser/views/tab_contents_container_view.h
index 61cf721..7a7ec9d 100644
--- a/chrome/browser/views/tab_contents_container_view.h
+++ b/chrome/browser/views/tab_contents_container_view.h
@@ -13,8 +13,8 @@ class RenderViewHost;
 class TabContents;
 
 #include "chrome/common/notification_observer.h"
+#include "chrome/views/controls/hwnd_view.h"
 #include "chrome/views/focus/focus_manager.h"
-#include "chrome/views/hwnd_view.h"
 
 // This View contains the TabContents.
 // It takes care of linking the TabContents to the browser RootView so that the
diff --git a/chrome/browser/views/tab_icon_view.cc b/chrome/browser/views/tab_icon_view.cc
index 7a7c972..e9da07e 100644
--- a/chrome/browser/views/tab_icon_view.cc
+++ b/chrome/browser/views/tab_icon_view.cc
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "chrome/browser/views/tab_icon_view.h"
+
 #include <windows.h>
 #include <shellapi.h>
 
-#include "chrome/browser/views/tab_icon_view.h"
-
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "chrome/app/chrome_dll_resource.h"
diff --git a/chrome/browser/views/tabs/dragged_tab_controller.cc b/chrome/browser/views/tabs/dragged_tab_controller.cc
index 8182843..0557d91 100644
--- a/chrome/browser/views/tabs/dragged_tab_controller.cc
+++ b/chrome/browser/views/tabs/dragged_tab_controller.cc
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "chrome/browser/views/tabs/dragged_tab_controller.h"
+
 #include <math.h>
 #include <set>
 
-#include "chrome/browser/views/tabs/dragged_tab_controller.h"
-
 #include "chrome/browser/browser_window.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/metrics/user_metrics.h"
diff --git a/chrome/browser/views/tabs/tab.cc b/chrome/browser/views/tabs/tab.cc
index 462e248..32d3839 100644
--- a/chrome/browser/views/tabs/tab.cc
+++ b/chrome/browser/views/tabs/tab.cc
@@ -9,7 +9,7 @@
 #include "chrome/common/gfx/path.h"
 #include "chrome/common/l10n_util.h"
 #include "chrome/common/resource_bundle.h"
-#include "chrome/views/chrome_menu.h"
+#include "chrome/views/controls/menu/chrome_menu.h"
 #include "chrome/views/widget/tooltip_manager.h"
 #include "chrome/views/widget/widget.h"
 #include "grit/generated_resources.h"
diff --git a/chrome/browser/views/tabs/tab_renderer.h b/chrome/browser/views/tabs/tab_renderer.h
index df4cd6c..1a7a5fc 100644
--- a/chrome/browser/views/tabs/tab_renderer.h
+++ b/chrome/browser/views/tabs/tab_renderer.h
@@ -9,8 +9,8 @@
 #include "chrome/common/animation.h"
 #include "chrome/common/slide_animation.h"
 #include "chrome/common/throb_animation.h"
-#include "chrome/views/image_button.h"
-#include "chrome/views/menu.h"
+#include "chrome/views/controls/button/image_button.h"
+#include "chrome/views/controls/menu/menu.h"
 #include "chrome/views/view.h"
 
 class TabContents;
diff --git a/chrome/browser/views/tabs/tab_strip.cc b/chrome/browser/views/tabs/tab_strip.cc
index 037da49..10021f3 100644
--- a/chrome/browser/views/tabs/tab_strip.cc
+++ b/chrome/browser/views/tabs/tab_strip.cc
@@ -23,7 +23,7 @@
 #include "chrome/common/slide_animation.h"
 #include "chrome/common/stl_util-inl.h"
 #include "chrome/common/win_util.h"
-#include "chrome/views/image_view.h"
+#include "chrome/views/controls/image_view.h"
 #include "chrome/views/painter.h"
 #include "chrome/views/window/non_client_view.h"
 #include "chrome/views/window/window.h"
diff --git a/chrome/browser/views/tabs/tab_strip.h b/chrome/browser/views/tabs/tab_strip.h
index 60e641a..38a212b 100644
--- a/chrome/browser/views/tabs/tab_strip.h
+++ b/chrome/browser/views/tabs/tab_strip.h
@@ -8,8 +8,8 @@
 #include "base/gfx/point.h"
 #include "chrome/browser/tabs/tab_strip_model.h"
 #include "chrome/browser/views/tabs/tab.h"
-#include "chrome/views/image_button.h"
-#include "chrome/views/menu.h"
+#include "chrome/views/controls/button/image_button.h"
+#include "chrome/views/controls/menu/menu.h"
 #include "chrome/views/view.h"
 #include "chrome/views/widget/widget_win.h"
 
diff --git a/chrome/browser/views/toolbar_star_toggle.h b/chrome/browser/views/toolbar_star_toggle.h
index 8b8d766..efd3bd3 100644
--- a/chrome/browser/views/toolbar_star_toggle.h
+++ b/chrome/browser/views/toolbar_star_toggle.h
@@ -7,7 +7,7 @@
 
 #include "base/time.h"
 #include "chrome/browser/views/info_bubble.h"
-#include "chrome/views/image_button.h"
+#include "chrome/views/controls/button/image_button.h"
 
 class BrowserToolbarView;
 class GURL;
diff --git a/chrome/browser/views/toolbar_view.cc b/chrome/browser/views/toolbar_view.cc
index 1f80ed1..f676bb7 100644
--- a/chrome/browser/views/toolbar_view.cc
+++ b/chrome/browser/views/toolbar_view.cc
@@ -42,9 +42,9 @@
 #include "chrome/personalization/personalization.h"
 #endif
 #include "chrome/views/background.h"
-#include "chrome/views/button_dropdown.h"
-#include "chrome/views/hwnd_view.h"
-#include "chrome/views/label.h"
+#include "chrome/views/controls/button/button_dropdown.h"
+#include "chrome/views/controls/hwnd_view.h"
+#include "chrome/views/controls/label.h"
 #include "chrome/views/widget/tooltip_manager.h"
 #include "chrome/views/window/non_client_view.h"
 #include "chrome/views/window/window.h"
diff --git a/chrome/browser/views/toolbar_view.h b/chrome/browser/views/toolbar_view.h
index b1eb0da..10c5506 100644
--- a/chrome/browser/views/toolbar_view.h
+++ b/chrome/browser/views/toolbar_view.h
@@ -17,10 +17,10 @@
 #include "chrome/browser/views/go_button.h"
 #include "chrome/browser/views/location_bar_view.h"
 #include "chrome/common/pref_member.h"
-#include "chrome/views/menu.h"
-#include "chrome/views/menu_button.h"
+#include "chrome/views/controls/button/menu_button.h"
+#include "chrome/views/controls/menu/menu.h"
+#include "chrome/views/controls/menu/view_menu_delegate.h"
 #include "chrome/views/view.h"
-#include "chrome/views/view_menu_delegate.h"
 
 class Browser;
 class Profile;
diff --git a/chrome/browser/views/user_data_dir_dialog.cc b/chrome/browser/views/user_data_dir_dialog.cc
index 3a19a64..f303f37 100644
--- a/chrome/browser/views/user_data_dir_dialog.cc
+++ b/chrome/browser/views/user_data_dir_dialog.cc
@@ -5,7 +5,7 @@
 #include "base/logging.h"
 #include "chrome/browser/views/user_data_dir_dialog.h"
 #include "chrome/common/l10n_util.h"
-#include "chrome/views/message_box_view.h"
+#include "chrome/views/controls/message_box_view.h"
 #include "chrome/views/widget/widget.h"
 #include "chrome/views/window/window.h"
 #include "grit/chromium_strings.h"
diff --git a/chrome/common/gfx/text_elider.cc b/chrome/common/gfx/text_elider.cc
index 9510a8e..3122d3d 100644
--- a/chrome/common/gfx/text_elider.cc
+++ b/chrome/common/gfx/text_elider.cc
@@ -8,9 +8,6 @@
 #include "chrome/common/gfx/text_elider.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
-#if defined(OS_WIN)
-#include "chrome/views/label.h"
-#endif  // defined(OS_WIN)
 #include "googleurl/src/gurl.h"
 #include "net/base/escape.h"
 #include "net/base/net_util.h"
diff --git a/chrome/common/gfx/text_elider_unittest.cc b/chrome/common/gfx/text_elider_unittest.cc
index ab6a1e2..17c5e8d 100644
--- a/chrome/common/gfx/text_elider_unittest.cc
+++ b/chrome/common/gfx/text_elider_unittest.cc
@@ -5,7 +5,6 @@
 #include "base/string_util.h"
 #include "chrome/common/gfx/chrome_font.h"
 #include "chrome/common/gfx/text_elider.h"
-#include "chrome/views/label.h"
 #include "googleurl/src/gurl.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
diff --git a/chrome/renderer/render_view.cc b/chrome/renderer/render_view.cc
index cf3a6e8..bfbdbc1 100644
--- a/chrome/renderer/render_view.cc
+++ b/chrome/renderer/render_view.cc
@@ -74,7 +74,7 @@
 #include "base/gfx/native_theme.h"
 #include "chrome/common/gfx/emf.h"
 #include "chrome/renderer/renderer_logging.h"
-#include "chrome/views/message_box_view.h"
+#include "chrome/views/controls/message_box_view.h"
 #include "skia/ext/vector_canvas.h"
 #endif
 
diff --git a/chrome/test/unit/unittests.vcproj b/chrome/test/unit/unittests.vcproj
index 0209697..eac5558 100644
--- a/chrome/test/unit/unittests.vcproj
+++ b/chrome/test/unit/unittests.vcproj
@@ -960,7 +960,7 @@
 			Name="views"
 			>
 			<File
-				RelativePath="..\..\views\focus_manager_unittest.cc"
+				RelativePath="..\..\views\focus\focus_manager_unittest.cc"
 				>
 			</File>
 			<File
@@ -968,15 +968,15 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\views\label_unittest.cc"
+				RelativePath="..\..\views\controls\label_unittest.cc"
 				>
 			</File>
 			<File
-				RelativePath="..\..\views\table_view_unittest.cc"
+				RelativePath="..\..\views\controls\table\table_view_unittest.cc"
 				>
 			</File>
 			<File
-				RelativePath="..\..\views\tree_node_iterator_unittest.cc"
+				RelativePath="..\..\views\controls\tree\tree_node_iterator_unittest.cc"
 				>
 			</File>
 			<File
diff --git a/chrome/views/accessibility/view_accessibility.h b/chrome/views/accessibility/view_accessibility.h
index f5f9a9b..c94054f 100644
--- a/chrome/views/accessibility/view_accessibility.h
+++ b/chrome/views/accessibility/view_accessibility.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_ACCESSIBILITY_VIEW_ACCESSIBILITY_H__
-#define CHROME_VIEWS_ACCESSIBILITY_VIEW_ACCESSIBILITY_H__
+#ifndef CHROME_VIEWS_ACCESSIBILITY_VIEW_ACCESSIBILITY_H_
+#define CHROME_VIEWS_ACCESSIBILITY_VIEW_ACCESSIBILITY_H_
 
 #include <atlbase.h>
 #include <atlcom.h>
@@ -126,4 +126,5 @@ class ATL_NO_VTABLE ViewAccessibility
 
   DISALLOW_EVIL_CONSTRUCTORS(ViewAccessibility);
 };
-#endif  // CHROME_VIEWS_ACCESSIBILITY_VIEW_ACCESSIBILITY_H__
+
+#endif  // CHROME_VIEWS_ACCESSIBILITY_VIEW_ACCESSIBILITY_H_
diff --git a/chrome/views/background.h b/chrome/views/background.h
index 7126720..3ab7662 100644
--- a/chrome/views/background.h
+++ b/chrome/views/background.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_BACKGROUND_H__
-#define CHROME_VIEWS_BACKGROUND_H__
+#ifndef CHROME_VIEWS_BACKGROUND_H_
+#define CHROME_VIEWS_BACKGROUND_H_
 
 #include "build/build_config.h"
 
@@ -88,4 +88,4 @@ class Background {
 
 }  // namespace views
 
-#endif  // CHROME_VIEWS_BACKGROUND_H__
+#endif  // CHROME_VIEWS_BACKGROUND_H_
diff --git a/chrome/views/button.cc b/chrome/views/controls/button/button.cc
index 860d8fa..5c28138 100644
--- a/chrome/views/button.cc
+++ b/chrome/views/controls/button/button.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/button.h"
+#include "chrome/views/controls/button/button.h"
 
 namespace views {
 
diff --git a/chrome/views/button.h b/chrome/views/controls/button/button.h
index a29fb78..1f6514b 100644
--- a/chrome/views/button.h
+++ b/chrome/views/controls/button/button.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_BUTTON_H_
-#define CHROME_VIEWS_BUTTON_H_
+#ifndef CHROME_VIEWS_CONTROLS_BUTTON_BUTTON_H_
+#define CHROME_VIEWS_CONTROLS_BUTTON_BUTTON_H_
 
 #include "chrome/views/view.h"
 
@@ -71,4 +71,4 @@ class Button : public View {
 
 }  // namespace views
 
-#endif  // CHROME_VIEWS_BUTTON_H_
+#endif  // CHROME_VIEWS_CONTROLS_BUTTON_BUTTON_H_
diff --git a/chrome/views/button_dropdown.cc b/chrome/views/controls/button/button_dropdown.cc
index d9b7e0c..c2ea7cc 100644
--- a/chrome/views/button_dropdown.cc
+++ b/chrome/views/controls/button/button_dropdown.cc
@@ -2,12 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/views/button_dropdown.h"
+#include "chrome/views/controls/button/button_dropdown.h"
 
 #include "base/message_loop.h"
-#include "chrome/browser/back_forward_menu_model.h"
 #include "chrome/common/l10n_util.h"
-#include "chrome/views/view_menu_delegate.h"
+#include "chrome/views/controls/menu/view_menu_delegate.h"
 #include "chrome/views/widget/widget.h"
 #include "grit/generated_resources.h"
 
diff --git a/chrome/views/button_dropdown.h b/chrome/views/controls/button/button_dropdown.h
index e92204b..b46158b 100644
--- a/chrome/views/button_dropdown.h
+++ b/chrome/views/controls/button/button_dropdown.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_BUTTON_DROPDOWN_H__
-#define CHROME_VIEWS_BUTTON_DROPDOWN_H__
+#ifndef CHROME_VIEWS_CONTROLS_BUTTON_BUTTON_DROPDOWN_H_
+#define CHROME_VIEWS_CONTROLS_BUTTON_BUTTON_DROPDOWN_H_
 
 #include "base/task.h"
-#include "chrome/views/image_button.h"
-#include "chrome/views/menu.h"
+#include "chrome/views/controls/button/image_button.h"
+#include "chrome/views/controls/menu/menu.h"
 
 namespace views {
 
@@ -69,4 +69,4 @@ class ButtonDropDown : public ImageButton {
 
 }  // namespace views
 
-#endif  // CHROME_VIEWS_BUTTON_DROPDOWN_H__
+#endif  // CHROME_VIEWS_CONTROLS_BUTTON_BUTTON_DROPDOWN_H_
diff --git a/chrome/views/checkbox.cc b/chrome/views/controls/button/checkbox.cc
index 813e383..c5463de 100644
--- a/chrome/views/checkbox.cc
+++ b/chrome/views/controls/button/checkbox.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/checkbox.h"
+#include "chrome/views/controls/button/checkbox.h"
 
 #include "chrome/common/gfx/chrome_canvas.h"
-#include "chrome/views/checkbox.h"
-#include "chrome/views/hwnd_view.h"
-#include "chrome/views/label.h"
+#include "chrome/views/controls/button/checkbox.h"
+#include "chrome/views/controls/hwnd_view.h"
+#include "chrome/views/controls/label.h"
 
 // FIXME(ACW) there got be a better way to find out the check box sizes
 static int kCheckBoxWidth = 13;
diff --git a/chrome/views/checkbox.h b/chrome/views/controls/button/checkbox.h
index b85e5cd..78c006b 100644
--- a/chrome/views/checkbox.h
+++ b/chrome/views/controls/button/checkbox.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_CHECKBOX_H__
-#define CHROME_VIEWS_CHECKBOX_H__
+#ifndef CHROME_VIEWS_CONTROLS_BUTTON_CHECKBOX_H_
+#define CHROME_VIEWS_CONTROLS_BUTTON_CHECKBOX_H_
 
 #include "base/gfx/rect.h"
-#include "chrome/views/native_button.h"
+#include "chrome/views/controls/button/native_button.h"
 
 namespace views {
 
@@ -82,4 +82,4 @@ class CheckBox : public NativeButton {
 
 }  // namespace views
 
-#endif  // CHROME_VIEWS_NATIVE_CHECKBOX_H__
+#endif  // CHROME_VIEWS_CONTROLS_BUTTON_CHECKBOX_H_
diff --git a/chrome/views/custom_button.cc b/chrome/views/controls/button/custom_button.cc
index 70c8fc7..04e0a50 100644
--- a/chrome/views/custom_button.cc
+++ b/chrome/views/controls/button/custom_button.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_button.h"
+#include "chrome/views/controls/button/custom_button.h"
 
 #include "base/base_drag_source.h"
 #include "chrome/browser/drag_utils.h"
diff --git a/chrome/views/custom_button.h b/chrome/views/controls/button/custom_button.h
index eeeb22c..cb4db5d 100644
--- a/chrome/views/custom_button.h
+++ b/chrome/views/controls/button/custom_button.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_CUSTOM_BUTTON_H_
-#define CHROME_VIEWS_CUSTOM_BUTTON_H_
+#ifndef CHROME_VIEWS_CONTROLS_BUTTON_CUSTOM_BUTTON_H_
+#define CHROME_VIEWS_CONTROLS_BUTTON_CUSTOM_BUTTON_H_
 
 #include "chrome/common/animation.h"
-#include "chrome/views/button.h"
+#include "chrome/views/controls/button/button.h"
 
 class ThrobAnimation;
 
@@ -91,4 +91,4 @@ class CustomButton : public Button,
 
 }  // namespace views
 
-#endif  // CHROME_VIEWS_CUSTOM_BUTTON_H_
+#endif  // CHROME_VIEWS_CONTROLS_BUTTON_CUSTOM_BUTTON_H_
diff --git a/chrome/views/image_button.cc b/chrome/views/controls/button/image_button.cc
index e6e370f..235cc83 100644
--- a/chrome/views/image_button.cc
+++ b/chrome/views/controls/button/image_button.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/image_button.h"
+#include "chrome/views/controls/button/image_button.h"
 
 #include "chrome/app/chrome_dll_resource.h"
 #include "chrome/common/gfx/chrome_canvas.h"
diff --git a/chrome/views/image_button.h b/chrome/views/controls/button/image_button.h
index f39753e..6d304ba 100644
--- a/chrome/views/image_button.h
+++ b/chrome/views/controls/button/image_button.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_IMAGE_BUTTON_H_
-#define CHROME_VIEWS_IMAGE_BUTTON_H_
+#ifndef CHROME_VIEWS_CONTROLS_BUTTON_IMAGE_BUTTON_H_
+#define CHROME_VIEWS_CONTROLS_BUTTON_IMAGE_BUTTON_H_
 
-#include "chrome/views/custom_button.h"
+#include "chrome/views/controls/button/custom_button.h"
 #include "skia/include/SkBitmap.h"
 
 namespace views {
@@ -98,4 +98,4 @@ class ToggleImageButton : public ImageButton {
 
 }  // namespace views
 
-#endif  // CHROME_VIEWS_IMAGE_BUTTON_H_
+#endif  // CHROME_VIEWS_CONTROLS_BUTTON_IMAGE_BUTTON_H_
diff --git a/chrome/views/menu_button.cc b/chrome/views/controls/button/menu_button.cc
index 89d1f15..0bcd2ae 100644
--- a/chrome/views/menu_button.cc
+++ b/chrome/views/controls/button/menu_button.cc
@@ -2,19 +2,16 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include <atlbase.h>
-#include <atlapp.h>
-
-#include "chrome/views/menu_button.h"
+#include "chrome/views/controls/button/menu_button.h"
 
 #include "chrome/common/drag_drop_types.h"
 #include "chrome/common/gfx/chrome_canvas.h"
 #include "chrome/common/l10n_util.h"
 #include "chrome/common/resource_bundle.h"
 #include "chrome/common/win_util.h"
-#include "chrome/views/button.h"
+#include "chrome/views/controls/button/button.h"
+#include "chrome/views/controls/menu/view_menu_delegate.h"
 #include "chrome/views/event.h"
-#include "chrome/views/view_menu_delegate.h"
 #include "chrome/views/widget/root_view.h"
 #include "chrome/views/widget/widget.h"
 #include "grit/generated_resources.h"
diff --git a/chrome/views/menu_button.h b/chrome/views/controls/button/menu_button.h
index 55fe4e5..458853e 100644
--- a/chrome/views/menu_button.h
+++ b/chrome/views/controls/button/menu_button.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_MENU_BUTTON_H__
-#define CHROME_VIEWS_MENU_BUTTON_H__
+#ifndef CHROME_VIEWS_CONTROLS_BUTTON_MENU_BUTTON_H_
+#define CHROME_VIEWS_CONTROLS_BUTTON_MENU_BUTTON_H_
 
 #include <windows.h>
 
 #include "chrome/common/gfx/chrome_font.h"
 #include "chrome/views/background.h"
-#include "chrome/views/text_button.h"
+#include "chrome/views/controls/button/text_button.h"
 #include "base/time.h"
 
 namespace views {
@@ -95,4 +95,4 @@ class MenuButton : public TextButton {
 
 }  // namespace views
 
-#endif  // CHROME_VIEWS_MENU_BUTTON_H__
+#endif  // CHROME_VIEWS_CONTROLS_BUTTON_MENU_BUTTON_H_
diff --git a/chrome/views/native_button.cc b/chrome/views/controls/button/native_button.cc
index 71ff637..4da39407 100644
--- a/chrome/views/native_button.cc
+++ b/chrome/views/controls/button/native_button.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/native_button.h"
+#include "chrome/views/controls/button/native_button.h"
 
 #include "base/logging.h"
 #include "chrome/common/gfx/chrome_canvas.h"
diff --git a/chrome/views/native_button.h b/chrome/views/controls/button/native_button.h
index 098fad0..07d7340 100644
--- a/chrome/views/native_button.h
+++ b/chrome/views/controls/button/native_button.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_NATIVE_BUTTON_H__
-#define CHROME_VIEWS_NATIVE_BUTTON_H__
+#ifndef CHROME_VIEWS_CONTROLS_BUTTON_NATIVE_BUTTON_H_
+#define CHROME_VIEWS_CONTROLS_BUTTON_NATIVE_BUTTON_H_
 
 #include <string>
 
 #include "base/gfx/size.h"
 #include "chrome/common/gfx/chrome_font.h"
-#include "chrome/views/native_control.h"
+#include "chrome/views/controls/native_control.h"
 
 namespace views {
 
@@ -143,4 +143,4 @@ class NativeButton : public NativeControl {
 
 }  // namespace views
 
-#endif  // CHROME_VIEWS_NATIVE_BUTTON_H__
+#endif  // CHROME_VIEWS_CONTROLS_BUTTON_NATIVE_BUTTON_H_
diff --git a/chrome/views/radio_button.cc b/chrome/views/controls/button/radio_button.cc
index a376460..758c747 100644
--- a/chrome/views/radio_button.cc
+++ b/chrome/views/controls/button/radio_button.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/radio_button.h"
+#include "chrome/views/controls/button/radio_button.h"
 
-#include "chrome/views/label.h"
-#include "chrome/views/hwnd_view.h"
+#include "chrome/views/controls/label.h"
+#include "chrome/views/controls/hwnd_view.h"
 #include "chrome/views/widget/root_view.h"
 
 namespace views {
diff --git a/chrome/views/radio_button.h b/chrome/views/controls/button/radio_button.h
index e790e9b..dbae232 100644
--- a/chrome/views/radio_button.h
+++ b/chrome/views/controls/button/radio_button.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_RADIO_BUTTON_H__
-#define CHROME_VIEWS_RADIO_BUTTON_H__
+#ifndef CHROME_VIEWS_CONTROLS_BUTTON_RADIO_BUTTON_H_
+#define CHROME_VIEWS_CONTROLS_BUTTON_RADIO_BUTTON_H_
 
-#include "chrome/views/checkbox.h"
+#include "chrome/views/controls/button/checkbox.h"
 
 namespace views {
 
@@ -57,4 +57,4 @@ class RadioButton : public CheckBox {
 
 }  // namespace views
 
-#endif // CHROME_VIEWS_RADIO_BUTTON_H__
+#endif  // CHROME_VIEWS_CONTROLS_BUTTON_RADIO_BUTTON_H_
diff --git a/chrome/views/text_button.cc b/chrome/views/controls/button/text_button.cc
index f7c0cda..c5f1ae6 100644
--- a/chrome/views/text_button.cc
+++ b/chrome/views/controls/button/text_button.cc
@@ -2,16 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/views/text_button.h"
+#include "chrome/views/controls/button/text_button.h"
 
 #include "chrome/common/gfx/chrome_canvas.h"
 #include "chrome/common/l10n_util.h"
 #include "chrome/common/resource_bundle.h"
 #include "chrome/common/throb_animation.h"
 #include "chrome/common/win_util.h"
-#include "chrome/views/button.h"
+#include "chrome/views/controls/button/button.h"
 #include "chrome/views/event.h"
-#include "chrome/views/view_menu_delegate.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 
diff --git a/chrome/views/text_button.h b/chrome/views/controls/button/text_button.h
index 9a4d68f..6ef4b52 100644
--- a/chrome/views/text_button.h
+++ b/chrome/views/controls/button/text_button.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_TEXT_BUTTON_H__
-#define CHROME_VIEWS_TEXT_BUTTON_H__
+#ifndef CHROME_VIEWS_CONTROLS_BUTTON_TEXT_BUTTON_H_
+#define CHROME_VIEWS_CONTROLS_BUTTON_TEXT_BUTTON_H_
 
 #include "chrome/common/gfx/chrome_font.h"
 #include "chrome/views/border.h"
-#include "chrome/views/custom_button.h"
+#include "chrome/views/controls/button/custom_button.h"
 #include "skia/include/SkBitmap.h"
 
 namespace views {
@@ -135,4 +135,4 @@ class TextButton : public CustomButton {
 
 }  // namespace views
 
-#endif  // CHROME_VIEWS_TEXT_BUTTON_H__
+#endif  // CHROME_VIEWS_CONTROLS_BUTTON_TEXT_BUTTON_H_
diff --git a/chrome/views/combo_box.cc b/chrome/views/controls/combo_box.cc
index ec3d682..0c063ac 100644
--- a/chrome/views/combo_box.cc
+++ b/chrome/views/controls/combo_box.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/combo_box.h"
+#include "chrome/views/controls/combo_box.h"
 
 #include "base/gfx/native_theme.h"
 #include "base/gfx/rect.h"
diff --git a/chrome/views/combo_box.h b/chrome/views/controls/combo_box.h
index 0e896f8..11e2777 100644
--- a/chrome/views/combo_box.h
+++ b/chrome/views/controls/combo_box.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_COMBO_BOX_H__
-#define CHROME_VIEWS_COMBO_BOX_H__
+#ifndef CHROME_VIEWS_CONTROLS_COMBO_BOX_H_
+#define CHROME_VIEWS_CONTROLS_COMBO_BOX_H_
 
-#include "chrome/views/native_control.h"
+#include "chrome/views/controls/native_control.h"
 
 namespace views {
 ////////////////////////////////////////////////////////////////////////////////
@@ -40,10 +40,10 @@ class ComboBox : public NativeControl {
   // Register |listener| for item change events.
   void SetListener(Listener* listener);
 
-  // Overriden from View.
+  // Overridden from View.
   virtual gfx::Size GetPreferredSize();
 
-  // Overriden from NativeControl
+  // Overridden from NativeControl
   virtual HWND CreateNativeControl(HWND parent_container);
   virtual LRESULT OnCommand(UINT code, int id, HWND source);
   virtual LRESULT OnNotify(int w_param, LPNMHDR l_param);
@@ -76,4 +76,4 @@ class ComboBox : public NativeControl {
 
 }  // namespace views
 
-#endif  // CHROME_VIEWS_COMBO_BOX_H__
+#endif  // CHROME_VIEWS_CONTROLS_COMBO_BOX_H_
diff --git a/chrome/views/hwnd_view.cc b/chrome/views/controls/hwnd_view.cc
index 107581d..a376c8b 100644
--- a/chrome/views/hwnd_view.cc
+++ b/chrome/views/controls/hwnd_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/hwnd_view.h"
+#include "chrome/views/controls/hwnd_view.h"
 
 #include "chrome/common/gfx/chrome_canvas.h"
 #include "chrome/common/win_util.h"
 #include "chrome/views/focus/focus_manager.h"
-#include "chrome/views/scroll_view.h"
+#include "chrome/views/controls/scroll_view.h"
 #include "chrome/views/widget/widget.h"
 #include "base/logging.h"
 
diff --git a/chrome/views/hwnd_view.h b/chrome/views/controls/hwnd_view.h
index 3fe9f1f..a13a1f8 100644
--- a/chrome/views/hwnd_view.h
+++ b/chrome/views/controls/hwnd_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_HWND_VIEW_H__
-#define CHROME_VIEWS_HWND_VIEW_H__
+#ifndef CHROME_VIEWS_CONTROLS_HWND_VIEW_H_
+#define CHROME_VIEWS_CONTROLS_HWND_VIEW_H_
 
 #include <string>
 
@@ -97,4 +97,4 @@ class HWNDView : public View {
 
 }  // namespace views
 
-#endif // CHROME_VIEWS_HWND_VIEW_H__
+#endif  // CHROME_VIEWS_CONTROLS_HWND_VIEW_H_
diff --git a/chrome/views/image_view.cc b/chrome/views/controls/image_view.cc
index 4949d45..a3892a9 100644
--- a/chrome/views/image_view.cc
+++ b/chrome/views/controls/image_view.cc
@@ -2,9 +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/controls/image_view.h"
+
 #include "base/logging.h"
 #include "chrome/common/gfx/chrome_canvas.h"
-#include "chrome/views/image_view.h"
 
 namespace views {
 
diff --git a/chrome/views/image_view.h b/chrome/views/controls/image_view.h
index 3db9bb4..66020bf 100644
--- a/chrome/views/image_view.h
+++ b/chrome/views/controls/image_view.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_VIEWS_IMAGE_VIEW_H__
-#define CHROME_VIEWS_IMAGE_VIEW_H__
+#ifndef CHROME_VIEWS_CONTROLS_IMAGE_VIEW_H_
+#define CHROME_VIEWS_CONTROLS_IMAGE_VIEW_H_
 
 #include "chrome/views/view.h"
 #include "SkBitmap.h"
@@ -104,4 +104,4 @@ class ImageView : public View {
 
 }  // namespace views
 
-#endif  // CHROME_VIEWS_IMAGE_VIEW_H__
+#endif  // CHROME_VIEWS_CONTROLS_IMAGE_VIEW_H_
diff --git a/chrome/views/label.cc b/chrome/views/controls/label.cc
index 0489479..779cf2b 100644
--- a/chrome/views/label.cc
+++ b/chrome/views/controls/label.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/label.h"
+#include "chrome/views/controls/label.h"
 
 #include <math.h>
 
diff --git a/chrome/views/label.h b/chrome/views/controls/label.h
index d50b977..ae8f618 100644
--- a/chrome/views/label.h
+++ b/chrome/views/controls/label.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_LABEL_H__
-#define CHROME_VIEWS_LABEL_H__
+#ifndef CHROME_VIEWS_CONTROLS_LABEL_H_
+#define CHROME_VIEWS_CONTROLS_LABEL_H_
 
 #include "chrome/common/gfx/chrome_font.h"
 #include "chrome/views/view.h"
@@ -237,4 +237,4 @@ class Label : public View {
 
 }  // namespace views
 
-#endif  // CHROME_VIEWS_VIEW_H__
+#endif  // CHROME_VIEWS_CONTROLS_LABEL_H_
diff --git a/chrome/views/label_unittest.cc b/chrome/views/controls/label_unittest.cc
index 55154a3..ba00f69 100644
--- a/chrome/views/label_unittest.cc
+++ b/chrome/views/controls/label_unittest.cc
@@ -6,7 +6,7 @@
 #include "chrome/common/gfx/chrome_canvas.h"
 #include "chrome/common/l10n_util.h"
 #include "chrome/views/border.h"
-#include "chrome/views/label.h"
+#include "chrome/views/controls/label.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace views {
diff --git a/chrome/views/link.cc b/chrome/views/controls/link.cc
index 93c1ff1..7969987 100644
--- a/chrome/views/link.cc
+++ b/chrome/views/controls/link.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/link.h"
+#include "chrome/views/controls/link.h"
 
 #include "chrome/common/gfx/chrome_font.h"
 #include "chrome/views/event.h"
diff --git a/chrome/views/link.h b/chrome/views/controls/link.h
index 0e8ef5d..ee40236 100644
--- a/chrome/views/link.h
+++ b/chrome/views/controls/link.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_LINK_H__
-#define CHROME_VIEWS_LINK_H__
+#ifndef CHROME_VIEWS_CONTROLS_LINK_H_
+#define CHROME_VIEWS_CONTROLS_LINK_H_
 
-#include "chrome/views/label.h"
+#include "chrome/views/controls/label.h"
 
 namespace views {
 
@@ -91,4 +91,4 @@ class Link : public Label {
 
 }  // namespace views
 
-#endif  // CHROME_VIEWS_LINK_H__
+#endif  // CHROME_VIEWS_CONTROLS_LINK_H_
diff --git a/chrome/views/chrome_menu.cc b/chrome/views/controls/menu/chrome_menu.cc
index 5ce9dcd..6373cde 100644
--- a/chrome/views/chrome_menu.cc
+++ b/chrome/views/controls/menu/chrome_menu.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/chrome_menu.h"
+#include "chrome/views/controls/menu/chrome_menu.h"
 
 #include <windows.h>
 #include <uxtheme.h>
@@ -14,6 +14,7 @@
 #include "base/task.h"
 #include "base/timer.h"
 #include "base/win_util.h"
+// TODO(beng): (Cleanup) remove this browser dep.
 #include "chrome/browser/drag_utils.h"
 #include "chrome/common/gfx/chrome_canvas.h"
 #include "chrome/common/gfx/color_utils.h"
diff --git a/chrome/views/chrome_menu.h b/chrome/views/controls/menu/chrome_menu.h
index 98ce67b..8e55bc0 100644
--- a/chrome/views/chrome_menu.h
+++ b/chrome/views/controls/menu/chrome_menu.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_CHROME_MENU_H__
-#define CHROME_VIEWS_CHROME_MENU_H__
+#ifndef CHROME_VIEWS_CONTROLS_MENU_CHROME_MENU_H_
+#define CHROME_VIEWS_CONTROLS_MENU_CHROME_MENU_H_
 
 #include <list>
 
@@ -13,7 +13,7 @@
 #include "base/task.h"
 #include "chrome/common/drag_drop_types.h"
 #include "chrome/common/gfx/chrome_font.h"
-#include "chrome/views/controller.h"
+#include "chrome/views/controls/menu/controller.h"
 #include "chrome/views/view.h"
 #include "skia/include/SkBitmap.h"
 
@@ -947,4 +947,4 @@ class MenuController : public MessageLoopForUI::Dispatcher {
 
 }  // namespace views
 
-#endif  // CHROME_VIEWS_CHROME_MENU_H__
+#endif  // CHROME_VIEWS_CONTROLS_MENU_CHROME_MENU_H_
diff --git a/chrome/views/controller.h b/chrome/views/controls/menu/controller.h
index 4736797..af8af2e 100644
--- a/chrome/views/controller.h
+++ b/chrome/views/controls/menu/controller.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_CONTROLLER_H_
-#define CHROME_VIEWS_CONTROLLER_H_
+#ifndef CHROME_VIEWS_CONTROLS_MENU_CONTROLLER_H_
+#define CHROME_VIEWS_CONTROLS_MENU_CONTROLLER_H_
 
 #include <string>
 
@@ -30,4 +30,4 @@ class Controller {
   virtual void ExecuteCommand(int id) = 0;
 };
 
-#endif // CHROME_VIEWS_CONTROLLER_H_
+#endif // CHROME_VIEWS_CONTROLS_MENU_CONTROLLER_H_
diff --git a/chrome/views/menu.cc b/chrome/views/controls/menu/menu.cc
index 46d93b6..9c5370b 100644
--- a/chrome/views/menu.cc
+++ b/chrome/views/controls/menu/menu.cc
@@ -2,13 +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/menu.h"
-
-#include <atlbase.h>
-#include <atlcrack.h>
-#include <atlapp.h>
-#include <atlframe.h>
-#include <atlmisc.h>
+#include "chrome/views/controls/menu/menu.h"
 
 #include "base/gfx/rect.h"
 #include "base/logging.h"
diff --git a/chrome/views/menu.h b/chrome/views/controls/menu/menu.h
index f92c5dc..1f064d5 100644
--- a/chrome/views/menu.h
+++ b/chrome/views/controls/menu/menu.h
@@ -2,15 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_VIEWS_MENU_H_
-#define CHROME_VIEWS_MENU_H_
+#ifndef CHROME_CONTROLS_MENU_VIEWS_MENU_H_
+#define CHROME_CONTROLS_MENU_VIEWS_MENU_H_
 
 #include <windows.h>
 
 #include <vector>
 
 #include "base/basictypes.h"
-#include "chrome/views/controller.h"
+#include "chrome/views/controls/menu/controller.h"
 
 class SkBitmap;
 
@@ -349,4 +349,4 @@ class Menu {
   DISALLOW_COPY_AND_ASSIGN(Menu);
 };
 
-#endif  // CHROME_VIEWS_MENU_H_
+#endif  // CHROME_CONTROLS_MENU_VIEWS_MENU_H_
diff --git a/chrome/views/view_menu_delegate.h b/chrome/views/controls/menu/view_menu_delegate.h
index 397563a..3f8f190 100644
--- a/chrome/views/view_menu_delegate.h
+++ b/chrome/views/controls/menu/view_menu_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_VIEW_MENU_DELEGATE_H__
-#define CHROME_VIEWS_VIEW_MENU_DELEGATE_H__
+#ifndef CHROME_VIEWS_CONTROLS_MENU_VIEW_MENU_DELEGATE_H_
+#define CHROME_VIEWS_CONTROLS_MENU_VIEW_MENU_DELEGATE_H_
 
-#include <windows.h>
+#include "base/gfx/native_widget_types.h"
 
 namespace views {
 
@@ -13,7 +13,7 @@ class View;
 
 ////////////////////////////////////////////////////////////////////////////////
 //
-// MenuDelegate
+// ViewMenuDelegate
 //
 // An interface that allows a component to tell a View about a menu that it
 // has constructed that the view can show (e.g. for MenuButton views, or as a
@@ -24,9 +24,11 @@ class ViewMenuDelegate {
  public:
   // Create and show a menu at the specified position. Source is the view the
   // ViewMenuDelegate was set on.
-  virtual void RunMenu(View* source, const CPoint& pt, HWND hwnd) = 0;
+  virtual void RunMenu(View* source,
+                       const CPoint& pt,
+                       gfx::NativeView hwnd) = 0;
 };
 
 }  // namespace views
 
-#endif  // CHROME_VIEWS_VIEW_MENU_DELEGATE_H__
+#endif  // CHROME_VIEWS_CONTROLS_MENU_VIEW_MENU_DELEGATE_H_
diff --git a/chrome/views/message_box_view.cc b/chrome/views/controls/message_box_view.cc
index a0280364..b1219f6 100644
--- a/chrome/views/message_box_view.cc
+++ b/chrome/views/controls/message_box_view.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/message_box_view.h"
+#include "chrome/views/controls/message_box_view.h"
 
 #include "base/message_loop.h"
 #include "base/string_util.h"
 #include "chrome/browser/views/standard_layout.h"
 #include "chrome/common/l10n_util.h"
-#include "chrome/views/checkbox.h"
+#include "chrome/views/controls/button/checkbox.h"
 #include "chrome/views/window/client_view.h"
 #include "grit/generated_resources.h"
 
diff --git a/chrome/views/message_box_view.h b/chrome/views/controls/message_box_view.h
index 31f61d4..2a8e18f 100644
--- a/chrome/views/message_box_view.h
+++ b/chrome/views/controls/message_box_view.h
@@ -2,16 +2,16 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_VIEWS_MESSAGE_BOX_VIEW_VIEW_H__
-#define CHROME_VIEWS_MESSAGE_BOX_VIEW_VIEW_H__
+#ifndef CHROME_VIEWS_CONTROLS_MESSAGE_BOX_VIEW_VIEW_H_
+#define CHROME_VIEWS_CONTROLS_MESSAGE_BOX_VIEW_VIEW_H_
 
 #include <string>
 
 #include "base/task.h"
-#include "chrome/views/checkbox.h"
-#include "chrome/views/image_view.h"
-#include "chrome/views/label.h"
-#include "chrome/views/text_field.h"
+#include "chrome/views/controls/button/checkbox.h"
+#include "chrome/views/controls/image_view.h"
+#include "chrome/views/controls/label.h"
+#include "chrome/views/controls/text_field.h"
 #include "chrome/views/view.h"
 
 // This class displays the contents of a message box. It is intended for use
@@ -116,4 +116,4 @@ class MessageBoxView : public views::View {
   DISALLOW_EVIL_CONSTRUCTORS(MessageBoxView);
 };
 
-#endif // CHROME_VIEWS_MESSAGE_BOX_VIEW_VIEW_H__
+#endif  // CHROME_VIEWS_CONTROLS_MESSAGE_BOX_VIEW_VIEW_H_
diff --git a/chrome/views/native_control.cc b/chrome/views/controls/native_control.cc
index 0e1e72e..5e07e41 100644
--- a/chrome/views/native_control.cc
+++ b/chrome/views/controls/native_control.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/views/native_control.h"
+#include "chrome/views/controls/native_control.h"
 
 #include <atlbase.h>
 #include <atlapp.h>
@@ -15,8 +15,8 @@
 #include "chrome/common/notification_service.h"
 #include "chrome/views/background.h"
 #include "chrome/views/border.h"
+#include "chrome/views/controls/hwnd_view.h"
 #include "chrome/views/focus/focus_manager.h"
-#include "chrome/views/hwnd_view.h"
 #include "chrome/views/widget/widget.h"
 #include "base/gfx/native_theme.h"
 
diff --git a/chrome/views/native_control.h b/chrome/views/controls/native_control.h
index 7243055..f4dbc35 100644
--- a/chrome/views/native_control.h
+++ b/chrome/views/controls/native_control.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_VIEWS_NATIVE_CONTROL_H__
-#define CHROME_VIEWS_NATIVE_CONTROL_H__
+#ifndef CHROME_VIEWS_CONTROLS_NATIVE_CONTROL_H_
+#define CHROME_VIEWS_CONTROLS_NATIVE_CONTROL_H_
 
 #include <windows.h>
 
@@ -129,4 +129,4 @@ class NativeControl : public View {
 
 }  // namespace views
 
-#endif  // CHROME_VIEWS_NATIVE_CONTROL_H__
+#endif  // CHROME_VIEWS_CONTROLS_NATIVE_CONTROL_H_
diff --git a/chrome/views/scroll_view.cc b/chrome/views/controls/scroll_view.cc
index 1d2a8de..5e28cfe 100644
--- a/chrome/views/scroll_view.cc
+++ b/chrome/views/controls/scroll_view.cc
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/views/scroll_view.h"
+#include "chrome/views/controls/scroll_view.h"
 
 #include "base/logging.h"
 #include "chrome/common/resource_bundle.h"
-#include "chrome/views/native_scroll_bar.h"
+#include "chrome/views/controls/scrollbar/native_scroll_bar.h"
 #include "chrome/views/widget/root_view.h"
 #include "grit/theme_resources.h"
 
diff --git a/chrome/views/scroll_view.h b/chrome/views/controls/scroll_view.h
index ec473f8..fb77fdd 100644
--- a/chrome/views/scroll_view.h
+++ b/chrome/views/controls/scroll_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_SCROLL_VIEW_H__
-#define CHROME_VIEWS_SCROLL_VIEW_H__
+#ifndef CHROME_VIEWS_CONTROLS_SCROLL_VIEW_H_
+#define CHROME_VIEWS_CONTROLS_SCROLL_VIEW_H_
 
-#include "chrome/views/scroll_bar.h"
+#include "chrome/views/controls/scrollbar/scroll_bar.h"
 
 namespace views {
 
@@ -204,4 +204,4 @@ class FixedRowHeightScrollHelper : public VariableRowHeightScrollHelper {
 
 }  // namespace views
 
-#endif // CHROME_VIEWS_SCROLL_VIEW_H__
+#endif  // CHROME_VIEWS_CONTROLS_SCROLL_VIEW_H_
diff --git a/chrome/views/bitmap_scroll_bar.cc b/chrome/views/controls/scrollbar/bitmap_scroll_bar.cc
index f96a9e8..42ba4e7 100644
--- a/chrome/views/bitmap_scroll_bar.cc
+++ b/chrome/views/controls/scrollbar/bitmap_scroll_bar.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/bitmap_scroll_bar.h"
+#include "chrome/views/controls/scrollbar/bitmap_scroll_bar.h"
 
 #include "base/message_loop.h"
 #include "chrome/common/gfx/chrome_canvas.h"
 #include "chrome/common/l10n_util.h"
-#include "chrome/views/menu.h"
-#include "chrome/views/scroll_view.h"
+#include "chrome/views/controls/menu/menu.h"
+#include "chrome/views/controls/scroll_view.h"
 #include "chrome/views/widget/widget.h"
 #include "grit/generated_resources.h"
 #include "skia/include/SkBitmap.h"
diff --git a/chrome/views/bitmap_scroll_bar.h b/chrome/views/controls/scrollbar/bitmap_scroll_bar.h
index 53e9e72..8bb717c 100644
--- a/chrome/views/bitmap_scroll_bar.h
+++ b/chrome/views/controls/scrollbar/bitmap_scroll_bar.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_BITMAP_SCROLL_BAR_H__
-#define CHROME_VIEWS_BITMAP_SCROLL_BAR_H__
+#ifndef CHROME_VIEWS_CONTROLS_SCROLLBAR_BITMAP_SCROLL_BAR_H_
+#define CHROME_VIEWS_CONTROLS_SCROLLBAR_BITMAP_SCROLL_BAR_H_
 
-#include "chrome/views/image_button.h"
-#include "chrome/views/menu.h"
+#include "chrome/views/controls/button/image_button.h"
+#include "chrome/views/controls/menu/menu.h"
+#include "chrome/views/controls/scrollbar/scroll_bar.h"
 #include "chrome/views/repeat_controller.h"
-#include "chrome/views/scroll_bar.h"
 
 namespace views {
 
@@ -189,4 +189,4 @@ class BitmapScrollBar : public ScrollBar,
 
 }  // namespace views
 
-#endif  // #ifndef CHROME_VIEWS_BITMAP_SCROLL_BAR_H__
+#endif  // #ifndef CHROME_VIEWS_CONTROLS_SCROLLBAR_BITMAP_SCROLL_BAR_H_
diff --git a/chrome/views/native_scroll_bar.cc b/chrome/views/controls/scrollbar/native_scroll_bar.cc
index 60ee31c..463bb8e 100644
--- a/chrome/views/native_scroll_bar.cc
+++ b/chrome/views/controls/scrollbar/native_scroll_bar.cc
@@ -2,16 +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/native_scroll_bar.h"
-
-#include <math.h>
-#include <atlbase.h>
-#include <atlapp.h>
-#include <atlcrack.h>
-#include <atlframe.h>
+#include "chrome/views/controls/scrollbar/native_scroll_bar.h"
 
 #include "base/message_loop.h"
-#include "chrome/views/hwnd_view.h"
+#include "chrome/views/controls/hwnd_view.h"
 #include "chrome/views/widget/widget.h"
 
 namespace views {
diff --git a/chrome/views/native_scroll_bar.h b/chrome/views/controls/scrollbar/native_scroll_bar.h
index 711225a..12bab22 100644
--- a/chrome/views/native_scroll_bar.h
+++ b/chrome/views/controls/scrollbar/native_scroll_bar.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_NATIVE_SCROLLBAR_H__
-#define CHROME_VIEWS_NATIVE_SCROLLBAR_H__
+#ifndef CHROME_VIEWS_CONTROLS_SCROLLBAR_NATIVE_SCROLLBAR_H_
+#define CHROME_VIEWS_CONTROLS_SCROLLBAR_NATIVE_SCROLLBAR_H_
 
 #include "build/build_config.h"
 
-#include "chrome/views/scroll_bar.h"
+#include "chrome/views/controls/scrollbar/scroll_bar.h"
 
 namespace views {
 
@@ -64,4 +64,4 @@ class NativeScrollBar : public ScrollBar {
 
 }  // namespace views
 
-#endif
+#endif  // #ifndef CHROME_VIEWS_CONTROLS_SCROLLBAR_NATIVE_SCROLLBAR_H_
diff --git a/chrome/views/scroll_bar.cc b/chrome/views/controls/scrollbar/scroll_bar.cc
index fdcd00f..36f37ab9 100644
--- a/chrome/views/scroll_bar.cc
+++ b/chrome/views/controls/scrollbar/scroll_bar.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/views/scroll_bar.h"
+#include "chrome/views/controls/scrollbar/scroll_bar.h"
 
 namespace views {
 
diff --git a/chrome/views/scroll_bar.h b/chrome/views/controls/scrollbar/scroll_bar.h
index b386eae..b6509f2 100644
--- a/chrome/views/scroll_bar.h
+++ b/chrome/views/controls/scrollbar/scroll_bar.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_VIEWS_SCROLLBAR_H__
-#define CHROME_VIEWS_SCROLLBAR_H__
+#ifndef CHROME_VIEWS_CONTROLS_SCROLLBAR_SCROLLBAR_H_
+#define CHROME_VIEWS_CONTROLS_SCROLLBAR_SCROLLBAR_H_
 
 #include "chrome/views/view.h"
 #include "chrome/views/event.h"
@@ -99,4 +99,4 @@ class ScrollBar : public View {
 
 }  // namespace views
 
-#endif
+#endif  // #ifndef CHROME_VIEWS_CONTROLS_SCROLLBAR_SCROLLBAR_H_
diff --git a/chrome/views/separator.cc b/chrome/views/controls/separator.cc
index dae8e65..0ffc061 100644
--- a/chrome/views/separator.cc
+++ b/chrome/views/controls/separator.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/separator.h"
+#include "chrome/views/controls/separator.h"
 
-#include "chrome/views/hwnd_view.h"
+#include "chrome/views/controls/hwnd_view.h"
 
 namespace views {
 
diff --git a/chrome/views/separator.h b/chrome/views/controls/separator.h
index fe8f26f..0455044 100644
--- a/chrome/views/separator.h
+++ b/chrome/views/controls/separator.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_SEPARATOR_H__
-#define CHROME_VIEWS_SEPARATOR_H__
+#ifndef CHROME_VIEWS_CONTROLS_SEPARATOR_H_
+#define CHROME_VIEWS_CONTROLS_SEPARATOR_H_
 
-#include "chrome/views/native_control.h"
+#include "chrome/views/controls/native_control.h"
 
 namespace views {
 
@@ -31,4 +31,4 @@ class Separator : public NativeControl {
 
 }  // namespace views
 
-#endif  // #define CHROME_VIEWS_SEPARATOR_H__
+#endif  // #define CHROME_VIEWS_CONTROLS_SEPARATOR_H_
diff --git a/chrome/views/single_split_view.cc b/chrome/views/controls/single_split_view.cc
index 845d980..9f87310 100644
--- a/chrome/views/single_split_view.cc
+++ b/chrome/views/controls/single_split_view.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/views/single_split_view.h"
+#include "chrome/views/controls/single_split_view.h"
 
 #include "chrome/common/gfx/chrome_canvas.h"
 #include "chrome/views/background.h"
diff --git a/chrome/views/single_split_view.h b/chrome/views/controls/single_split_view.h
index 53f64a8..3826769 100644
--- a/chrome/views/single_split_view.h
+++ b/chrome/views/controls/single_split_view.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_VIEWS_SINGLE_SPLIT_VIEW_H_
-#define CHROME_VIEWS_SINGLE_SPLIT_VIEW_H_
+#ifndef CHROME_VIEWS_CONTROLS_SINGLE_SPLIT_VIEW_H_
+#define CHROME_VIEWS_CONTROLS_SINGLE_SPLIT_VIEW_H_
 
 #include "chrome/views/view.h"
 
@@ -54,4 +54,4 @@ class SingleSplitView : public views::View {
 
 }  // namespace views
 
-#endif  // CHROME_VIEWS_SINGLE_SPLIT_VIEW_H_
+#endif  // CHROME_VIEWS_CONTROLS_SINGLE_SPLIT_VIEW_H_
diff --git a/chrome/views/tabbed_pane.cc b/chrome/views/controls/tabbed_pane.cc
index e43fd12..99af16f 100644
--- a/chrome/views/tabbed_pane.cc
+++ b/chrome/views/controls/tabbed_pane.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/tabbed_pane.h"
+#include "chrome/views/controls/tabbed_pane.h"
 
 #include <vssym32.h>
 
diff --git a/chrome/views/tabbed_pane.h b/chrome/views/controls/tabbed_pane.h
index 7a47f5cb..8b51ba6 100644
--- a/chrome/views/tabbed_pane.h
+++ b/chrome/views/controls/tabbed_pane.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_TABBED_PANE_H__
-#define CHROME_VIEWS_TABBED_PANE_H__
+#ifndef CHROME_VIEWS_CONTROLS_TABBED_PANE_H_
+#define CHROME_VIEWS_CONTROLS_TABBED_PANE_H_
 
-#include "chrome/views/native_control.h"
+#include "chrome/views/controls/native_control.h"
 
 namespace views {
 
@@ -91,4 +91,4 @@ class TabbedPane : public NativeControl {
 
 }  // namespace views
 
-#endif  // #define CHROME_VIEWS_TABBED_PANE_H__
+#endif  // #define CHROME_VIEWS_CONTROLS_TABBED_PANE_H_
diff --git a/chrome/views/group_table_view.cc b/chrome/views/controls/table/group_table_view.cc
index de9db7c..7d65c32 100644
--- a/chrome/views/group_table_view.cc
+++ b/chrome/views/controls/table/group_table_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/group_table_view.h"
+#include "chrome/views/controls/table/group_table_view.h"
 
 #include "base/message_loop.h"
 #include "base/task.h"
diff --git a/chrome/views/group_table_view.h b/chrome/views/controls/table/group_table_view.h
index e084f95..0edd01a 100644
--- a/chrome/views/group_table_view.h
+++ b/chrome/views/controls/table/group_table_view.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_GROUP_TABLE_VIEW_H_
-#define CHROME_VIEWS_GROUP_TABLE_VIEW_H_
+#ifndef CHROME_VIEWS_CONTROLS_TABLE_GROUP_TABLE_VIEW_H_
+#define CHROME_VIEWS_CONTROLS_TABLE_GROUP_TABLE_VIEW_H_
 
 #include "base/task.h"
-#include "chrome/views/table_view.h"
+#include "chrome/views/controls/table/table_view.h"
 
 // The GroupTableView adds grouping to the TableView class.
 // It allows to have groups of rows that act as a single row from the selection
@@ -79,4 +79,4 @@ class GroupTableView : public TableView {
 
 }  // namespace views
 
-#endif  // CHROME_VIEWS_GROUP_TABLE_VIEW_H_
+#endif  // CHROME_VIEWS_CONTROLS_TABLE_GROUP_TABLE_VIEW_H_
diff --git a/chrome/views/table_view.cc b/chrome/views/controls/table/table_view.cc
index 4bd1526..1a01acc 100644
--- a/chrome/views/table_view.cc
+++ b/chrome/views/controls/table/table_view.cc
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "chrome/views/controls/table/table_view.h"
+
 #include <algorithm>
 #include <windowsx.h>
 
-#include "chrome/views/table_view.h"
-
 #include "base/string_util.h"
 #include "base/win_util.h"
 #include "chrome/common/gfx/chrome_canvas.h"
@@ -14,7 +14,7 @@
 #include "chrome/common/gfx/icon_util.h"
 #include "chrome/common/resource_bundle.h"
 #include "chrome/common/win_util.h"
-#include "chrome/views/hwnd_view.h"
+#include "chrome/views/controls/hwnd_view.h"
 #include "SkBitmap.h"
 #include "SkColorFilter.h"
 #include "skia/ext/skia_utils_win.h"
diff --git a/chrome/views/table_view.h b/chrome/views/controls/table/table_view.h
index c6fb2f7..ec575c7 100644
--- a/chrome/views/table_view.h
+++ b/chrome/views/controls/table/table_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_TABLE_VIEW_H_
-#define CHROME_VIEWS_TABLE_VIEW_H_
+#ifndef CHROME_VIEWS_CONTROLS_TABLE_TABLE_VIEW_H_
+#define CHROME_VIEWS_CONTROLS_TABLE_TABLE_VIEW_H_
 
 #include "build/build_config.h"
 
@@ -20,7 +20,7 @@
 #include "chrome/common/l10n_util.h"
 #if defined(OS_WIN)
 // TODO(port): remove the ifdef when native_control.h is ported.
-#include "chrome/views/native_control.h"
+#include "chrome/views/controls/native_control.h"
 #endif  // defined(OS_WIN)
 #include "skia/include/SkColor.h"
 
@@ -673,4 +673,4 @@ class TableView : public NativeControl,
 
 }  // namespace views
 
-#endif  // CHROME_VIEWS_TABLE_VIEW_H_
+#endif  // CHROME_VIEWS_CONTROLS_TABLE_TABLE_VIEW_H_
diff --git a/chrome/views/table_view_unittest.cc b/chrome/views/controls/table/table_view_unittest.cc
index f94e86d..7248015 100644
--- a/chrome/views/table_view_unittest.cc
+++ b/chrome/views/controls/table/table_view_unittest.cc
@@ -6,7 +6,7 @@
 
 #include "base/message_loop.h"
 #include "base/string_util.h"
-#include "chrome/views/table_view.h"
+#include "chrome/views/controls/table/table_view.h"
 #include "chrome/views/window/window_delegate.h"
 #include "chrome/views/window/window_win.h"
 #include "testing/gtest/include/gtest/gtest.h"
diff --git a/chrome/views/text_field.cc b/chrome/views/controls/text_field.cc
index 82e8692..9d61b43 100644
--- a/chrome/views/text_field.cc
+++ b/chrome/views/controls/text_field.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/text_field.h"
+#include "chrome/views/controls/text_field.h"
 
 #include <atlbase.h>
 #include <atlapp.h>
@@ -22,8 +22,8 @@
 #include "chrome/common/l10n_util_win.h"
 #include "chrome/common/logging_chrome.h"
 #include "chrome/common/win_util.h"
-#include "chrome/views/hwnd_view.h"
-#include "chrome/views/menu.h"
+#include "chrome/views/controls/hwnd_view.h"
+#include "chrome/views/controls/menu/menu.h"
 #include "chrome/views/widget/widget.h"
 #include "grit/generated_resources.h"
 #include "skia/ext/skia_utils_win.h"
diff --git a/chrome/views/text_field.h b/chrome/views/controls/text_field.h
index 9fe0347..35abf3f 100644
--- a/chrome/views/text_field.h
+++ b/chrome/views/controls/text_field.h
@@ -5,8 +5,8 @@
 // These classes define a text field widget that can be used in the views UI
 // toolkit.
 
-#ifndef CHROME_VIEWS_TEXT_FIELD_H_
-#define CHROME_VIEWS_TEXT_FIELD_H_
+#ifndef CHROME_VIEWS_CONTROLS_TEXT_FIELD_H_
+#define CHROME_VIEWS_CONTROLS_TEXT_FIELD_H_
 
 #include <string>
 
@@ -201,4 +201,4 @@ class TextField : public View {
 
 }  // namespace views
 
-#endif  // CHROME_VIEWS_TEXT_FIELD_H_
+#endif  // CHROME_VIEWS_CONTROLS_TEXT_FIELD_H_
diff --git a/chrome/views/throbber.cc b/chrome/views/controls/throbber.cc
index 13a8ab4..8d5a902 100644
--- a/chrome/views/throbber.cc
+++ b/chrome/views/controls/throbber.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/views/throbber.h"
+#include "chrome/views/controls/throbber.h"
 
 #include "base/time.h"
 #include "chrome/common/gfx/chrome_canvas.h"
diff --git a/chrome/views/throbber.h b/chrome/views/controls/throbber.h
index 2edd3ce..b356466 100644
--- a/chrome/views/throbber.h
+++ b/chrome/views/controls/throbber.h
@@ -4,8 +4,8 @@
 
 // Throbbers display an animation, usually used as a status indicator.
 
-#ifndef CHROME_VIEWS_THROBBER_H_
-#define CHROME_VIEWS_THROBBER_H_
+#ifndef CHROME_VIEWS_CONTROLS_THROBBER_H_
+#define CHROME_VIEWS_CONTROLS_THROBBER_H_
 
 #include "base/basictypes.h"
 #include "base/time.h"
@@ -108,4 +108,4 @@ class CheckmarkThrobber : public Throbber {
 
 }  // namespace views
 
-#endif  // CHROME_VIEWS_THROBBER_H_
+#endif  // CHROME_VIEWS_CONTROLS_THROBBER_H_
diff --git a/chrome/views/tree_model.h b/chrome/views/controls/tree/tree_model.h
index 70be773..8c54b75 100644
--- a/chrome/views/tree_model.h
+++ b/chrome/views/controls/tree/tree_model.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_TREE_MODEL_H_
-#define CHROME_VIEWS_TREE_MODEL_H_
+#ifndef CHROME_VIEWS_CONTROLS_TREE_TREE_MODEL_H_
+#define CHROME_VIEWS_CONTROLS_TREE_TREE_MODEL_H_
 
 #include <string>
 
@@ -88,4 +88,4 @@ class TreeModel {
 
 }  // namespace views
 
-#endif  // CHROME_VIEWS_TREE_MODEL_H_
+#endif  // CHROME_VIEWS_CONTROLS_TREE_TREE_MODEL_H_
diff --git a/chrome/views/tree_node_iterator.h b/chrome/views/controls/tree/tree_node_iterator.h
index 57c7b40..fa28b3e 100644
--- a/chrome/views/tree_node_iterator.h
+++ b/chrome/views/controls/tree/tree_node_iterator.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_TREE_NODE_ITERATOR_H_
-#define CHROME_VIEWS_TREE_NODE_ITERATOR_H_
+#ifndef CHROME_VIEWS_CONTROLS_TREE_TREE_NODE_ITERATOR_H_
+#define CHROME_VIEWS_CONTROLS_TREE_TREE_NODE_ITERATOR_H_
 
 #include <stack>
 
@@ -71,4 +71,4 @@ class TreeNodeIterator {
 
 }  // namespace views
 
-#endif  // CHROME_VIEWS_TREE_NODE_ITERATOR_H_
+#endif  // CHROME_VIEWS_CONTROLS_TREE_TREE_NODE_ITERATOR_H_
diff --git a/chrome/views/tree_node_iterator_unittest.cc b/chrome/views/controls/tree/tree_node_iterator_unittest.cc
index 165b5c3..3aec1af 100644
--- a/chrome/views/tree_node_iterator_unittest.cc
+++ b/chrome/views/controls/tree/tree_node_iterator_unittest.cc
@@ -4,8 +4,8 @@
 
 #include "testing/gtest/include/gtest/gtest.h"
 
-#include "chrome/views/tree_node_iterator.h"
-#include "chrome/views/tree_node_model.h"
+#include "chrome/views/controls/tree/tree_node_iterator.h"
+#include "chrome/views/controls/tree/tree_node_model.h"
 
 typedef testing::Test TreeNodeIteratorTest;
 
diff --git a/chrome/views/tree_node_model.h b/chrome/views/controls/tree/tree_node_model.h
index 4ca22b0..884985a 100644
--- a/chrome/views/tree_node_model.h
+++ b/chrome/views/controls/tree/tree_node_model.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_TREE_NODE_MODEL_H__
-#define CHROME_VIEWS_TREE_NODE_MODEL_H__
+#ifndef CHROME_VIEWS_CONTROLS_TREE_TREE_NODE_MODEL_H_
+#define CHROME_VIEWS_CONTROLS_TREE_TREE_NODE_MODEL_H_
 
 #include <algorithm>
 #include <vector>
@@ -11,7 +11,7 @@
 #include "base/basictypes.h"
 #include "base/scoped_ptr.h"
 #include "chrome/common/scoped_vector.h"
-#include "chrome/views/tree_model.h"
+#include "chrome/views/controls/tree/tree_model.h"
 
 namespace views {
 
@@ -279,4 +279,4 @@ class TreeNodeModel : public TreeModel {
 
 }  // namespace views
 
-#endif  // CHROME_VIEWS_TREE_NODE_MODEL_H__
+#endif  // CHROME_VIEWS_CONTROLS_TREE_TREE_NODE_MODEL_H_
diff --git a/chrome/views/tree_view.cc b/chrome/views/controls/tree/tree_view.cc
index 04cac8c..cf4f147 100644
--- a/chrome/views/tree_view.cc
+++ b/chrome/views/controls/tree/tree_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/tree_view.h"
+#include "chrome/views/controls/tree/tree_view.h"
 
 #include <shellapi.h>
 
diff --git a/chrome/views/tree_view.h b/chrome/views/controls/tree/tree_view.h
index 5b86981..ca6f784 100644
--- a/chrome/views/tree_view.h
+++ b/chrome/views/controls/tree/tree_view.h
@@ -2,15 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_VIEWS_TREE_VIEW_H__
-#define CHROME_VIEWS_TREE_VIEW_H__
+#ifndef CHROME_VIEWS_CONTROLS_TREE_TREE_VIEW_H_
+#define CHROME_VIEWS_CONTROLS_TREE_TREE_VIEW_H_
 
 #include <map>
 
 #include "base/basictypes.h"
 #include "base/logging.h"
-#include "chrome/views/native_control.h"
-#include "chrome/views/tree_model.h"
+#include "chrome/views/controls/native_control.h"
+#include "chrome/views/controls/tree/tree_model.h"
 
 namespace views {
 
@@ -302,4 +302,4 @@ class TreeView : public NativeControl, TreeModelObserver {
 
 }  // namespace views
 
-#endif  // CHROME_VIEWS_TREE_VIEW_H__
+#endif  // CHROME_VIEWS_CONTROLS_TREE_TREE_VIEW_H_
diff --git a/chrome/views/decision.cc b/chrome/views/decision.cc
deleted file mode 100644
index cbbea49..0000000
--- a/chrome/views/decision.cc
+++ /dev/null
@@ -1,152 +0,0 @@
-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include <string>
-
-#include "chrome/views/decision.h"
-
-#include "chrome/common/resource_bundle.h"
-#include "chrome/views/label.h"
-#include "chrome/views/grid_layout.h"
-
-using namespace std;
-
-namespace views {
-
-static const int kPaddingEdge = 10;
-static const int kSpacingInfoBottom = 20;
-
-class Option : public View,
-               public NativeButton::Listener {
- public:
-  Option(int command_id,
-         const std::wstring& description,
-         const std::wstring& action,
-         Controller* controller);
-
-  // NativeButton::Listener methods:
-  virtual void ButtonPressed(NativeButton* sender);
-
- private:
-  int command_id_;
-  Controller* controller_;
-};
-
-Decision::Decision(const std::wstring& title,
-                   const std::wstring& details,
-                   Controller* controller)
-    : controller_(controller) {
-  // The main message.
-  title_label_ = new Label(title);
-  title_label_->SetFont(
-      ResourceBundle::GetSharedInstance().GetFont(ResourceBundle::LargeFont));
-  title_label_->SetHorizontalAlignment(Label::ALIGN_LEFT);
-  AddChildView(title_label_);
-
-  // The detailed description.
-  details_label_ = new Label(details);
-  details_label_->SetHorizontalAlignment(Label::ALIGN_LEFT);
-  details_label_->SetMultiLine(true);
-  AddChildView(details_label_);
-}
-
-void Decision::AppendOption(int command_id,
-                            const std::wstring& description,
-                            const std::wstring& action) {
-  Option* option = new Option(command_id, description, action, controller_);
-  options_.push_back(option);
-  AddChildView(option);
-}
-
-void Decision::ViewHierarchyChanged(bool is_add, View *parent, View *child) {
-  if (is_add && child == this) {
-    // Layout when this is added so that the buttons are laid out correctly.
-    Layout();
-  }
-}
-
-void Decision::Layout() {
-  gfx::Rect lb = GetLocalBounds(false);
-
-  // Resize for padding.
-  lb.Inset(kPaddingEdge, kPaddingEdge);
-  int width = lb.width();
-
-  gfx::Point position = lb.origin();
-  gfx::Size size = title_label_->GetPreferredSize();
-  title_label_->SetBounds(position.x(), position.y(), width, size.height());
-  position.set_y(position.y() + size.height() + kSpacingInfoBottom);
-
-  size.set_height(details_label_->GetHeightForWidth(width));
-  details_label_->SetBounds(position.x(), position.y(), width, size.height());
-  position.set_y(position.y() + size.height() + kSpacingInfoBottom);
-
-  for (std::vector<Option*>::const_iterator iter = options_.begin();
-       iter != options_.end(); ++iter) {
-    Option* option = *iter;
-    size = option->GetPreferredSize();
-    option->SetBounds(position.x(), position.y(), width, size.height());
-    option->Layout();
-    position.set_y(position.y() + size.height() + kSpacingInfoBottom);
-  }
-}
-
-gfx::Size Decision::GetPreferredSize() {
-  int width = 0;
-  int height = 0;
-
-  // We need to find the largest width from the title and the options, as the
-  // details label is multi-line and we need to known its width in order to
-  // compute its height.
-  gfx::Size size = title_label_->GetPreferredSize();
-  width = size.width();
-  height = size.height() + kSpacingInfoBottom;
-
-  for (std::vector<Option*>::const_iterator iter = options_.begin();
-       iter != options_.end(); ++iter) {
-    size = (*iter)->GetPreferredSize();
-    if (size.width() > width)
-      width = size.width();
-    height += size.height() + kSpacingInfoBottom;
-  }
-
-  // Now we can compute the details label height.
-  height += details_label_->GetHeightForWidth(width) + kSpacingInfoBottom;
-
-  return gfx::Size(width + 2 * kPaddingEdge, height + 2 * kPaddingEdge);
-}
-
-Option::Option(int command_id,
-               const std::wstring& description,
-               const std::wstring& action,
-               Controller* controller)
-    : command_id_(command_id),
-      controller_(controller) {
-
-  GridLayout* layout = new GridLayout(this);
-  SetLayoutManager(layout);
-
-  ColumnSet* columns = layout->AddColumnSet(0);
-  columns->AddColumn(GridLayout::FILL, GridLayout::CENTER,
-                     1, GridLayout::USE_PREF, 0, 0);
-  columns->AddPaddingColumn(0, 10);
-  columns->AddColumn(GridLayout::TRAILING, GridLayout::CENTER,
-                     0, GridLayout::USE_PREF, 0, 0);
-
-  layout->StartRow(0, 0);
-  Label* label = new Label(description);
-  label->SetHorizontalAlignment(Label::ALIGN_LEFT);
-  layout->AddView(label);
-
-  // A button to perform the action.
-  NativeButton* button = new NativeButton(action);
-  button->SetListener(this);
-  layout->AddView(button);
-}
-
-void Option::ButtonPressed(NativeButton* sender) {
-  controller_->ExecuteCommand(command_id_);
-}
-
-}  // namespace views
diff --git a/chrome/views/decision.h b/chrome/views/decision.h
deleted file mode 100644
index 8eeb9a0..0000000
--- a/chrome/views/decision.h
+++ /dev/null
@@ -1,61 +0,0 @@
-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef CHROME_VIEWS_DECISION_H__
-#define CHROME_VIEWS_DECISION_H__
-
-#include <string>
-
-#include "chrome/views/controller.h"
-#include "chrome/views/native_button.h"
-#include "chrome/views/view.h"
-
-namespace views {
-
-class Label;
-class Option;
-
-// A view that presents a user with a decision.  This view contains a title and
-// a general description.  Users of this class should append at least one option
-// for the user to select.
-class Decision : public View {
- public:
-  // The |title| appears in large font at the top of the view.  The |details|
-  // appear in a multi-line text area below the title.  The |controller| is
-  // notified when the user selects an option.
-  Decision(const std::wstring& title,
-           const std::wstring& details,
-           Controller* controller);
-
-  // Append an option to the view.  The |description| explains this option to
-  // the user.  The |action| text is the text the user will click on to select
-  // this option.  If the user selects this option, the controller will be asked
-  // to ExecuteCommand |command_id|.
-  void AppendOption(int command_id,
-                    const std::wstring& description,
-                    const std::wstring& action);
-
-  // Overridden from View for custom layout.
-  virtual void Layout();
-  virtual gfx::Size GetPreferredSize();
-
- protected:
-  // Override to call Layout().
-  virtual void ViewHierarchyChanged(bool is_add, View *parent, View *child);
-
- private:
-  // Our controller.
-  Controller* controller_;
-
-  // The views.
-  Label* title_label_;
-  Label* details_label_;
-
-  // The option views that have been added.
-  std::vector<Option*> options_;
-};
-
-}  // namespace views
-
-#endif // CHROME_VIEWS_DECISION_H__
diff --git a/chrome/views/event.h b/chrome/views/event.h
index 29d76a8..899d9fa 100644
--- a/chrome/views/event.h
+++ b/chrome/views/event.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_EVENT_H__
-#define CHROME_VIEWS_EVENT_H__
+#ifndef CHROME_VIEWS_EVENT_H_
+#define CHROME_VIEWS_EVENT_H_
 
 #include "base/basictypes.h"
 #include "base/gfx/point.h"
@@ -306,4 +306,4 @@ class DropTargetEvent : public LocatedEvent {
 
 }  // namespace views
 
-#endif  // CHROME_VIEWS_EVENT_H__
+#endif  // CHROME_VIEWS_EVENT_H_
diff --git a/chrome/views/focus_manager_unittest.cc b/chrome/views/focus/focus_manager_unittest.cc
index e41920c..5a78f32 100644
--- a/chrome/views/focus_manager_unittest.cc
+++ b/chrome/views/focus/focus_manager_unittest.cc
@@ -12,14 +12,14 @@
 #include "chrome/common/resource_bundle.h"
 #include "chrome/views/background.h"
 #include "chrome/views/border.h"
-#include "chrome/views/checkbox.h"
-#include "chrome/views/label.h"
-#include "chrome/views/link.h"
-#include "chrome/views/native_button.h"
-#include "chrome/views/radio_button.h"
-#include "chrome/views/scroll_view.h"
-#include "chrome/views/tabbed_pane.h"
-#include "chrome/views/text_field.h"
+#include "chrome/views/controls/button/checkbox.h"
+#include "chrome/views/controls/button/native_button.h"
+#include "chrome/views/controls/button/radio_button.h"
+#include "chrome/views/controls/label.h"
+#include "chrome/views/controls/link.h"
+#include "chrome/views/controls/scroll_view.h"
+#include "chrome/views/controls/tabbed_pane.h"
+#include "chrome/views/controls/text_field.h"
 #include "chrome/views/widget/accelerator_handler.h"
 #include "chrome/views/widget/root_view.h"
 #include "chrome/views/widget/widget_win.h"
diff --git a/chrome/views/grid_layout.h b/chrome/views/grid_layout.h
index 706f380..9cddd95 100644
--- a/chrome/views/grid_layout.h
+++ b/chrome/views/grid_layout.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_GRID_LAYOUT_H__
-#define CHROME_VIEWS_GRID_LAYOUT_H__
+#ifndef CHROME_VIEWS_GRID_LAYOUT_H_
+#define CHROME_VIEWS_GRID_LAYOUT_H_
 
 #include <string>
 #include <vector>
@@ -351,4 +351,4 @@ class ColumnSet {
 
 }  // namespace views
 
-#endif // CHROME_VIEWS_GRID_LAYOUT_H__
+#endif // CHROME_VIEWS_GRID_LAYOUT_H_
diff --git a/chrome/views/layout_manager.h b/chrome/views/layout_manager.h
index b354642..5b8eaf1 100644
--- a/chrome/views/layout_manager.h
+++ b/chrome/views/layout_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_LAYOUT_MANAGER_H__
-#define CHROME_VIEWS_LAYOUT_MANAGER_H__
+#ifndef CHROME_VIEWS_LAYOUT_MANAGER_H_
+#define CHROME_VIEWS_LAYOUT_MANAGER_H_
 
 #include "chrome/views/view.h"
 
@@ -57,4 +57,4 @@ class LayoutManager {
 
 }  // namespace views
 
-#endif // CHROME_VIEWS_LAYOUT_MANAGER_H__
+#endif // CHROME_VIEWS_LAYOUT_MANAGER_H_
diff --git a/chrome/views/painter.h b/chrome/views/painter.h
index 55ec664..37edd64 100644
--- a/chrome/views/painter.h
+++ b/chrome/views/painter.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_PAINTER_H__
-#define CHROME_VIEWS_PAINTER_H__
+#ifndef CHROME_VIEWS_PAINTER_H_
+#define CHROME_VIEWS_PAINTER_H_
 
 #include <vector>
 
@@ -117,4 +117,4 @@ class HorizontalPainter : public Painter {
 
 }  // namespace views
 
-#endif  // CHROME_VIEWS_PAINTER_H__
+#endif  // CHROME_VIEWS_PAINTER_H_
diff --git a/chrome/views/view_unittest.cc b/chrome/views/view_unittest.cc
index dcb49f7..36895fc 100644
--- a/chrome/views/view_unittest.cc
+++ b/chrome/views/view_unittest.cc
@@ -7,7 +7,7 @@
 #include "chrome/common/gfx/path.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/views/background.h"
-#include "chrome/views/checkbox.h"
+#include "chrome/views/controls/button/checkbox.h"
 #include "chrome/views/event.h"
 #include "chrome/views/view.h"
 #include "chrome/views/widget/root_view.h"
diff --git a/chrome/views/views.vcproj b/chrome/views/views.vcproj
index ea740d4..308cbfa 100644
--- a/chrome/views/views.vcproj
+++ b/chrome/views/views.vcproj
@@ -439,6 +439,290 @@
 				>
 			</File>
 		</Filter>
+		<Filter
+			Name="controls"
+			>
+			<File
+				RelativePath=".\controls\combo_box.cc"
+				>
+			</File>
+			<File
+				RelativePath=".\controls\combo_box.h"
+				>
+			</File>
+			<File
+				RelativePath=".\controls\hwnd_view.cc"
+				>
+			</File>
+			<File
+				RelativePath=".\controls\hwnd_view.h"
+				>
+			</File>
+			<File
+				RelativePath=".\controls\image_view.cc"
+				>
+			</File>
+			<File
+				RelativePath=".\controls\image_view.h"
+				>
+			</File>
+			<File
+				RelativePath=".\controls\label.cc"
+				>
+			</File>
+			<File
+				RelativePath=".\controls\label.h"
+				>
+			</File>
+			<File
+				RelativePath=".\controls\link.cc"
+				>
+			</File>
+			<File
+				RelativePath=".\controls\link.h"
+				>
+			</File>
+			<File
+				RelativePath=".\controls\message_box_view.cc"
+				>
+			</File>
+			<File
+				RelativePath=".\controls\message_box_view.h"
+				>
+			</File>
+			<File
+				RelativePath=".\controls\native_control.cc"
+				>
+			</File>
+			<File
+				RelativePath=".\controls\native_control.h"
+				>
+			</File>
+			<File
+				RelativePath=".\controls\scroll_view.cc"
+				>
+			</File>
+			<File
+				RelativePath=".\controls\scroll_view.h"
+				>
+			</File>
+			<File
+				RelativePath=".\controls\separator.cc"
+				>
+			</File>
+			<File
+				RelativePath=".\controls\separator.h"
+				>
+			</File>
+			<File
+				RelativePath=".\controls\single_split_view.cc"
+				>
+			</File>
+			<File
+				RelativePath=".\controls\single_split_view.h"
+				>
+			</File>
+			<File
+				RelativePath=".\controls\tabbed_pane.cc"
+				>
+			</File>
+			<File
+				RelativePath=".\controls\tabbed_pane.h"
+				>
+			</File>
+			<File
+				RelativePath=".\controls\text_field.cc"
+				>
+			</File>
+			<File
+				RelativePath=".\controls\text_field.h"
+				>
+			</File>
+			<File
+				RelativePath=".\controls\throbber.cc"
+				>
+			</File>
+			<File
+				RelativePath=".\controls\throbber.h"
+				>
+			</File>
+			<Filter
+				Name="button"
+				>
+				<File
+					RelativePath=".\controls\button\button.cc"
+					>
+				</File>
+				<File
+					RelativePath=".\controls\button\button.h"
+					>
+				</File>
+				<File
+					RelativePath=".\controls\button\button_dropdown.cc"
+					>
+				</File>
+				<File
+					RelativePath=".\controls\button\button_dropdown.h"
+					>
+				</File>
+				<File
+					RelativePath=".\controls\button\checkbox.cc"
+					>
+				</File>
+				<File
+					RelativePath=".\controls\button\checkbox.h"
+					>
+				</File>
+				<File
+					RelativePath=".\controls\button\custom_button.cc"
+					>
+				</File>
+				<File
+					RelativePath=".\controls\button\custom_button.h"
+					>
+				</File>
+				<File
+					RelativePath=".\controls\button\image_button.cc"
+					>
+				</File>
+				<File
+					RelativePath=".\controls\button\image_button.h"
+					>
+				</File>
+				<File
+					RelativePath=".\controls\button\menu_button.cc"
+					>
+				</File>
+				<File
+					RelativePath=".\controls\button\menu_button.h"
+					>
+				</File>
+				<File
+					RelativePath=".\controls\button\native_button.cc"
+					>
+				</File>
+				<File
+					RelativePath=".\controls\button\native_button.h"
+					>
+				</File>
+				<File
+					RelativePath=".\controls\button\radio_button.cc"
+					>
+				</File>
+				<File
+					RelativePath=".\controls\button\radio_button.h"
+					>
+				</File>
+				<File
+					RelativePath=".\controls\button\text_button.cc"
+					>
+				</File>
+				<File
+					RelativePath=".\controls\button\text_button.h"
+					>
+				</File>
+			</Filter>
+			<Filter
+				Name="scrollbar"
+				>
+				<File
+					RelativePath=".\controls\scrollbar\bitmap_scroll_bar.cc"
+					>
+				</File>
+				<File
+					RelativePath=".\controls\scrollbar\bitmap_scroll_bar.h"
+					>
+				</File>
+				<File
+					RelativePath=".\controls\scrollbar\native_scroll_bar.cc"
+					>
+				</File>
+				<File
+					RelativePath=".\controls\scrollbar\native_scroll_bar.h"
+					>
+				</File>
+				<File
+					RelativePath=".\controls\scrollbar\scroll_bar.cc"
+					>
+				</File>
+				<File
+					RelativePath=".\controls\scrollbar\scroll_bar.h"
+					>
+				</File>
+			</Filter>
+			<Filter
+				Name="tree"
+				>
+				<File
+					RelativePath=".\controls\tree\tree_model.h"
+					>
+				</File>
+				<File
+					RelativePath=".\controls\tree\tree_node_iterator.h"
+					>
+				</File>
+				<File
+					RelativePath=".\controls\tree\tree_node_model.h"
+					>
+				</File>
+				<File
+					RelativePath=".\controls\tree\tree_view.cc"
+					>
+				</File>
+				<File
+					RelativePath=".\controls\tree\tree_view.h"
+					>
+				</File>
+			</Filter>
+			<Filter
+				Name="table"
+				>
+				<File
+					RelativePath=".\controls\table\group_table_view.cc"
+					>
+				</File>
+				<File
+					RelativePath=".\controls\table\group_table_view.h"
+					>
+				</File>
+				<File
+					RelativePath=".\controls\table\table_view.cc"
+					>
+				</File>
+				<File
+					RelativePath=".\controls\table\table_view.h"
+					>
+				</File>
+			</Filter>
+			<Filter
+				Name="menu"
+				>
+				<File
+					RelativePath=".\controls\menu\chrome_menu.cc"
+					>
+				</File>
+				<File
+					RelativePath=".\controls\menu\chrome_menu.h"
+					>
+				</File>
+				<File
+					RelativePath=".\controls\menu\controller.h"
+					>
+				</File>
+				<File
+					RelativePath=".\controls\menu\menu.cc"
+					>
+				</File>
+				<File
+					RelativePath=".\controls\menu\menu.h"
+					>
+				</File>
+				<File
+					RelativePath=".\controls\menu\view_menu_delegate.h"
+					>
+				</File>
+			</Filter>
+		</Filter>
 		<File
 			RelativePath=".\accelerator.cc"
 			>
@@ -448,10 +732,6 @@
 			>
 		</File>
 		<File
-			RelativePath=".\app_modal_dialog_delegate.h"
-			>
-		</File>
-		<File
 			RelativePath=".\background.cc"
 			>
 		</File>
@@ -460,14 +740,6 @@
 			>
 		</File>
 		<File
-			RelativePath=".\bitmap_scroll_bar.cc"
-			>
-		</File>
-		<File
-			RelativePath=".\bitmap_scroll_bar.h"
-			>
-		</File>
-		<File
 			RelativePath=".\border.cc"
 			>
 		</File>
@@ -476,66 +748,6 @@
 			>
 		</File>
 		<File
-			RelativePath=".\button.cc"
-			>
-		</File>
-		<File
-			RelativePath=".\button.h"
-			>
-		</File>
-		<File
-			RelativePath=".\button_dropdown.cc"
-			>
-		</File>
-		<File
-			RelativePath=".\button_dropdown.h"
-			>
-		</File>
-		<File
-			RelativePath=".\checkbox.cc"
-			>
-		</File>
-		<File
-			RelativePath=".\checkbox.h"
-			>
-		</File>
-		<File
-			RelativePath=".\chrome_menu.cc"
-			>
-		</File>
-		<File
-			RelativePath=".\chrome_menu.h"
-			>
-		</File>
-		<File
-			RelativePath=".\combo_box.cc"
-			>
-		</File>
-		<File
-			RelativePath=".\combo_box.h"
-			>
-		</File>
-		<File
-			RelativePath=".\controller.h"
-			>
-		</File>
-		<File
-			RelativePath=".\custom_button.cc"
-			>
-		</File>
-		<File
-			RelativePath=".\custom_button.h"
-			>
-		</File>
-		<File
-			RelativePath=".\decision.cc"
-			>
-		</File>
-		<File
-			RelativePath=".\decision.h"
-			>
-		</File>
-		<File
 			RelativePath=".\event.cc"
 			>
 		</File>
@@ -552,50 +764,6 @@
 			>
 		</File>
 		<File
-			RelativePath=".\group_table_view.cc"
-			>
-		</File>
-		<File
-			RelativePath=".\group_table_view.h"
-			>
-		</File>
-		<File
-			RelativePath=".\hwnd_notification_source.h"
-			>
-		</File>
-		<File
-			RelativePath=".\hwnd_view.cc"
-			>
-		</File>
-		<File
-			RelativePath=".\hwnd_view.h"
-			>
-		</File>
-		<File
-			RelativePath=".\image_button.cc"
-			>
-		</File>
-		<File
-			RelativePath=".\image_button.h"
-			>
-		</File>
-		<File
-			RelativePath=".\image_view.cc"
-			>
-		</File>
-		<File
-			RelativePath=".\image_view.h"
-			>
-		</File>
-		<File
-			RelativePath=".\label.cc"
-			>
-		</File>
-		<File
-			RelativePath=".\label.h"
-			>
-		</File>
-		<File
 			RelativePath=".\layout_manager.cc"
 			>
 		</File>
@@ -604,62 +772,6 @@
 			>
 		</File>
 		<File
-			RelativePath=".\link.cc"
-			>
-		</File>
-		<File
-			RelativePath=".\link.h"
-			>
-		</File>
-		<File
-			RelativePath=".\menu.cc"
-			>
-		</File>
-		<File
-			RelativePath=".\menu.h"
-			>
-		</File>
-		<File
-			RelativePath=".\menu_button.cc"
-			>
-		</File>
-		<File
-			RelativePath=".\menu_button.h"
-			>
-		</File>
-		<File
-			RelativePath=".\message_box_view.cc"
-			>
-		</File>
-		<File
-			RelativePath=".\message_box_view.h"
-			>
-		</File>
-		<File
-			RelativePath=".\native_button.cc"
-			>
-		</File>
-		<File
-			RelativePath=".\native_button.h"
-			>
-		</File>
-		<File
-			RelativePath=".\native_control.cc"
-			>
-		</File>
-		<File
-			RelativePath=".\native_control.h"
-			>
-		</File>
-		<File
-			RelativePath=".\native_scroll_bar.cc"
-			>
-		</File>
-		<File
-			RelativePath=".\native_scroll_bar.h"
-			>
-		</File>
-		<File
 			RelativePath=".\painter.cc"
 			>
 		</File>
@@ -684,14 +796,6 @@
 			>
 		</File>
 		<File
-			RelativePath=".\radio_button.cc"
-			>
-		</File>
-		<File
-			RelativePath=".\radio_button.h"
-			>
-		</File>
-		<File
 			RelativePath=".\repeat_controller.cc"
 			>
 		</File>
@@ -700,98 +804,6 @@
 			>
 		</File>
 		<File
-			RelativePath=".\scroll_bar.cc"
-			>
-		</File>
-		<File
-			RelativePath=".\scroll_bar.h"
-			>
-		</File>
-		<File
-			RelativePath=".\scroll_view.cc"
-			>
-		</File>
-		<File
-			RelativePath=".\scroll_view.h"
-			>
-		</File>
-		<File
-			RelativePath=".\separator.cc"
-			>
-		</File>
-		<File
-			RelativePath=".\separator.h"
-			>
-		</File>
-		<File
-			RelativePath=".\single_split_view.cc"
-			>
-		</File>
-		<File
-			RelativePath=".\single_split_view.h"
-			>
-		</File>
-		<File
-			RelativePath=".\tabbed_pane.cc"
-			>
-		</File>
-		<File
-			RelativePath=".\tabbed_pane.h"
-			>
-		</File>
-		<File
-			RelativePath=".\table_view.cc"
-			>
-		</File>
-		<File
-			RelativePath=".\table_view.h"
-			>
-		</File>
-		<File
-			RelativePath=".\text_button.cc"
-			>
-		</File>
-		<File
-			RelativePath=".\text_button.h"
-			>
-		</File>
-		<File
-			RelativePath=".\text_field.cc"
-			>
-		</File>
-		<File
-			RelativePath=".\text_field.h"
-			>
-		</File>
-		<File
-			RelativePath=".\throbber.cc"
-			>
-		</File>
-		<File
-			RelativePath=".\throbber.h"
-			>
-		</File>
-		<File
-			RelativePath=".\tree_model.h"
-			>
-		</File>
-		<File
-			RelativePath=".\tree_node_iterator.h"
-			>
-		</File>
-		<File
-			RelativePath=".\tree_node_model.h"
-			>
-		</File>
-		<File
-			RelativePath=".\tree_view.cc"
-			>
-		</File>
-		<File
-			RelativePath=".\tree_view.h"
-			>
-		</File>
-		<File
 			RelativePath=".\view.cc"
 			>
 		</File>
@@ -808,10 +820,6 @@
 			>
 		</File>
 		<File
-			RelativePath=".\view_menu_delegate.h"
-			>
-		</File>
-		<File
 			RelativePath=".\view_win.cc"
 			>
 		</File>
diff --git a/chrome/views/window/custom_frame_view.h b/chrome/views/window/custom_frame_view.h
index 9b06c3f..6e39d3d 100644
--- a/chrome/views/window/custom_frame_view.h
+++ b/chrome/views/window/custom_frame_view.h
@@ -5,7 +5,7 @@
 #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/controls/button/image_button.h"
 #include "chrome/views/window/non_client_view.h"
 #include "chrome/views/window/window.h"
 #include "chrome/views/window/window_resources.h"
diff --git a/chrome/views/window/dialog_client_view.h b/chrome/views/window/dialog_client_view.h
index ed6ca00..5f1417c 100644
--- a/chrome/views/window/dialog_client_view.h
+++ b/chrome/views/window/dialog_client_view.h
@@ -7,7 +7,7 @@
 
 #include "chrome/common/gfx/chrome_font.h"
 #include "chrome/views/focus/focus_manager.h"
-#include "chrome/views/native_button.h"
+#include "chrome/views/controls/button/native_button.h"
 #include "chrome/views/window/client_view.h"
 
 namespace views {
author	ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>	2009-03-17 04:56:55 +0000
committer	ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>	2009-03-17 04:56:55 +0000
commit	6f3290938a0f8a839ce75df6359d36145ba3b6af (patch)
tree	338c21aafe3f28f94a3d7134cf96ad4a13f63459
parent	0520d327302fe86f633191d68d56925fd64719fc (diff)
download	chromium_src-6f3290938a0f8a839ce75df6359d36145ba3b6af.zip chromium_src-6f3290938a0f8a839ce75df6359d36145ba3b6af.tar.gz chromium_src-6f3290938a0f8a839ce75df6359d36145ba3b6af.tar.bz2