Move src/chrome/views to src/views. RS=darin http://crbug.com/11387

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

155 files changed, 475 insertions, 475 deletions

diff --git a/chrome/browser/views/about_chrome_view.cc b/chrome/browser/views/about_chrome_view.cc
index 0e9b385..faa8744 100644
--- a/chrome/browser/views/about_chrome_view.cc
+++ b/chrome/browser/views/about_chrome_view.cc
@@ -20,13 +20,13 @@
 #include "chrome/browser/views/standard_layout.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/installer/util/install_util.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"
 #include "grit/locale_settings.h"
 #include "grit/theme_resources.h"
+#include "views/controls/text_field.h"
+#include "views/controls/throbber.h"
+#include "views/window/window.h"
 #include "webkit/glue/webkit_glue.h"
 
 namespace {
diff --git a/chrome/browser/views/about_chrome_view.h b/chrome/browser/views/about_chrome_view.h
index d4cc3fd..7d33641 100644
--- a/chrome/browser/views/about_chrome_view.h
+++ b/chrome/browser/views/about_chrome_view.h
@@ -6,11 +6,11 @@
 #define CHROME_BROWSER_VIEWS_ABOUT_CHROME_VIEW_H_
 
 #include "chrome/browser/google_update.h"
-#include "chrome/views/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"
+#include "views/controls/image_view.h"
+#include "views/controls/label.h"
+#include "views/controls/link.h"
+#include "views/view.h"
+#include "views/window/dialog_delegate.h"
 
 namespace views {
 class TextField;
diff --git a/chrome/browser/views/about_ipc_dialog.cc b/chrome/browser/views/about_ipc_dialog.cc
index 9304c64..9d11334 100644
--- a/chrome/browser/views/about_ipc_dialog.cc
+++ b/chrome/browser/views/about_ipc_dialog.cc
@@ -25,15 +25,15 @@
 #include "chrome/common/devtools_messages.h"
 #include "chrome/common/plugin_messages.h"
 #include "chrome/common/render_messages.h"
-#include "chrome/views/grid_layout.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"
 #include "net/url_request/url_request.h"
 #include "net/url_request/url_request_job.h"
 #include "net/url_request/url_request_job_tracker.h"
+#include "views/grid_layout.h"
+#include "views/controls/button/text_button.h"
+#include "views/controls/hwnd_view.h"
+#include "views/widget/root_view.h"
+#include "views/widget/widget.h"
+#include "views/window/window.h"
 
 namespace {
 
diff --git a/chrome/browser/views/about_ipc_dialog.h b/chrome/browser/views/about_ipc_dialog.h
index 92cc284..db9d39a 100644
--- a/chrome/browser/views/about_ipc_dialog.h
+++ b/chrome/browser/views/about_ipc_dialog.h
@@ -7,9 +7,9 @@
 
 #include "base/singleton.h"
 #include "chrome/common/ipc_logging.h"
-#include "chrome/views/controls/button/button.h"
-#include "chrome/views/controls/table/table_view.h"
-#include "chrome/views/window/dialog_delegate.h"
+#include "views/controls/button/button.h"
+#include "views/controls/table/table_view.h"
+#include "views/window/dialog_delegate.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 90d59a5..aced9e3 100644
--- a/chrome/browser/views/about_network_dialog.cc
+++ b/chrome/browser/views/about_network_dialog.cc
@@ -8,13 +8,13 @@
 #include "base/thread.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/views/standard_layout.h"
-#include "chrome/views/grid_layout.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"
 #include "net/url_request/url_request_job_tracker.h"
+#include "views/grid_layout.h"
+#include "views/controls/button/text_button.h"
+#include "views/controls/text_field.h"
+#include "views/window/window.h"
 
 namespace {
 
diff --git a/chrome/browser/views/about_network_dialog.h b/chrome/browser/views/about_network_dialog.h
index b10cf04..d49da4e 100644
--- a/chrome/browser/views/about_network_dialog.h
+++ b/chrome/browser/views/about_network_dialog.h
@@ -6,8 +6,8 @@
 #define CHROME_BROWSER_VIEWS_ABOUT_NETWORK_DIALOG_H_
 
 #include "base/singleton.h"
-#include "chrome/views/controls/button/button.h"
-#include "chrome/views/window/dialog_delegate.h"
+#include "views/controls/button/button.h"
+#include "views/window/dialog_delegate.h"
 
 namespace views {
 class TextButton;
diff --git a/chrome/browser/views/autocomplete/autocomplete_popup_contents_view.cc b/chrome/browser/views/autocomplete/autocomplete_popup_contents_view.cc
index 51f59e3..a6c9366 100644
--- a/chrome/browser/views/autocomplete/autocomplete_popup_contents_view.cc
+++ b/chrome/browser/views/autocomplete/autocomplete_popup_contents_view.cc
@@ -16,11 +16,11 @@
 #include "chrome/browser/views/autocomplete/autocomplete_popup_win.h"
 #include "chrome/common/gfx/color_utils.h"
 #include "chrome/common/win_util.h"
-#include "chrome/views/widget/widget.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "skia/include/SkShader.h"
 #include "third_party/icu38/public/common/unicode/ubidi.h"
+#include "views/widget/widget.h"
 
 // Colors for various components of the view.
 static const SkColor kBackgroundColor =
diff --git a/chrome/browser/views/autocomplete/autocomplete_popup_contents_view.h b/chrome/browser/views/autocomplete/autocomplete_popup_contents_view.h
index 4fd599d..1f4b04a 100644
--- a/chrome/browser/views/autocomplete/autocomplete_popup_contents_view.h
+++ b/chrome/browser/views/autocomplete/autocomplete_popup_contents_view.h
@@ -9,7 +9,7 @@
 #include "chrome/browser/autocomplete/autocomplete.h"
 #include "chrome/browser/autocomplete/autocomplete_popup_model.h"
 #include "chrome/browser/autocomplete/autocomplete_popup_view.h"
-#include "chrome/views/view.h"
+#include "views/view.h"
 #include "webkit/glue/window_open_disposition.h"
 
 class AutocompleteEditModel;
diff --git a/chrome/browser/views/autocomplete/autocomplete_popup_win.h b/chrome/browser/views/autocomplete/autocomplete_popup_win.h
index 91d8d88..d77ba7b 100644
--- a/chrome/browser/views/autocomplete/autocomplete_popup_win.h
+++ b/chrome/browser/views/autocomplete/autocomplete_popup_win.h
@@ -5,7 +5,7 @@
 #ifndef CHROME_BROWSER_VIEWS_AUTOCOMPLETE_AUTOCOMPLETE_POPUP_WIN_H_
 #define CHROME_BROWSER_VIEWS_AUTOCOMPLETE_AUTOCOMPLETE_POPUP_WIN_H_
 
-#include "chrome/views/widget/widget_win.h"
+#include "views/widget/widget_win.h"
 
 class AutocompleteEditViewWin;
 class AutocompletePopupContentsView;
diff --git a/chrome/browser/views/blocked_popup_container.cc b/chrome/browser/views/blocked_popup_container.cc
index 82b9590..abb0f35 100644
--- a/chrome/browser/views/blocked_popup_container.cc
+++ b/chrome/browser/views/blocked_popup_container.cc
@@ -22,11 +22,11 @@
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/pref_names.h"
-#include "chrome/views/background.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"
+#include "views/background.h"
+#include "views/controls/button/image_button.h"
+#include "views/controls/button/menu_button.h"
 
 namespace {
 // Menu item ID for the "Notify me when a popup is blocked" checkbox. (All
@@ -316,7 +316,7 @@ void BlockedPopupContainer::OnPopupOpenedFromWhitelistedHost(
 void BlockedPopupContainer::LaunchPopupIndex(int index) {
   if (static_cast<size_t>(index) >= blocked_popups_.size())
     return;
-  
+
   BlockedPopups::iterator i(blocked_popups_.begin() + index);
   TabContents* contents = i->tab_contents;
   gfx::Rect bounds(i->bounds);
diff --git a/chrome/browser/views/blocked_popup_container.h b/chrome/browser/views/blocked_popup_container.h
index 80112e5..acd0e13 100644
--- a/chrome/browser/views/blocked_popup_container.h
+++ b/chrome/browser/views/blocked_popup_container.h
@@ -18,10 +18,10 @@
 #include "chrome/browser/tab_contents/constrained_window.h"
 #include "chrome/browser/tab_contents/tab_contents_delegate.h"
 #include "chrome/common/pref_member.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"
+#include "views/controls/button/button.h"
+#include "views/controls/menu/menu.h"
+#include "views/view.h"
+#include "views/widget/widget_win.h"
 
 class BlockedPopupContainer;
 class Profile;
@@ -268,7 +268,7 @@ class BlockedPopupContainer : public ConstrainedWindow,
   // iterator into |popup_hosts_|.  Returns popup_hosts_.end() if |index| is
   // invalid.
   PopupHosts::const_iterator ConvertHostIndexToIterator(int index) const;
-  
+
   // If the popup at |i| is the last one associated with its host, removes the
   // host from the host list.
   void EraseHostIfNeeded(BlockedPopups::iterator i);
diff --git a/chrome/browser/views/bookmark_bar_view.cc b/chrome/browser/views/bookmark_bar_view.cc
index e377397..d54e5ff 100644
--- a/chrome/browser/views/bookmark_bar_view.cc
+++ b/chrome/browser/views/bookmark_bar_view.cc
@@ -33,15 +33,15 @@
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
 #include "chrome/common/win_util.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"
-#include "chrome/views/window/window.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "skia/ext/skia_utils.h"
+#include "views/controls/button/menu_button.h"
+#include "views/controls/menu/chrome_menu.h"
+#include "views/view_constants.h"
+#include "views/widget/tooltip_manager.h"
+#include "views/widget/widget.h"
+#include "views/window/window.h"
 
 using views::CustomButton;
 using views::DropTargetEvent;
diff --git a/chrome/browser/views/bookmark_bar_view.h b/chrome/browser/views/bookmark_bar_view.h
index a6c7ca8..f9d3ee0 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_menu_controller_win.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/extensions/extensions_service.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 "views/controls/button/menu_button.h"
+#include "views/controls/label.h"
+#include "views/controls/menu/menu.h"
+#include "views/controls/menu/view_menu_delegate.h"
+#include "views/view.h"
 #include "skia/include/corecg/SkRect.h"
 
 class Browser;
diff --git a/chrome/browser/views/bookmark_bar_view_test.cc b/chrome/browser/views/bookmark_bar_view_test.cc
index 3fe05c1..73eb686 100644
--- a/chrome/browser/views/bookmark_bar_view_test.cc
+++ b/chrome/browser/views/bookmark_bar_view_test.cc
@@ -13,9 +13,9 @@
 #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/controls/button/text_button.h"
-#include "chrome/views/controls/menu/chrome_menu.h"
-#include "chrome/views/window/window.h"
+#include "views/controls/button/text_button.h"
+#include "views/controls/menu/chrome_menu.h"
+#include "views/window/window.h"
 
 namespace {
 
diff --git a/chrome/browser/views/bookmark_bubble_view.cc b/chrome/browser/views/bookmark_bubble_view.cc
index d731fac..abae95f 100644
--- a/chrome/browser/views/bookmark_bubble_view.cc
+++ b/chrome/browser/views/bookmark_bubble_view.cc
@@ -16,10 +16,10 @@
 #include "chrome/browser/views/info_bubble.h"
 #include "chrome/browser/views/standard_layout.h"
 #include "chrome/common/notification_service.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"
+#include "views/controls/button/native_button.h"
+#include "views/controls/text_field.h"
 
 using views::ComboBox;
 using views::ColumnSet;
diff --git a/chrome/browser/views/bookmark_bubble_view.h b/chrome/browser/views/bookmark_bubble_view.h
index f94039a..76b3a27 100644
--- a/chrome/browser/views/bookmark_bubble_view.h
+++ b/chrome/browser/views/bookmark_bubble_view.h
@@ -7,11 +7,11 @@
 
 #include "base/gfx/rect.h"
 #include "chrome/browser/views/info_bubble.h"
-#include "chrome/views/controls/button/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"
+#include "views/controls/button/button.h"
+#include "views/controls/combo_box.h"
+#include "views/controls/link.h"
+#include "views/view.h"
 
 class Profile;
 
diff --git a/chrome/browser/views/bookmark_editor_view.cc b/chrome/browser/views/bookmark_editor_view.cc
index 347ba5d..40472cb 100644
--- a/chrome/browser/views/bookmark_editor_view.cc
+++ b/chrome/browser/views/bookmark_editor_view.cc
@@ -13,17 +13,17 @@
 #include "chrome/browser/profile.h"
 #include "chrome/browser/net/url_fixer_upper.h"
 #include "chrome/browser/views/standard_layout.h"
-#include "chrome/views/background.h"
-#include "chrome/views/focus/focus_manager.h"
-#include "chrome/views/grid_layout.h"
-#include "chrome/views/controls/button/native_button.h"
-#include "chrome/views/controls/label.h"
-#include "chrome/views/widget/widget.h"
-#include "chrome/views/window/window.h"
 #include "googleurl/src/gurl.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
+#include "views/background.h"
+#include "views/focus/focus_manager.h"
+#include "views/grid_layout.h"
+#include "views/controls/button/native_button.h"
+#include "views/controls/label.h"
+#include "views/widget/widget.h"
+#include "views/window/window.h"
 
 using views::Button;
 using views::ColumnSet;
diff --git a/chrome/browser/views/bookmark_editor_view.h b/chrome/browser/views/bookmark_editor_view.h
index 8414544..e7cba63 100644
--- a/chrome/browser/views/bookmark_editor_view.h
+++ b/chrome/browser/views/bookmark_editor_view.h
@@ -9,12 +9,12 @@
 
 #include "chrome/browser/bookmarks/bookmark_editor.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
-#include "chrome/views/controls/button/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"
+#include "views/controls/button/button.h"
+#include "views/controls/menu/menu.h"
+#include "views/controls/text_field.h"
+#include "views/controls/tree/tree_node_model.h"
+#include "views/controls/tree/tree_view.h"
+#include "views/window/dialog_delegate.h"
 
 namespace views {
 class NativeButton;
diff --git a/chrome/browser/views/bookmark_folder_tree_view.cc b/chrome/browser/views/bookmark_folder_tree_view.cc
index 7986d8f..e092670 100644
--- a/chrome/browser/views/bookmark_folder_tree_view.cc
+++ b/chrome/browser/views/bookmark_folder_tree_view.cc
@@ -11,8 +11,8 @@
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/bookmarks/bookmark_folder_tree_model.h"
 #include "chrome/browser/profile.h"
-#include "chrome/views/view_constants.h"
 #include "grit/generated_resources.h"
+#include "views/view_constants.h"
 
 void BookmarkFolderTreeView::DropInfo::Scrolled() {
   view_->UpdateDropInfo();
diff --git a/chrome/browser/views/bookmark_folder_tree_view.h b/chrome/browser/views/bookmark_folder_tree_view.h
index cfae928..2a47b1b 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/controls/tree/tree_view.h"
+#include "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 4be9ec3..ec28029 100644
--- a/chrome/browser/views/bookmark_manager_view.cc
+++ b/chrome/browser/views/bookmark_manager_view.cc
@@ -26,15 +26,15 @@
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
 #include "chrome/common/win_util.h"
-#include "chrome/views/grid_layout.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"
 #include "grit/locale_settings.h"
 #include "skia/ext/skia_utils.h"
+#include "views/grid_layout.h"
+#include "views/controls/button/menu_button.h"
+#include "views/controls/label.h"
+#include "views/controls/single_split_view.h"
+#include "views/widget/widget.h"
+#include "views/window/window.h"
 
 
 // If non-null, there is an open editor and this is the window it is contained
diff --git a/chrome/browser/views/bookmark_manager_view.h b/chrome/browser/views/bookmark_manager_view.h
index 9f986aa..a624281 100644
--- a/chrome/browser/views/bookmark_manager_view.h
+++ b/chrome/browser/views/bookmark_manager_view.h
@@ -10,12 +10,12 @@
 #include "chrome/browser/bookmarks/bookmark_context_menu.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/shell_dialogs.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/window/window_delegate.h"
+#include "views/controls/menu/view_menu_delegate.h"
+#include "views/controls/table/table_view.h"
+#include "views/controls/text_field.h"
+#include "views/controls/tree/tree_view.h"
+#include "views/view.h"
+#include "views/window/window_delegate.h"
 #include "webkit/glue/window_open_disposition.h"
 
 class BookmarkFolderTreeModel;
diff --git a/chrome/browser/views/bookmark_menu_button.cc b/chrome/browser/views/bookmark_menu_button.cc
index e92e5bb..0074e61 100644
--- a/chrome/browser/views/bookmark_menu_button.cc
+++ b/chrome/browser/views/bookmark_menu_button.cc
@@ -11,8 +11,8 @@
 #include "chrome/browser/browser.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/view_ids.h"
-#include "chrome/views/widget/widget.h"
 #include "grit/theme_resources.h"
+#include "views/widget/widget.h"
 
 BookmarkMenuButton::BookmarkMenuButton(Browser* browser)
     : views::MenuButton(NULL, std::wstring(), NULL, false),
diff --git a/chrome/browser/views/bookmark_menu_button.h b/chrome/browser/views/bookmark_menu_button.h
index ed6dc5b..0ebb59f 100644
--- a/chrome/browser/views/bookmark_menu_button.h
+++ b/chrome/browser/views/bookmark_menu_button.h
@@ -8,8 +8,8 @@
 #include "base/timer.h"
 #include "chrome/browser/bookmarks/bookmark_drag_data.h"
 #include "chrome/browser/bookmarks/bookmark_menu_controller_win.h"
-#include "chrome/views/controls/button/menu_button.h"
-#include "chrome/views/controls/menu/view_menu_delegate.h"
+#include "views/controls/button/menu_button.h"
+#include "views/controls/menu/view_menu_delegate.h"
 
 class BookmarkModel;
 class Browser;
diff --git a/chrome/browser/views/bookmark_table_view.cc b/chrome/browser/views/bookmark_table_view.cc
index 12d1d9f..c1b4023 100644
--- a/chrome/browser/views/bookmark_table_view.cc
+++ b/chrome/browser/views/bookmark_table_view.cc
@@ -16,8 +16,8 @@
 #include "chrome/browser/profile.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
-#include "chrome/views/view_constants.h"
 #include "grit/generated_resources.h"
+#include "views/view_constants.h"
 
 namespace {
 
diff --git a/chrome/browser/views/bookmark_table_view.h b/chrome/browser/views/bookmark_table_view.h
index ab9b865..cde2bd0 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/controls/menu/menu.h"
-#include "chrome/views/controls/table/table_view.h"
+#include "views/controls/menu/menu.h"
+#include "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 c339eba..7bebdc5 100644
--- a/chrome/browser/views/bug_report_view.cc
+++ b/chrome/browser/views/bug_report_view.cc
@@ -18,16 +18,16 @@
 #include "chrome/browser/views/standard_layout.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
-#include "chrome/views/controls/button/checkbox.h"
-#include "chrome/views/controls/label.h"
-#include "chrome/views/grid_layout.h"
-#include "chrome/views/window/client_view.h"
-#include "chrome/views/window/window.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
 #include "net/base/escape.h"
 #include "unicode/locid.h"
+#include "views/controls/button/checkbox.h"
+#include "views/controls/label.h"
+#include "views/grid_layout.h"
+#include "views/window/client_view.h"
+#include "views/window/window.h"
 
 using views::ColumnSet;
 using views::GridLayout;
diff --git a/chrome/browser/views/bug_report_view.h b/chrome/browser/views/bug_report_view.h
index d17e569..0688a1dc 100644
--- a/chrome/browser/views/bug_report_view.h
+++ b/chrome/browser/views/bug_report_view.h
@@ -6,11 +6,11 @@
 #define CHROME_BROWSER_VIEWS_BUG_REPORT_VIEW_H_
 
 #include "chrome/browser/net/url_fetcher.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"
+#include "views/controls/combo_box.h"
+#include "views/controls/text_field.h"
+#include "views/view.h"
+#include "views/window/dialog_delegate.h"
 
 namespace views {
 class Checkbox;
diff --git a/chrome/browser/views/clear_browsing_data.cc b/chrome/browser/views/clear_browsing_data.cc
index 1d9070f..6502cd4 100644
--- a/chrome/browser/views/clear_browsing_data.cc
+++ b/chrome/browser/views/clear_browsing_data.cc
@@ -8,16 +8,16 @@
 #include "chrome/browser/profile.h"
 #include "chrome/browser/search_engines/template_url_model.h"
 #include "chrome/browser/views/standard_layout.h"
-#include "chrome/views/background.h"
-#include "chrome/views/controls/button/checkbox.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"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
 #include "net/url_request/url_request_context.h"
+#include "views/background.h"
+#include "views/controls/button/checkbox.h"
+#include "views/controls/label.h"
+#include "views/controls/throbber.h"
+#include "views/window/window.h"
 
 using base::Time;
 using base::TimeDelta;
diff --git a/chrome/browser/views/clear_browsing_data.h b/chrome/browser/views/clear_browsing_data.h
index de4ea31..f51979e 100644
--- a/chrome/browser/views/clear_browsing_data.h
+++ b/chrome/browser/views/clear_browsing_data.h
@@ -6,11 +6,11 @@
 #define CHROME_BROWSER_VIEWS_CLEAR_BROWSING_DATA_H__
 
 #include "chrome/browser/browsing_data_remover.h"
-#include "chrome/views/controls/button/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"
+#include "views/controls/button/button.h"
+#include "views/controls/combo_box.h"
+#include "views/controls/label.h"
+#include "views/view.h"
+#include "views/window/dialog_delegate.h"
 
 namespace views {
 class Checkbox;
diff --git a/chrome/browser/views/constrained_window_impl.cc b/chrome/browser/views/constrained_window_impl.cc
index 11ab3b5..142a983 100644
--- a/chrome/browser/views/constrained_window_impl.cc
+++ b/chrome/browser/views/constrained_window_impl.cc
@@ -25,16 +25,16 @@
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
 #include "chrome/common/win_util.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/window/client_view.h"
-#include "chrome/views/window/non_client_view.h"
-#include "chrome/views/window/window_resources.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "net/base/net_util.h"
+#include "views/controls/button/image_button.h"
+#include "views/controls/hwnd_view.h"
+#include "views/focus/focus_manager.h"
+#include "views/window/client_view.h"
+#include "views/window/non_client_view.h"
+#include "views/window/window_resources.h"
 
 using base::TimeDelta;
 
diff --git a/chrome/browser/views/constrained_window_impl.h b/chrome/browser/views/constrained_window_impl.h
index a4ff2bd..bb29031 100644
--- a/chrome/browser/views/constrained_window_impl.h
+++ b/chrome/browser/views/constrained_window_impl.h
@@ -8,7 +8,7 @@
 #include "base/gfx/rect.h"
 #include "chrome/browser/tab_contents/constrained_window.h"
 #include "chrome/browser/tab_contents/tab_contents_delegate.h"
-#include "chrome/views/window/window_win.h"
+#include "views/window/window_win.h"
 
 class ConstrainedTabContentsWindowDelegate;
 class ConstrainedWindowAnimation;
diff --git a/chrome/browser/views/constrained_window_impl_interactive_uitest.cc b/chrome/browser/views/constrained_window_impl_interactive_uitest.cc
index 7990d21..3faf68a 100644
--- a/chrome/browser/views/constrained_window_impl_interactive_uitest.cc
+++ b/chrome/browser/views/constrained_window_impl_interactive_uitest.cc
@@ -14,9 +14,9 @@
 #include "chrome/test/automation/tab_proxy.h"
 #include "chrome/test/automation/window_proxy.h"
 #include "chrome/test/ui/ui_test.h"
-#include "chrome/views/event.h"
 #include "grit/generated_resources.h"
 #include "net/base/net_util.h"
+#include "views/event.h"
 
 class InteractiveConstrainedWindowTest : public UITest {
  protected:
diff --git a/chrome/browser/views/dom_view.h b/chrome/browser/views/dom_view.h
index cf60430..da26bc4 100644
--- a/chrome/browser/views/dom_view.h
+++ b/chrome/browser/views/dom_view.h
@@ -9,8 +9,8 @@
 #define CHROME_BROWSER_VIEWS_DOM_VIEW_H_
 
 #include "base/scoped_ptr.h"
-#include "chrome/views/controls/hwnd_view.h"
 #include "googleurl/src/gurl.h"
+#include "views/controls/hwnd_view.h"
 
 class Profile;
 class SiteInstance;
diff --git a/chrome/browser/views/download_item_view.cc b/chrome/browser/views/download_item_view.cc
index 17a6108..4f1d349 100644
--- a/chrome/browser/views/download_item_view.cc
+++ b/chrome/browser/views/download_item_view.cc
@@ -17,12 +17,12 @@
 #include "chrome/browser/views/download_shelf_view.h"
 #include "chrome/common/gfx/text_elider.h"
 #include "chrome/common/win_util.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"
 #include "grit/theme_resources.h"
+#include "views/controls/button/native_button.h"
+#include "views/controls/menu/menu.h"
+#include "views/widget/root_view.h"
+#include "views/widget/widget.h"
 
 using base::TimeDelta;
 
diff --git a/chrome/browser/views/download_item_view.h b/chrome/browser/views/download_item_view.h
index c5df73d..264d98d 100644
--- a/chrome/browser/views/download_item_view.h
+++ b/chrome/browser/views/download_item_view.h
@@ -27,9 +27,9 @@
 #include "chrome/browser/cancelable_request.h"
 #include "chrome/browser/download/download_manager.h"
 #include "chrome/browser/icon_manager.h"
-#include "chrome/views/event.h"
-#include "chrome/views/controls/button/button.h"
-#include "chrome/views/view.h"
+#include "views/event.h"
+#include "views/controls/button/button.h"
+#include "views/view.h"
 
 namespace views {
 class Label;
diff --git a/chrome/browser/views/download_shelf_view.cc b/chrome/browser/views/download_shelf_view.cc
index 9b97983..e2fd9f6 100644
--- a/chrome/browser/views/download_shelf_view.cc
+++ b/chrome/browser/views/download_shelf_view.cc
@@ -15,11 +15,11 @@
 #include "chrome/browser/tab_contents/navigation_entry.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/views/download_item_view.h"
-#include "chrome/views/background.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"
+#include "views/background.h"
+#include "views/controls/button/image_button.h"
+#include "views/controls/image_view.h"
 
 // Max number of download views we'll contain. Any time a view is added and
 // we already have this many download views, one is removed.
diff --git a/chrome/browser/views/download_shelf_view.h b/chrome/browser/views/download_shelf_view.h
index 5de3d34..325439f 100644
--- a/chrome/browser/views/download_shelf_view.h
+++ b/chrome/browser/views/download_shelf_view.h
@@ -7,8 +7,8 @@
 
 #include "app/slide_animation.h"
 #include "chrome/browser/download/download_shelf.h"
-#include "chrome/views/controls/button/button.h"
-#include "chrome/views/controls/link.h"
+#include "views/controls/button/button.h"
+#include "views/controls/link.h"
 
 namespace views {
 class ImageButton;
diff --git a/chrome/browser/views/download_started_animation.cc b/chrome/browser/views/download_started_animation.cc
index b6ec708..3fddcd4 100644
--- a/chrome/browser/views/download_started_animation.cc
+++ b/chrome/browser/views/download_started_animation.cc
@@ -7,8 +7,8 @@
 #include "app/resource_bundle.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/common/notification_service.h"
-#include "chrome/views/widget/widget_win.h"
 #include "grit/theme_resources.h"
+#include "views/widget/widget_win.h"
 
 // How long to spend moving downwards and fading out after waiting.
 static const int kMoveTimeMs = 600;
diff --git a/chrome/browser/views/download_started_animation.h b/chrome/browser/views/download_started_animation.h
index 162560d..ec84244 100644
--- a/chrome/browser/views/download_started_animation.h
+++ b/chrome/browser/views/download_started_animation.h
@@ -8,7 +8,7 @@
 #include "app/animation.h"
 #include "base/gfx/rect.h"
 #include "chrome/common/notification_registrar.h"
-#include "chrome/views/controls/image_view.h"
+#include "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 c481d69..c18e94f 100644
--- a/chrome/browser/views/edit_keyword_controller.cc
+++ b/chrome/browser/views/edit_keyword_controller.cc
@@ -14,14 +14,14 @@
 #include "chrome/browser/search_engines/template_url_model.h"
 #include "chrome/browser/views/keyword_editor_view.h"
 #include "chrome/browser/views/standard_layout.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/window/window.h"
 #include "googleurl/src/gurl.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
+#include "views/controls/label.h"
+#include "views/controls/image_view.h"
+#include "views/controls/table/table_view.h"
+#include "views/grid_layout.h"
+#include "views/window/window.h"
 
 using views::GridLayout;
 using views::ImageView;
diff --git a/chrome/browser/views/edit_keyword_controller.h b/chrome/browser/views/edit_keyword_controller.h
index e9a8f36..36e9370 100644
--- a/chrome/browser/views/edit_keyword_controller.h
+++ b/chrome/browser/views/edit_keyword_controller.h
@@ -10,10 +10,10 @@
 #ifndef CHROME_BROWSER_VIEWS_EDIT_KEYWORD_CONTROLLER_H_
 #define CHROME_BROWSER_VIEWS_EDIT_KEYWORD_CONTROLLER_H_
 
-#include <Windows.h>
+#include <windows.h>
 
-#include "chrome/views/controls/text_field.h"
-#include "chrome/views/window/dialog_delegate.h"
+#include "views/controls/text_field.h"
+#include "views/window/dialog_delegate.h"
 
 namespace views {
 class Label;
diff --git a/chrome/browser/views/event_utils.cc b/chrome/browser/views/event_utils.cc
index 989deab..06b9f0d 100644
--- a/chrome/browser/views/event_utils.cc
+++ b/chrome/browser/views/event_utils.cc
@@ -4,7 +4,7 @@
 
 #include "chrome/browser/views/event_utils.h"
 
-#include "chrome/views/event.h"
+#include "views/event.h"
 
 using views::Event;
 
diff --git a/chrome/browser/views/external_protocol_dialog.cc b/chrome/browser/views/external_protocol_dialog.cc
index 2d60738..2feb0d7 100644
--- a/chrome/browser/views/external_protocol_dialog.cc
+++ b/chrome/browser/views/external_protocol_dialog.cc
@@ -14,10 +14,10 @@
 #include "chrome/browser/external_protocol_handler.h"
 #include "chrome/browser/tab_contents/tab_util.h"
 #include "chrome/browser/tab_contents/tab_contents.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"
+#include "views/controls/message_box_view.h"
+#include "views/window/window.h"
 
 namespace {
 
diff --git a/chrome/browser/views/external_protocol_dialog.h b/chrome/browser/views/external_protocol_dialog.h
index 548c54e..d74df51 100644
--- a/chrome/browser/views/external_protocol_dialog.h
+++ b/chrome/browser/views/external_protocol_dialog.h
@@ -6,8 +6,8 @@
 #define CHROME_BROWSER_EXTERNAL_PROTOCOL_DIALOG_H__
 
 #include "base/time.h"
-#include "chrome/views/window/dialog_delegate.h"
 #include "googleurl/src/gurl.h"
+#include "views/window/dialog_delegate.h"
 
 class MessageBoxView;
 class TabContents;
diff --git a/chrome/browser/views/find_bar_view.cc b/chrome/browser/views/find_bar_view.cc
index 1ca1c22..246857f 100644
--- a/chrome/browser/views/find_bar_view.cc
+++ b/chrome/browser/views/find_bar_view.cc
@@ -14,12 +14,12 @@
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/views/find_bar_win.h"
 #include "chrome/browser/view_ids.h"
-#include "chrome/views/background.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"
+#include "views/background.h"
+#include "views/controls/button/image_button.h"
+#include "views/controls/label.h"
 
 // The amount of whitespace to have before the find button.
 static const int kWhiteSpaceAfterMatchCountLabel = 3;
diff --git a/chrome/browser/views/find_bar_view.h b/chrome/browser/views/find_bar_view.h
index 970c21b..9987118 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/controls/button/button.h"
-#include "chrome/views/controls/text_field.h"
+#include "views/controls/button/button.h"
+#include "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 7ada890..0a56f61 100644
--- a/chrome/browser/views/find_bar_win.cc
+++ b/chrome/browser/views/find_bar_win.cc
@@ -14,11 +14,11 @@
 #include "chrome/browser/views/frame/browser_view.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/tab_contents/tab_contents_view.h"
-#include "chrome/views/focus/external_focus_tracker.h"
-#include "chrome/views/focus/view_storage.h"
-#include "chrome/views/controls/scrollbar/native_scroll_bar.h"
-#include "chrome/views/widget/root_view.h"
-#include "chrome/views/widget/widget_win.h"
+#include "views/focus/external_focus_tracker.h"
+#include "views/focus/view_storage.h"
+#include "views/controls/scrollbar/native_scroll_bar.h"
+#include "views/widget/root_view.h"
+#include "views/widget/widget_win.h"
 
 // The minimum space between the FindInPage window and the search result.
 static const int kMinFindWndDistanceFromSelection = 5;
diff --git a/chrome/browser/views/find_bar_win.h b/chrome/browser/views/find_bar_win.h
index 1073e76..182f65e 100644
--- a/chrome/browser/views/find_bar_win.h
+++ b/chrome/browser/views/find_bar_win.h
@@ -9,7 +9,7 @@
 #include "base/gfx/rect.h"
 #include "chrome/browser/find_bar.h"
 #include "chrome/browser/renderer_host/render_view_host_delegate.h"
-#include "chrome/views/widget/widget_win.h"
+#include "views/widget/widget_win.h"
 
 class BrowserView;
 class FindBarController;
diff --git a/chrome/browser/views/find_bar_win_interactive_uitest.cc b/chrome/browser/views/find_bar_win_interactive_uitest.cc
index ddc0f17..21d2db0 100644
--- a/chrome/browser/views/find_bar_win_interactive_uitest.cc
+++ b/chrome/browser/views/find_bar_win_interactive_uitest.cc
@@ -4,12 +4,12 @@
 
 
 #include "chrome/browser/view_ids.h"
-#include "chrome/views/view.h"
 #include "chrome/test/automation/browser_proxy.h"
 #include "chrome/test/automation/window_proxy.h"
 #include "chrome/test/automation/tab_proxy.h"
 #include "chrome/test/ui/ui_test.h"
 #include "net/url_request/url_request_unittest.h"
+#include "views/view.h"
 
 namespace {
 
diff --git a/chrome/browser/views/first_run_bubble.cc b/chrome/browser/views/first_run_bubble.cc
index e487b5f..61bcdb2 100644
--- a/chrome/browser/views/first_run_bubble.cc
+++ b/chrome/browser/views/first_run_bubble.cc
@@ -14,14 +14,14 @@
 #include "chrome/browser/profile.h"
 #include "chrome/browser/search_engines/template_url_model.h"
 #include "chrome/browser/views/standard_layout.h"
-#include "chrome/views/event.h"
-#include "chrome/views/controls/button/native_button.h"
-#include "chrome/views/controls/label.h"
-#include "chrome/views/focus/focus_manager.h"
-#include "chrome/views/window/window.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
+#include "views/event.h"
+#include "views/controls/button/native_button.h"
+#include "views/controls/label.h"
+#include "views/focus/focus_manager.h"
+#include "views/window/window.h"
 
 namespace {
 
diff --git a/chrome/browser/views/first_run_customize_view.cc b/chrome/browser/views/first_run_customize_view.cc
index 190a89a..1ac1eb7 100644
--- a/chrome/browser/views/first_run_customize_view.cc
+++ b/chrome/browser/views/first_run_customize_view.cc
@@ -10,16 +10,16 @@
 #include "chrome/browser/first_run.h"
 #include "chrome/browser/metrics/user_metrics.h"
 #include "chrome/browser/views/standard_layout.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"
 #include "grit/locale_settings.h"
 #include "grit/theme_resources.h"
+#include "views/controls/button/checkbox.h"
+#include "views/controls/combo_box.h"
+#include "views/controls/image_view.h"
+#include "views/controls/label.h"
+#include "views/controls/throbber.h"
+#include "views/window/window.h"
 
 FirstRunCustomizeView::FirstRunCustomizeView(Profile* profile,
                                              ImporterHost* importer_host,
diff --git a/chrome/browser/views/first_run_customize_view.h b/chrome/browser/views/first_run_customize_view.h
index b394254..d7e12b576 100644
--- a/chrome/browser/views/first_run_customize_view.h
+++ b/chrome/browser/views/first_run_customize_view.h
@@ -6,10 +6,10 @@
 #define CHROME_BROWSER_VIEWS_FIRST_RUN_CUSTOMIZE_VIEW_H_
 
 #include "chrome/browser/views/first_run_view_base.h"
-#include "chrome/views/controls/button/button.h"
-#include "chrome/views/controls/combo_box.h"
-#include "chrome/views/view.h"
-#include "chrome/views/window/dialog_delegate.h"
+#include "views/controls/button/button.h"
+#include "views/controls/combo_box.h"
+#include "views/view.h"
+#include "views/window/dialog_delegate.h"
 
 namespace views {
 class Checkbox;
diff --git a/chrome/browser/views/first_run_view.cc b/chrome/browser/views/first_run_view.cc
index e5e14a5..866b114 100644
--- a/chrome/browser/views/first_run_view.cc
+++ b/chrome/browser/views/first_run_view.cc
@@ -11,16 +11,16 @@
 #include "chrome/browser/metrics/user_metrics.h"
 #include "chrome/browser/views/first_run_customize_view.h"
 #include "chrome/browser/views/standard_layout.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"
 #include "grit/locale_settings.h"
 #include "grit/theme_resources.h"
+#include "views/controls/button/checkbox.h"
+#include "views/controls/image_view.h"
+#include "views/controls/label.h"
+#include "views/controls/throbber.h"
+#include "views/controls/separator.h"
+#include "views/window/window.h"
 
 namespace {
 
diff --git a/chrome/browser/views/first_run_view.h b/chrome/browser/views/first_run_view.h
index 267756b..54f8515 100644
--- a/chrome/browser/views/first_run_view.h
+++ b/chrome/browser/views/first_run_view.h
@@ -7,9 +7,9 @@
 
 #include "chrome/browser/views/first_run_view_base.h"
 #include "chrome/browser/views/first_run_customize_view.h"
-#include "chrome/views/controls/link.h"
-#include "chrome/views/view.h"
-#include "chrome/views/window/dialog_delegate.h"
+#include "views/controls/link.h"
+#include "views/view.h"
+#include "views/window/dialog_delegate.h"
 
 namespace views {
 class Label;
diff --git a/chrome/browser/views/first_run_view_base.cc b/chrome/browser/views/first_run_view_base.cc
index cba6080..5a3788a 100644
--- a/chrome/browser/views/first_run_view_base.cc
+++ b/chrome/browser/views/first_run_view_base.cc
@@ -18,17 +18,17 @@
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
-#include "chrome/views/background.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"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
+#include "views/background.h"
+#include "views/controls/button/checkbox.h"
+#include "views/controls/image_view.h"
+#include "views/controls/label.h"
+#include "views/controls/throbber.h"
+#include "views/controls/separator.h"
+#include "views/window/client_view.h"
+#include "views/window/window.h"
 
 FirstRunViewBase::FirstRunViewBase(Profile* profile)
     : preferred_width_(0),
diff --git a/chrome/browser/views/first_run_view_base.h b/chrome/browser/views/first_run_view_base.h
index 365f6dd..2e19947 100644
--- a/chrome/browser/views/first_run_view_base.h
+++ b/chrome/browser/views/first_run_view_base.h
@@ -6,8 +6,8 @@
 #define CHROME_BROWSER_VIEWS_FIRST_RUN_VIEW_BASE_H_
 
 #include "chrome/browser/importer/importer.h"
-#include "chrome/views/view.h"
-#include "chrome/views/window/dialog_delegate.h"
+#include "views/view.h"
+#include "views/window/dialog_delegate.h"
 
 namespace views {
 class Checkbox;
diff --git a/chrome/browser/views/frame/browser_frame.cc b/chrome/browser/views/frame/browser_frame.cc
index f8e0ed3..60187d8 100644
--- a/chrome/browser/views/frame/browser_frame.cc
+++ b/chrome/browser/views/frame/browser_frame.cc
@@ -14,8 +14,8 @@
 #include "chrome/browser/views/frame/glass_browser_frame_view.h"
 #include "chrome/browser/views/frame/opaque_browser_frame_view.h"
 #include "chrome/common/win_util.h"
-#include "chrome/views/window/window_delegate.h"
 #include "grit/theme_resources.h"
+#include "views/window/window_delegate.h"
 
 // static
 static const int kClientEdgeThickness = 3;
diff --git a/chrome/browser/views/frame/browser_frame.h b/chrome/browser/views/frame/browser_frame.h
index f90451a..140f25e 100644
--- a/chrome/browser/views/frame/browser_frame.h
+++ b/chrome/browser/views/frame/browser_frame.h
@@ -5,7 +5,7 @@
 #ifndef CHROME_BROWSER_VIEWS_FRAME_BROWSER_FRAME_
 #define CHROME_BROWSER_VIEWS_FRAME_BROWSER_FRAME_
 
-#include "chrome/views/window/window_win.h"
+#include "views/window/window_win.h"
 
 class AeroGlassNonClientView;
 class BrowserView;
diff --git a/chrome/browser/views/frame/browser_root_view.h b/chrome/browser/views/frame/browser_root_view.h
index 9753a17..a0460793 100644
--- a/chrome/browser/views/frame/browser_root_view.h
+++ b/chrome/browser/views/frame/browser_root_view.h
@@ -5,7 +5,7 @@
 #ifndef CHROME_BROWSER_VIEWS_FRAME_BROWSER_ROOT_VIEW_H
 #define CHROME_BROWSER_VIEWS_FRAME_BROWSER_ROOT_VIEW_H
 
-#include "chrome/views/widget/root_view.h"
+#include "views/widget/root_view.h"
 
 class OSExchangeData;
 class TabStrip;
diff --git a/chrome/browser/views/frame/browser_view.cc b/chrome/browser/views/frame/browser_view.cc
index 694c109..90c6d3a 100644
--- a/chrome/browser/views/frame/browser_view.cc
+++ b/chrome/browser/views/frame/browser_view.cc
@@ -55,16 +55,16 @@
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
 #include "chrome/common/win_util.h"
-#include "chrome/views/controls/scrollbar/native_scroll_bar.h"
-#include "chrome/views/fill_layout.h"
-#include "chrome/views/view.h"
-#include "chrome/views/widget/root_view.h"
-#include "chrome/views/window/non_client_view.h"
-#include "chrome/views/window/window_win.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "grit/webkit_resources.h"
+#include "views/controls/scrollbar/native_scroll_bar.h"
+#include "views/fill_layout.h"
+#include "views/view.h"
+#include "views/widget/root_view.h"
+#include "views/window/non_client_view.h"
+#include "views/window/window_win.h"
 
 
 using base::TimeDelta;
diff --git a/chrome/browser/views/frame/browser_view.h b/chrome/browser/views/frame/browser_view.h
index a636883..3146ade 100644
--- a/chrome/browser/views/frame/browser_view.h
+++ b/chrome/browser/views/frame/browser_view.h
@@ -11,8 +11,8 @@
 #include "chrome/browser/hang_monitor/hung_window_detector.h"
 #include "chrome/browser/tabs/tab_strip_model.h"
 #include "chrome/browser/views/frame/browser_frame.h"
-#include "chrome/views/window/client_view.h"
-#include "chrome/views/window/window_delegate.h"
+#include "views/window/client_view.h"
+#include "views/window/window_delegate.h"
 
 // NOTE: For more information about the objects and files in this directory,
 // view: http://dev.chromium.org/developers/design-documents/browser-window
diff --git a/chrome/browser/views/frame/glass_browser_frame_view.cc b/chrome/browser/views/frame/glass_browser_frame_view.cc
index 49488ba..bbebd3a 100644
--- a/chrome/browser/views/frame/glass_browser_frame_view.cc
+++ b/chrome/browser/views/frame/glass_browser_frame_view.cc
@@ -8,9 +8,9 @@
 #include "app/resource_bundle.h"
 #include "chrome/browser/views/frame/browser_view.h"
 #include "chrome/browser/views/tabs/tab_strip.h"
-#include "chrome/views/window/client_view.h"
-#include "chrome/views/window/window_resources.h"
 #include "grit/theme_resources.h"
+#include "views/window/client_view.h"
+#include "views/window/window_resources.h"
 
 // An enumeration of bitmap resources used by this window.
 enum {
diff --git a/chrome/browser/views/frame/glass_browser_frame_view.h b/chrome/browser/views/frame/glass_browser_frame_view.h
index b6aa5f9..d110fe9 100644
--- a/chrome/browser/views/frame/glass_browser_frame_view.h
+++ b/chrome/browser/views/frame/glass_browser_frame_view.h
@@ -6,8 +6,8 @@
 #define CHROME_BROWSER_VIEWS_FRAME_GLASS_BROWSER_FRAME_VIEW_H_
 
 #include "chrome/browser/views/frame/browser_frame.h"
-#include "chrome/views/controls/button/button.h"
-#include "chrome/views/window/non_client_view.h"
+#include "views/controls/button/button.h"
+#include "views/window/non_client_view.h"
 
 class BrowserView;
 class GlassBrowserWindowResources;
diff --git a/chrome/browser/views/frame/opaque_browser_frame_view.cc b/chrome/browser/views/frame/opaque_browser_frame_view.cc
index 4958b13..a132119 100644
--- a/chrome/browser/views/frame/opaque_browser_frame_view.cc
+++ b/chrome/browser/views/frame/opaque_browser_frame_view.cc
@@ -13,12 +13,12 @@
 #include "chrome/browser/views/frame/browser_view.h"
 #include "chrome/browser/views/tabs/tab_strip.h"
 #include "chrome/common/win_util.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"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
+#include "views/controls/button/image_button.h"
+#include "views/widget/root_view.h"
+#include "views/window/window_resources.h"
 
 // An enumeration of bitmap resources used by this window.
 enum {
diff --git a/chrome/browser/views/frame/opaque_browser_frame_view.h b/chrome/browser/views/frame/opaque_browser_frame_view.h
index 88d44e4..1e917e9 100644
--- a/chrome/browser/views/frame/opaque_browser_frame_view.h
+++ b/chrome/browser/views/frame/opaque_browser_frame_view.h
@@ -7,8 +7,8 @@
 
 #include "chrome/browser/views/frame/browser_frame.h"
 #include "chrome/browser/views/tab_icon_view.h"
-#include "chrome/views/controls/button/button.h"
-#include "chrome/views/window/non_client_view.h"
+#include "views/controls/button/button.h"
+#include "views/window/non_client_view.h"
 
 class BrowserView;
 class ChromeFont;
diff --git a/chrome/browser/views/fullscreen_exit_bubble.cc b/chrome/browser/views/fullscreen_exit_bubble.cc
index ad534f5..ff491a0 100644
--- a/chrome/browser/views/fullscreen_exit_bubble.cc
+++ b/chrome/browser/views/fullscreen_exit_bubble.cc
@@ -9,8 +9,8 @@
 #include "app/l10n_util_win.h"
 #include "app/resource_bundle.h"
 #include "chrome/app/chrome_dll_resource.h"
-#include "chrome/views/widget/root_view.h"
 #include "grit/generated_resources.h"
+#include "views/widget/root_view.h"
 
 // FullscreenExitView ----------------------------------------------------------
 
diff --git a/chrome/browser/views/fullscreen_exit_bubble.h b/chrome/browser/views/fullscreen_exit_bubble.h
index 59825d3..dca2cb8 100644
--- a/chrome/browser/views/fullscreen_exit_bubble.h
+++ b/chrome/browser/views/fullscreen_exit_bubble.h
@@ -8,8 +8,8 @@
 #include "app/slide_animation.h"
 #include "base/scoped_ptr.h"
 #include "chrome/browser/command_updater.h"
-#include "chrome/views/controls/link.h"
-#include "chrome/views/widget/widget_win.h"
+#include "views/controls/link.h"
+#include "views/widget/widget_win.h"
 
 // FullscreenExitBubble is responsible for showing a bubble atop the screen in
 // fullscreen mode, telling users how to exit and providing a click target.
diff --git a/chrome/browser/views/go_button.h b/chrome/browser/views/go_button.h
index 61b528e..818999c 100644
--- a/chrome/browser/views/go_button.h
+++ b/chrome/browser/views/go_button.h
@@ -7,7 +7,7 @@
 
 #include "base/basictypes.h"
 #include "base/task.h"
-#include "chrome/views/controls/button/image_button.h"
+#include "views/controls/button/image_button.h"
 
 class Browser;
 class LocationBarView;
diff --git a/chrome/browser/views/html_dialog_view.cc b/chrome/browser/views/html_dialog_view.cc
index 4a30c10..1e9569c 100644
--- a/chrome/browser/views/html_dialog_view.cc
+++ b/chrome/browser/views/html_dialog_view.cc
@@ -6,8 +6,8 @@
 
 #include "chrome/browser/browser.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
-#include "chrome/views/widget/root_view.h"
-#include "chrome/views/window/window.h"
+#include "views/widget/root_view.h"
+#include "views/window/window.h"
 
 ////////////////////////////////////////////////////////////////////////////////
 // HtmlDialogView, public:
diff --git a/chrome/browser/views/html_dialog_view.h b/chrome/browser/views/html_dialog_view.h
index 0043252..d9edf50 100644
--- a/chrome/browser/views/html_dialog_view.h
+++ b/chrome/browser/views/html_dialog_view.h
@@ -11,7 +11,7 @@
 #include "chrome/browser/dom_ui/html_dialog_ui.h"
 #include "chrome/browser/tab_contents/tab_contents_delegate.h"
 #include "chrome/browser/views/dom_view.h"
-#include "chrome/views/window/window_delegate.h"
+#include "views/window/window_delegate.h"
 
 class Browser;
 namespace views {
diff --git a/chrome/browser/views/hung_renderer_view.cc b/chrome/browser/views/hung_renderer_view.cc
index 593b312..bb13f3e 100644
--- a/chrome/browser/views/hung_renderer_view.cc
+++ b/chrome/browser/views/hung_renderer_view.cc
@@ -14,17 +14,17 @@
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/logging_chrome.h"
 #include "chrome/common/result_codes.h"
-#include "chrome/views/grid_layout.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"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
+#include "views/grid_layout.h"
+#include "views/controls/button/native_button.h"
+#include "views/controls/image_view.h"
+#include "views/controls/label.h"
+#include "views/controls/table/group_table_view.h"
+#include "views/window/client_view.h"
+#include "views/window/dialog_delegate.h"
+#include "views/window/window.h"
 
 class HungRendererDialogView;
 
diff --git a/chrome/browser/views/hwnd_html_view.cc b/chrome/browser/views/hwnd_html_view.cc
index 6856f57..bbda2c3 100644
--- a/chrome/browser/views/hwnd_html_view.cc
+++ b/chrome/browser/views/hwnd_html_view.cc
@@ -8,8 +8,8 @@
 #include "chrome/browser/renderer_host/render_widget_host_view_win.h"
 #include "chrome/browser/renderer_host/render_view_host_delegate.h"
 #include "chrome/browser/tab_contents/site_instance.h"
-#include "chrome/views/widget/widget.h"
-#include "chrome/views/widget/widget_win.h"
+#include "views/widget/widget.h"
+#include "views/widget/widget_win.h"
 
 HWNDHtmlView::HWNDHtmlView(const GURL& content_url,
                            RenderViewHostDelegate* delegate,
diff --git a/chrome/browser/views/hwnd_html_view.h b/chrome/browser/views/hwnd_html_view.h
index 275c891..699b67f 100644
--- a/chrome/browser/views/hwnd_html_view.h
+++ b/chrome/browser/views/hwnd_html_view.h
@@ -6,8 +6,8 @@
 #define CHROME_BROWSER_VIEWS_HWND_HTML_VIEW_H_
 
 #include "googleurl/src/gurl.h"
-#include "chrome/views/controls/hwnd_view.h"
 #include "skia/include/SkBitmap.h"
+#include "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 e1224d4..e2fc249 100644
--- a/chrome/browser/views/importer_lock_view.cc
+++ b/chrome/browser/views/importer_lock_view.cc
@@ -7,11 +7,11 @@
 #include "app/l10n_util.h"
 #include "chrome/browser/importer/importer.h"
 #include "chrome/browser/views/standard_layout.h"
-#include "chrome/views/controls/label.h"
-#include "chrome/views/window/window.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
+#include "views/controls/label.h"
+#include "views/window/window.h"
 
 using views::ColumnSet;
 using views::GridLayout;
diff --git a/chrome/browser/views/importer_lock_view.h b/chrome/browser/views/importer_lock_view.h
index 7b17e78..337b381 100644
--- a/chrome/browser/views/importer_lock_view.h
+++ b/chrome/browser/views/importer_lock_view.h
@@ -5,8 +5,8 @@
 #ifndef CHROME_BROWSER_VIEWS_IMPORTER_LOCK_VIEW_H__
 #define CHROME_BROWSER_VIEWS_IMPORTER_LOCK_VIEW_H__
 
-#include "chrome/views/view.h"
-#include "chrome/views/window/dialog_delegate.h"
+#include "views/view.h"
+#include "views/window/dialog_delegate.h"
 
 namespace views {
 class Label;
diff --git a/chrome/browser/views/importer_view.cc b/chrome/browser/views/importer_view.cc
index baa7387..7f03c3b 100644
--- a/chrome/browser/views/importer_view.cc
+++ b/chrome/browser/views/importer_view.cc
@@ -7,12 +7,12 @@
 #include "app/l10n_util.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/views/standard_layout.h"
-#include "chrome/views/controls/button/checkbox.h"
-#include "chrome/views/controls/label.h"
-#include "chrome/views/grid_layout.h"
-#include "chrome/views/window/window.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
+#include "views/controls/button/checkbox.h"
+#include "views/controls/label.h"
+#include "views/grid_layout.h"
+#include "views/window/window.h"
 
 using views::ColumnSet;
 using views::GridLayout;
diff --git a/chrome/browser/views/importer_view.h b/chrome/browser/views/importer_view.h
index 903764f..7ce6f62 100644
--- a/chrome/browser/views/importer_view.h
+++ b/chrome/browser/views/importer_view.h
@@ -6,10 +6,10 @@
 #define CHROME_BROWSER_VIEWS_IMPORTER_VIEW_H__
 
 #include "chrome/browser/importer/importer.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"
+#include "views/controls/button/native_button.h"
+#include "views/controls/combo_box.h"
+#include "views/view.h"
+#include "views/window/dialog_delegate.h"
 
 namespace views {
 class Checkbox;
diff --git a/chrome/browser/views/importing_progress_view.cc b/chrome/browser/views/importing_progress_view.cc
index b2b41d0..2c917d2 100644
--- a/chrome/browser/views/importing_progress_view.cc
+++ b/chrome/browser/views/importing_progress_view.cc
@@ -6,13 +6,13 @@
 
 #include "app/l10n_util.h"
 #include "chrome/browser/views/standard_layout.h"
-#include "chrome/views/grid_layout.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"
 #include "grit/locale_settings.h"
+#include "views/grid_layout.h"
+#include "views/controls/label.h"
+#include "views/controls/throbber.h"
+#include "views/window/window.h"
 
 ////////////////////////////////////////////////////////////////////////////////
 // ImportingProgressView, public:
diff --git a/chrome/browser/views/importing_progress_view.h b/chrome/browser/views/importing_progress_view.h
index 3de6cfc..da3afbd 100644
--- a/chrome/browser/views/importing_progress_view.h
+++ b/chrome/browser/views/importing_progress_view.h
@@ -6,9 +6,9 @@
 #define CHROME_BROWSER_VIEWS_IMPORTING_PROGRESS_VIEW_H_
 
 #include "chrome/browser/importer/importer.h"
-#include "chrome/views/view.h"
-#include "chrome/views/window/dialog_delegate.h"
-#include "chrome/views/window/window.h"
+#include "views/view.h"
+#include "views/window/dialog_delegate.h"
+#include "views/window/window.h"
 
 namespace views {
 class CheckmarkThrobber;
diff --git a/chrome/browser/views/info_bubble.cc b/chrome/browser/views/info_bubble.cc
index 38e36f75..674141c 100644
--- a/chrome/browser/views/info_bubble.cc
+++ b/chrome/browser/views/info_bubble.cc
@@ -13,9 +13,9 @@
 #include "chrome/common/notification_service.h"
 #include "chrome/common/notification_type.h"
 #include "chrome/common/win_util.h"
-#include "chrome/views/widget/root_view.h"
-#include "chrome/views/window/window.h"
 #include "grit/theme_resources.h"
+#include "views/widget/root_view.h"
+#include "views/window/window.h"
 
 using views::View;
 
diff --git a/chrome/browser/views/info_bubble.h b/chrome/browser/views/info_bubble.h
index 235a2b6..7368235 100644
--- a/chrome/browser/views/info_bubble.h
+++ b/chrome/browser/views/info_bubble.h
@@ -6,8 +6,8 @@
 #define CHROME_BROWSER_VIEWS_INFO_BUBBLE_H_
 
 #include "app/slide_animation.h"
-#include "chrome/views/view.h"
-#include "chrome/views/widget/widget_win.h"
+#include "views/view.h"
+#include "views/widget/widget_win.h"
 
 // InfoBubble is used to display an arbitrary view above all other windows.
 // Think of InfoBubble as a tooltip that allows you to embed an arbitrary view
diff --git a/chrome/browser/views/infobars/infobar_container.h b/chrome/browser/views/infobars/infobar_container.h
index dba3149..6cf02fa 100644
--- a/chrome/browser/views/infobars/infobar_container.h
+++ b/chrome/browser/views/infobars/infobar_container.h
@@ -6,7 +6,7 @@
 #define CHROME_BROWSER_VIEWS_INFOBARS_INFOBAR_CONTAINER_H_
 
 #include "chrome/common/notification_observer.h"
-#include "chrome/views/view.h"
+#include "views/view.h"
 
 class BrowserView;
 class InfoBarDelegate;
diff --git a/chrome/browser/views/infobars/infobars.cc b/chrome/browser/views/infobars/infobars.cc
index c22fa5c..4a04040 100644
--- a/chrome/browser/views/infobars/infobars.cc
+++ b/chrome/browser/views/infobars/infobars.cc
@@ -11,15 +11,15 @@
 #include "base/message_loop.h"
 #include "chrome/browser/views/event_utils.h"
 #include "chrome/browser/views/infobars/infobar_container.h"
-#include "chrome/views/background.h"
-#include "chrome/views/controls/button/image_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/focus/external_focus_tracker.h"
-#include "chrome/views/widget/widget.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
+#include "views/background.h"
+#include "views/controls/button/image_button.h"
+#include "views/controls/button/native_button.h"
+#include "views/controls/image_view.h"
+#include "views/controls/label.h"
+#include "views/focus/external_focus_tracker.h"
+#include "views/widget/widget.h"
 
 // static
 const double InfoBar::kTargetHeight = 37.0;
diff --git a/chrome/browser/views/infobars/infobars.h b/chrome/browser/views/infobars/infobars.h
index 2daefa9..4b468a8 100644
--- a/chrome/browser/views/infobars/infobars.h
+++ b/chrome/browser/views/infobars/infobars.h
@@ -7,8 +7,8 @@
 
 #include "app/animation.h"
 #include "chrome/browser/tab_contents/infobar_delegate.h"
-#include "chrome/views/controls/button/button.h"
-#include "chrome/views/controls/link.h"
+#include "views/controls/button/button.h"
+#include "views/controls/link.h"
 
 class InfoBarContainer;
 class SlideAnimation;
diff --git a/chrome/browser/views/jsmessage_box_dialog.cc b/chrome/browser/views/jsmessage_box_dialog.cc
index fab95a4..336a427 100644
--- a/chrome/browser/views/jsmessage_box_dialog.cc
+++ b/chrome/browser/views/jsmessage_box_dialog.cc
@@ -8,9 +8,9 @@
 #include "app/message_box_flags.h"
 #include "chrome/browser/app_modal_dialog.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
-#include "chrome/views/controls/message_box_view.h"
-#include "chrome/views/window/window.h"
 #include "grit/generated_resources.h"
+#include "views/controls/message_box_view.h"
+#include "views/window/window.h"
 
 JavascriptMessageBoxDialog::JavascriptMessageBoxDialog(
     AppModalDialog* parent,
diff --git a/chrome/browser/views/jsmessage_box_dialog.h b/chrome/browser/views/jsmessage_box_dialog.h
index cd64c9a..41f7e31 100644
--- a/chrome/browser/views/jsmessage_box_dialog.h
+++ b/chrome/browser/views/jsmessage_box_dialog.h
@@ -8,7 +8,7 @@
 #include <string>
 
 #include "chrome/browser/app_modal_dialog.h"
-#include "chrome/views/window/dialog_delegate.h"
+#include "views/window/dialog_delegate.h"
 
 class MessageBoxView;
 class TabContents;
diff --git a/chrome/browser/views/keyword_editor_view.cc b/chrome/browser/views/keyword_editor_view.cc
index f650ba2..bfb90dc 100644
--- a/chrome/browser/views/keyword_editor_view.cc
+++ b/chrome/browser/views/keyword_editor_view.cc
@@ -20,18 +20,18 @@
 #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/grid_layout.h"
-#include "chrome/views/controls/button/native_button.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"
 #include "googleurl/src/gurl.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
 #include "grit/theme_resources.h"
 #include "skia/include/SkBitmap.h"
+#include "views/background.h"
+#include "views/grid_layout.h"
+#include "views/controls/button/native_button.h"
+#include "views/controls/text_field.h"
+#include "views/widget/widget.h"
+#include "views/window/dialog_delegate.h"
+#include "views/window/window.h"
 
 using views::GridLayout;
 using views::NativeButton;
diff --git a/chrome/browser/views/keyword_editor_view.h b/chrome/browser/views/keyword_editor_view.h
index 7d2a95f..ef8b456 100644
--- a/chrome/browser/views/keyword_editor_view.h
+++ b/chrome/browser/views/keyword_editor_view.h
@@ -9,10 +9,10 @@
 #include <map>
 
 #include "chrome/browser/search_engines/template_url_model.h"
-#include "chrome/views/controls/button/button.h"
-#include "chrome/views/controls/table/table_view.h"
-#include "chrome/views/view.h"
-#include "chrome/views/window/dialog_delegate.h"
+#include "views/controls/button/button.h"
+#include "views/controls/table/table_view.h"
+#include "views/view.h"
+#include "views/window/dialog_delegate.h"
 
 namespace views {
 class Label;
diff --git a/chrome/browser/views/location_bar_view.cc b/chrome/browser/views/location_bar_view.cc
index 61a409f..7683626 100644
--- a/chrome/browser/views/location_bar_view.cc
+++ b/chrome/browser/views/location_bar_view.cc
@@ -27,12 +27,12 @@
 #include "chrome/browser/views/first_run_bubble.h"
 #include "chrome/browser/views/page_info_window.h"
 #include "chrome/common/win_util.h"
-#include "chrome/views/background.h"
-#include "chrome/views/border.h"
-#include "chrome/views/widget/root_view.h"
-#include "chrome/views/widget/widget.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
+#include "views/background.h"
+#include "views/border.h"
+#include "views/widget/root_view.h"
+#include "views/widget/widget.h"
 
 using views::View;
 
diff --git a/chrome/browser/views/location_bar_view.h b/chrome/browser/views/location_bar_view.h
index 6d690d0..a6ea987 100644
--- a/chrome/browser/views/location_bar_view.h
+++ b/chrome/browser/views/location_bar_view.h
@@ -17,10 +17,10 @@
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/toolbar_model.h"
 #include "chrome/browser/views/info_bubble.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"
+#include "views/controls/hwnd_view.h"
+#include "views/controls/image_view.h"
+#include "views/controls/label.h"
+#include "views/painter.h"
 
 class AutocompletePopupPositioner;
 class CommandUpdater;
diff --git a/chrome/browser/views/login_view.cc b/chrome/browser/views/login_view.cc
index cef889a..150e447 100644
--- a/chrome/browser/views/login_view.cc
+++ b/chrome/browser/views/login_view.cc
@@ -9,11 +9,11 @@
 #include "app/l10n_util.h"
 #include "base/message_loop.h"
 #include "chrome/browser/views/standard_layout.h"
-#include "chrome/views/grid_layout.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"
+#include "views/grid_layout.h"
+#include "views/controls/label.h"
+#include "views/controls/text_field.h"
+#include "views/widget/root_view.h"
 
 namespace views {
 
diff --git a/chrome/browser/views/login_view.h b/chrome/browser/views/login_view.h
index 36e2591..fa0a837 100644
--- a/chrome/browser/views/login_view.h
+++ b/chrome/browser/views/login_view.h
@@ -6,7 +6,7 @@
 #define CHROME_BROWSER_VIEWS_LOGIN_VIEW_H__
 
 #include "base/task.h"
-#include "chrome/views/view.h"
+#include "views/view.h"
 
 namespace views {
 class Label;
diff --git a/chrome/browser/views/new_profile_dialog.cc b/chrome/browser/views/new_profile_dialog.cc
index 1c5faa6..9b3b5fa 100644
--- a/chrome/browser/views/new_profile_dialog.cc
+++ b/chrome/browser/views/new_profile_dialog.cc
@@ -11,13 +11,13 @@
 #include "base/logging.h"
 #include "base/file_util.h"
 #include "chrome/browser/user_data_manager.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"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
+#include "views/controls/message_box_view.h"
+#include "views/controls/text_field.h"
+#include "views/view.h"
+#include "views/window/window.h"
 
 // static
 void NewProfileDialog::RunDialog() {
diff --git a/chrome/browser/views/new_profile_dialog.h b/chrome/browser/views/new_profile_dialog.h
index 4564ec2..863b2ad 100644
--- a/chrome/browser/views/new_profile_dialog.h
+++ b/chrome/browser/views/new_profile_dialog.h
@@ -11,8 +11,8 @@
 #include "base/basictypes.h"
 #include "base/message_loop.h"
 #include "chrome/browser/shell_dialogs.h"
-#include "chrome/views/controls/text_field.h"
-#include "chrome/views/window/dialog_delegate.h"
+#include "views/controls/text_field.h"
+#include "views/window/dialog_delegate.h"
 
 class MessageBoxView;
 namespace views {
diff --git a/chrome/browser/views/options/advanced_contents_view.cc b/chrome/browser/views/options/advanced_contents_view.cc
index c3ef712..fb2862b 100644
--- a/chrome/browser/views/options/advanced_contents_view.cc
+++ b/chrome/browser/views/options/advanced_contents_view.cc
@@ -33,17 +33,17 @@
 #include "chrome/common/pref_member.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/installer/util/google_update_settings.h"
-#include "chrome/views/background.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/widget/widget.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
 #include "net/base/ssl_config_service.h"
 #include "net/base/cookie_policy.h"
+#include "views/background.h"
+#include "views/controls/button/checkbox.h"
+#include "views/controls/combo_box.h"
+#include "views/controls/scroll_view.h"
+#include "views/grid_layout.h"
+#include "views/widget/widget.h"
 
 using views::GridLayout;
 using views::ColumnSet;
diff --git a/chrome/browser/views/options/advanced_page_view.cc b/chrome/browser/views/options/advanced_page_view.cc
index 5e84ef3e..7b0e1c9 100644
--- a/chrome/browser/views/options/advanced_page_view.cc
+++ b/chrome/browser/views/options/advanced_page_view.cc
@@ -14,15 +14,15 @@
 #include "chrome/common/chrome_constants.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/window/dialog_delegate.h"
-#include "chrome/views/window/window.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
+#include "views/controls/message_box_view.h"
+#include "views/controls/button/native_button.h"
+#include "views/controls/scroll_view.h"
+#include "views/grid_layout.h"
+#include "views/window/dialog_delegate.h"
+#include "views/window/window.h"
 
 namespace {
 
diff --git a/chrome/browser/views/options/advanced_page_view.h b/chrome/browser/views/options/advanced_page_view.h
index 1a9119e..63f0ede 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/controls/button/button.h"
+#include "views/controls/button/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 f289f09..955ea3e 100644
--- a/chrome/browser/views/options/content_page_view.cc
+++ b/chrome/browser/views/options/content_page_view.cc
@@ -22,14 +22,14 @@
 #include "chrome/browser/views/standard_layout.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.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/widget/widget.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "skia/ext/skia_utils_win.h"
 #include "skia/include/SkBitmap.h"
+#include "views/controls/button/radio_button.h"
+#include "views/controls/text_field.h"
+#include "views/grid_layout.h"
+#include "views/widget/widget.h"
 
 namespace {
 
diff --git a/chrome/browser/views/options/content_page_view.h b/chrome/browser/views/options/content_page_view.h
index 7102f63..7d96e00 100644
--- a/chrome/browser/views/options/content_page_view.h
+++ b/chrome/browser/views/options/content_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/controls/button/button.h"
-#include "chrome/views/view.h"
+#include "views/controls/button/button.h"
+#include "views/view.h"
 
 namespace views {
 class Checkbox;
diff --git a/chrome/browser/views/options/cookies_view.cc b/chrome/browser/views/options/cookies_view.cc
index b539aec..012e6ab 100644
--- a/chrome/browser/views/options/cookies_view.cc
+++ b/chrome/browser/views/options/cookies_view.cc
@@ -15,17 +15,17 @@
 #include "chrome/browser/views/standard_layout.h"
 #include "chrome/common/gfx/color_utils.h"
 #include "chrome/common/win_util.h"
-#include "chrome/views/border.h"
-#include "chrome/views/grid_layout.h"
-#include "chrome/views/controls/label.h"
-#include "chrome/views/controls/button/native_button.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"
 #include "net/base/cookie_monster.h"
 #include "net/url_request/url_request_context.h"
+#include "views/border.h"
+#include "views/grid_layout.h"
+#include "views/controls/label.h"
+#include "views/controls/button/native_button.h"
+#include "views/controls/text_field.h"
+#include "views/controls/table/table_view.h"
 
 // static
 views::Window* CookiesView::instance_ = NULL;
diff --git a/chrome/browser/views/options/cookies_view.h b/chrome/browser/views/options/cookies_view.h
index c05bce7..f2bc98a 100644
--- a/chrome/browser/views/options/cookies_view.h
+++ b/chrome/browser/views/options/cookies_view.h
@@ -6,12 +6,12 @@
 #define CHROME_BROWSER_VIEWS_OPTIONS_COOKIES_VIEW_H_
 
 #include "base/task.h"
-#include "chrome/views/controls/button/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"
+#include "views/controls/button/button.h"
+#include "views/controls/table/table_view.h"
+#include "views/controls/text_field.h"
+#include "views/view.h"
+#include "views/window/dialog_delegate.h"
+#include "views/window/window.h"
 
 namespace views {
 class Label;
diff --git a/chrome/browser/views/options/exceptions_page_view.cc b/chrome/browser/views/options/exceptions_page_view.cc
index 65c38f9..6492640 100644
--- a/chrome/browser/views/options/exceptions_page_view.cc
+++ b/chrome/browser/views/options/exceptions_page_view.cc
@@ -10,10 +10,10 @@
 #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 "grit/generated_resources.h"
+#include "views/background.h"
+#include "views/controls/button/native_button.h"
+#include "views/grid_layout.h"
 
 using views::ColumnSet;
 using views::GridLayout;
diff --git a/chrome/browser/views/options/fonts_languages_window_view.cc b/chrome/browser/views/options/fonts_languages_window_view.cc
index 6219f87..cf26d1f 100644
--- a/chrome/browser/views/options/fonts_languages_window_view.cc
+++ b/chrome/browser/views/options/fonts_languages_window_view.cc
@@ -12,10 +12,10 @@
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
-#include "chrome/views/window/window.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
+#include "views/window/window.h"
 
 // static
 static FontsLanguagesWindowView* instance_ = NULL;
diff --git a/chrome/browser/views/options/fonts_languages_window_view.h b/chrome/browser/views/options/fonts_languages_window_view.h
index 5d0fae3..e33d74a 100644
--- a/chrome/browser/views/options/fonts_languages_window_view.h
+++ b/chrome/browser/views/options/fonts_languages_window_view.h
@@ -5,10 +5,10 @@
 #ifndef CHROME_BROWSER_FONTS_LANGUAGE_WINDOW_H__
 #define CHROME_BROWSER_FONTS_LANGUAGE_WINDOW_H__
 
-#include "chrome/views/controls/tabbed_pane.h"
-#include "chrome/views/view.h"
-#include "chrome/views/window/dialog_delegate.h"
-#include "chrome/views/window/window.h"
+#include "views/controls/tabbed_pane.h"
+#include "views/view.h"
+#include "views/window/dialog_delegate.h"
+#include "views/window/window.h"
 
 class Profile;
 class FontsPageView;
diff --git a/chrome/browser/views/options/fonts_page_view.cc b/chrome/browser/views/options/fonts_page_view.cc
index fb1c57a..7e497c0 100644
--- a/chrome/browser/views/options/fonts_page_view.cc
+++ b/chrome/browser/views/options/fonts_page_view.cc
@@ -24,14 +24,14 @@
 #include "chrome/browser/views/standard_layout.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
-#include "chrome/views/controls/button/native_button.h"
-#include "chrome/views/controls/text_field.h"
-#include "chrome/views/grid_layout.h"
-#include "chrome/views/widget/widget.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "grit/locale_settings.h"
 #include "skia/include/SkBitmap.h"
+#include "views/controls/button/native_button.h"
+#include "views/controls/text_field.h"
+#include "views/grid_layout.h"
+#include "views/widget/widget.h"
 
 namespace {
 
diff --git a/chrome/browser/views/options/fonts_page_view.h b/chrome/browser/views/options/fonts_page_view.h
index a47f9ec..0b54c18 100644
--- a/chrome/browser/views/options/fonts_page_view.h
+++ b/chrome/browser/views/options/fonts_page_view.h
@@ -8,9 +8,9 @@
 #include "chrome/browser/views/options/options_page_view.h"
 #include "chrome/browser/shell_dialogs.h"
 #include "chrome/common/pref_member.h"
-#include "chrome/views/controls/combo_box.h"
-#include "chrome/views/controls/button/button.h"
-#include "chrome/views/view.h"
+#include "views/controls/combo_box.h"
+#include "views/controls/button/button.h"
+#include "views/view.h"
 
 
 namespace views {
diff --git a/chrome/browser/views/options/general_page_view.cc b/chrome/browser/views/options/general_page_view.cc
index bf7c4a7..505d85a 100644
--- a/chrome/browser/views/options/general_page_view.cc
+++ b/chrome/browser/views/options/general_page_view.cc
@@ -29,15 +29,15 @@
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
 #include "chrome/common/url_constants.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 "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "skia/include/SkBitmap.h"
+#include "views/controls/button/radio_button.h"
+#include "views/controls/label.h"
+#include "views/controls/table/table_view.h"
+#include "views/controls/text_field.h"
+#include "views/grid_layout.h"
 
 namespace {
 
diff --git a/chrome/browser/views/options/general_page_view.h b/chrome/browser/views/options/general_page_view.h
index 4887e1b..800cd04 100644
--- a/chrome/browser/views/options/general_page_view.h
+++ b/chrome/browser/views/options/general_page_view.h
@@ -8,9 +8,9 @@
 #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/controls/combo_box.h"
-#include "chrome/views/controls/button/button.h"
-#include "chrome/views/view.h"
+#include "views/controls/combo_box.h"
+#include "views/controls/button/button.h"
+#include "views/view.h"
 
 namespace views {
 class Checkbox;
diff --git a/chrome/browser/views/options/language_combobox_model.h b/chrome/browser/views/options/language_combobox_model.h
index a3dfac6..c102902 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/controls/combo_box.h"
+#include "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 4752c80..c3b6a29 100644
--- a/chrome/browser/views/options/languages_page_view.cc
+++ b/chrome/browser/views/options/languages_page_view.cc
@@ -24,18 +24,18 @@
 #include "chrome/browser/views/standard_layout.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.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/widget/widget.h"
-#include "chrome/views/window/window.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "skia/include/SkBitmap.h"
 #include "unicode/uloc.h"
+#include "views/controls/button/radio_button.h"
+#include "views/controls/combo_box.h"
+#include "views/controls/tabbed_pane.h"
+#include "views/controls/text_field.h"
+#include "views/grid_layout.h"
+#include "views/widget/widget.h"
+#include "views/window/window.h"
 
 static const char* const accept_language_list[] = {
   "af",     // Afrikaans
diff --git a/chrome/browser/views/options/languages_page_view.h b/chrome/browser/views/options/languages_page_view.h
index 1da0a88..308df34 100644
--- a/chrome/browser/views/options/languages_page_view.h
+++ b/chrome/browser/views/options/languages_page_view.h
@@ -7,10 +7,10 @@
 
 #include "chrome/browser/views/options/options_page_view.h"
 #include "chrome/common/pref_member.h"
-#include "chrome/views/controls/combo_box.h"
-#include "chrome/views/controls/button/button.h"
-#include "chrome/views/controls/table/table_view.h"
-#include "chrome/views/view.h"
+#include "views/controls/combo_box.h"
+#include "views/controls/button/button.h"
+#include "views/controls/table/table_view.h"
+#include "views/view.h"
 
 namespace views {
 class Checkbox;
diff --git a/chrome/browser/views/options/options_group_view.cc b/chrome/browser/views/options/options_group_view.cc
index 7985a41..fa7d3cd 100644
--- a/chrome/browser/views/options/options_group_view.cc
+++ b/chrome/browser/views/options/options_group_view.cc
@@ -13,11 +13,11 @@
 #include "app/resource_bundle.h"
 #include "base/gfx/native_theme.h"
 #include "chrome/browser/views/standard_layout.h"
-#include "chrome/views/grid_layout.h"
-#include "chrome/views/controls/label.h"
-#include "chrome/views/controls/separator.h"
 #include "grit/locale_settings.h"
 #include "grit/generated_resources.h"
+#include "views/grid_layout.h"
+#include "views/controls/label.h"
+#include "views/controls/separator.h"
 
 static const int kLeftColumnWidthChars = 20;
 static const int kOptionsGroupViewColumnSpacing = 30;
diff --git a/chrome/browser/views/options/options_group_view.h b/chrome/browser/views/options/options_group_view.h
index 8620030..1cabd1d 100644
--- a/chrome/browser/views/options/options_group_view.h
+++ b/chrome/browser/views/options/options_group_view.h
@@ -5,7 +5,7 @@
 #ifndef CHROME_BROWSER_VIEWS_OPTIONS_OPTIONS_GROUP_VIEW_H__
 #define CHROME_BROWSER_VIEWS_OPTIONS_OPTIONS_GROUP_VIEW_H__
 
-#include "chrome/views/view.h"
+#include "views/view.h"
 
 namespace views {
 class Label;
diff --git a/chrome/browser/views/options/options_page_view.cc b/chrome/browser/views/options/options_page_view.cc
index ed303ad..f0d5dfb 100644
--- a/chrome/browser/views/options/options_page_view.cc
+++ b/chrome/browser/views/options/options_page_view.cc
@@ -8,7 +8,7 @@
 #include "chrome/browser/metrics/user_metrics.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/pref_service.h"
-#include "chrome/views/widget/widget.h"
+#include "views/widget/widget.h"
 
 ///////////////////////////////////////////////////////////////////////////////
 // OptionsPageView
diff --git a/chrome/browser/views/options/options_page_view.h b/chrome/browser/views/options/options_page_view.h
index 6c7c4fd..c902e14e 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/controls/link.h"
-#include "chrome/views/controls/button/native_button.h"
+#include "views/controls/link.h"
+#include "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 15f4181..6bdd1f0 100644
--- a/chrome/browser/views/options/options_window_view.cc
+++ b/chrome/browser/views/options/options_window_view.cc
@@ -18,13 +18,13 @@
 #include "chrome/personalization/personalization.h"
 #include "chrome/personalization/views/user_data_page_view.h"
 #endif
-#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"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
+#include "views/controls/tabbed_pane.h"
+#include "views/widget/root_view.h"
+#include "views/window/dialog_delegate.h"
+#include "views/window/window.h"
 
 ///////////////////////////////////////////////////////////////////////////////
 // OptionsWindowView
diff --git a/chrome/browser/views/options/passwords_exceptions_window_view.h b/chrome/browser/views/options/passwords_exceptions_window_view.h
index e3e8705..8170f90 100644
--- a/chrome/browser/views/options/passwords_exceptions_window_view.h
+++ b/chrome/browser/views/options/passwords_exceptions_window_view.h
@@ -5,10 +5,10 @@
 #ifndef CHROME_BROWSER_VIEWS_OPTIONS_PASSWORDS_EXCEPTIONS_WINDOW_VIEW_H_
 #define CHROME_BROWSER_VIEWS_OPTIONS_PASSWORDS_EXCEPTIONS_WINDOW_VIEW_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"
+#include "views/controls/tabbed_pane.h"
+#include "views/view.h"
+#include "views/window/dialog_delegate.h"
+#include "views/window/window.h"
 
 class Profile;
 class PasswordsPageView;
diff --git a/chrome/browser/views/options/passwords_page_view.cc b/chrome/browser/views/options/passwords_page_view.cc
index 04c13f4..f7f02cd 100644
--- a/chrome/browser/views/options/passwords_page_view.cc
+++ b/chrome/browser/views/options/passwords_page_view.cc
@@ -10,10 +10,10 @@
 #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 "grit/generated_resources.h"
+#include "views/background.h"
+#include "views/controls/button/native_button.h"
+#include "views/grid_layout.h"
 
 using views::ColumnSet;
 using views::GridLayout;
diff --git a/chrome/browser/views/options/passwords_page_view.h b/chrome/browser/views/options/passwords_page_view.h
index b585159..a7a30b5 100644
--- a/chrome/browser/views/options/passwords_page_view.h
+++ b/chrome/browser/views/options/passwords_page_view.h
@@ -12,11 +12,11 @@
 #include "chrome/browser/views/options/options_page_view.h"
 #include "chrome/browser/webdata/web_data_service.h"
 #include "chrome/common/gfx/text_elider.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 "views/controls/button/native_button.h"
+#include "views/controls/label.h"
+#include "views/controls/table/table_view.h"
+#include "views/window/dialog_delegate.h"
+#include "views/window/window.h"
 #include "webkit/glue/password_form.h"
 
 class Profile;
diff --git a/chrome/browser/views/page_info_window.cc b/chrome/browser/views/page_info_window.cc
index 059ec52..ad37f7b 100644
--- a/chrome/browser/views/page_info_window.cc
+++ b/chrome/browser/views/page_info_window.cc
@@ -20,18 +20,18 @@
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
 #include "chrome/common/win_util.h"
-#include "chrome/views/background.h"
-#include "chrome/views/grid_layout.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"
 #include "net/base/cert_status_flags.h"
 #include "net/base/x509_certificate.h"
 #include "skia/include/SkColor.h"
+#include "views/background.h"
+#include "views/grid_layout.h"
+#include "views/controls/button/native_button.h"
+#include "views/controls/image_view.h"
+#include "views/controls/label.h"
+#include "views/controls/separator.h"
 
 using base::Time;
 
diff --git a/chrome/browser/views/page_info_window.h b/chrome/browser/views/page_info_window.h
index 35b2ee0..6a27558 100644
--- a/chrome/browser/views/page_info_window.h
+++ b/chrome/browser/views/page_info_window.h
@@ -6,10 +6,10 @@
 #define CHROME_BROWSER_VIEWS_PAGE_INFO_WINDOW_H__
 
 #include "chrome/browser/tab_contents/navigation_entry.h"
-#include "chrome/views/controls/button/button.h"
-#include "chrome/views/window/dialog_delegate.h"
-#include "chrome/views/window/window.h"
 #include "googleurl/src/gurl.h"
+#include "views/controls/button/button.h"
+#include "views/window/dialog_delegate.h"
+#include "views/window/window.h"
 
 // The page info window displays information regarding the current page,
 // including security information.
diff --git a/chrome/browser/views/repost_form_warning_view.cc b/chrome/browser/views/repost_form_warning_view.cc
index 13618fd..4c91b20 100644
--- a/chrome/browser/views/repost_form_warning_view.cc
+++ b/chrome/browser/views/repost_form_warning_view.cc
@@ -9,9 +9,9 @@
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/tab_contents/navigation_controller.h"
 #include "chrome/common/notification_service.h"
-#include "chrome/views/controls/message_box_view.h"
-#include "chrome/views/window/window.h"
 #include "grit/generated_resources.h"
+#include "views/controls/message_box_view.h"
+#include "views/window/window.h"
 
 // Implementation of function declared in
 // browser/tab_contents/repost_form_warning.h
diff --git a/chrome/browser/views/repost_form_warning_view.h b/chrome/browser/views/repost_form_warning_view.h
index 809b7b5..a7da41c 100644
--- a/chrome/browser/views/repost_form_warning_view.h
+++ b/chrome/browser/views/repost_form_warning_view.h
@@ -6,7 +6,7 @@
 #define CHROME_BROWSER_VIEWS_REPOST_FORM_WARNING_VIEW_H_
 
 #include "chrome/common/notification_observer.h"
-#include "chrome/views/window/dialog_delegate.h"
+#include "views/window/dialog_delegate.h"
 
 class MessageBoxView;
 class NavigationController;
diff --git a/chrome/browser/views/restart_message_box.cc b/chrome/browser/views/restart_message_box.cc
index bffbb82..3d4ffae 100644
--- a/chrome/browser/views/restart_message_box.cc
+++ b/chrome/browser/views/restart_message_box.cc
@@ -6,10 +6,10 @@
 
 #include "app/l10n_util.h"
 #include "app/message_box_flags.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"
+#include "views/controls/message_box_view.h"
+#include "views/window/window.h"
 
 ////////////////////////////////////////////////////////////////////////////////
 // RestartMessageBox, public:
diff --git a/chrome/browser/views/restart_message_box.h b/chrome/browser/views/restart_message_box.h
index 8180de4..5394e69 100644
--- a/chrome/browser/views/restart_message_box.h
+++ b/chrome/browser/views/restart_message_box.h
@@ -6,7 +6,7 @@
 #define CHROME_BROWSER_VIEWS_RESTART_MESSAGE_BOX_H_
 
 #include "base/basictypes.h"
-#include "chrome/views/window/dialog_delegate.h"
+#include "views/window/dialog_delegate.h"
 
 class MessageBoxView;
 
diff --git a/chrome/browser/views/sad_tab_view.h b/chrome/browser/views/sad_tab_view.h
index 8605c1d..2053fba 100644
--- a/chrome/browser/views/sad_tab_view.h
+++ b/chrome/browser/views/sad_tab_view.h
@@ -7,7 +7,7 @@
 
 #include "app/gfx/chrome_font.h"
 #include "base/basictypes.h"
-#include "chrome/views/view.h"
+#include "views/view.h"
 
 class SkBitmap;
 
diff --git a/chrome/browser/views/select_profile_dialog.cc b/chrome/browser/views/select_profile_dialog.cc
index 2a2af8b..074fec6 100644
--- a/chrome/browser/views/select_profile_dialog.cc
+++ b/chrome/browser/views/select_profile_dialog.cc
@@ -12,15 +12,15 @@
 #include "chrome/browser/user_data_manager.h"
 #include "chrome/browser/views/new_profile_dialog.h"
 #include "chrome/browser/views/standard_layout.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/view.h"
-#include "chrome/views/window/window.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
+#include "views/controls/combo_box.h"
+#include "views/controls/label.h"
+#include "views/controls/message_box_view.h"
+#include "views/grid_layout.h"
+#include "views/view.h"
+#include "views/window/window.h"
 
 using views::ColumnSet;
 using views::GridLayout;
diff --git a/chrome/browser/views/select_profile_dialog.h b/chrome/browser/views/select_profile_dialog.h
index 723efb2..2e2d328 100644
--- a/chrome/browser/views/select_profile_dialog.h
+++ b/chrome/browser/views/select_profile_dialog.h
@@ -15,8 +15,8 @@
 #include "base/ref_counted.h"
 #include "chrome/browser/shell_dialogs.h"
 #include "chrome/browser/user_data_manager.h"
-#include "chrome/views/controls/combo_box.h"
-#include "chrome/views/window/dialog_delegate.h"
+#include "views/controls/combo_box.h"
+#include "views/window/dialog_delegate.h"
 
 class SelectProfileDialogHelper;
 namespace views {
diff --git a/chrome/browser/views/shelf_item_dialog.cc b/chrome/browser/views/shelf_item_dialog.cc
index fdfae82..70c4e71 100644
--- a/chrome/browser/views/shelf_item_dialog.cc
+++ b/chrome/browser/views/shelf_item_dialog.cc
@@ -16,16 +16,16 @@
 #include "chrome/common/gfx/text_elider.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.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/widget/widget.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
 #include "grit/theme_resources.h"
 #include "net/base/net_util.h"
+#include "views/background.h"
+#include "views/controls/label.h"
+#include "views/controls/text_field.h"
+#include "views/focus/focus_manager.h"
+#include "views/grid_layout.h"
+#include "views/widget/widget.h"
 
 using base::Time;
 using base::TimeDelta;
diff --git a/chrome/browser/views/shelf_item_dialog.h b/chrome/browser/views/shelf_item_dialog.h
index e1c932e..5e49625 100644
--- a/chrome/browser/views/shelf_item_dialog.h
+++ b/chrome/browser/views/shelf_item_dialog.h
@@ -7,12 +7,12 @@
 
 #include "chrome/browser/cancelable_request.h"
 #include "chrome/browser/history/history.h"
-#include "chrome/views/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"
+#include "views/controls/button/native_button.h"
+#include "views/controls/table/table_view.h"
+#include "views/controls/text_field.h"
+#include "views/view.h"
+#include "views/window/dialog_delegate.h"
+#include "views/window/window.h"
 
 namespace views {
 class Button;
diff --git a/chrome/browser/views/standard_layout.h b/chrome/browser/views/standard_layout.h
index 3c3d5b63..d72c7f3 100644
--- a/chrome/browser/views/standard_layout.h
+++ b/chrome/browser/views/standard_layout.h
@@ -5,7 +5,7 @@
 #ifndef CHROME_BROWSER_VIEWS_STANDARD_LAYOUT_H__
 #define CHROME_BROWSER_VIEWS_STANDARD_LAYOUT_H__
 
-#include "chrome/views/grid_layout.h"
+#include "views/grid_layout.h"
 
 //
 // This file contains some constants we use to implement our standard panel
diff --git a/chrome/browser/views/star_toggle.h b/chrome/browser/views/star_toggle.h
index 1475ab4..08d1791 100644
--- a/chrome/browser/views/star_toggle.h
+++ b/chrome/browser/views/star_toggle.h
@@ -5,8 +5,8 @@
 #ifndef CHROME_BROWSER_VIEWS_STAR_TOGGLE_H_
 #define CHROME_BROWSER_VIEWS_STAR_TOGGLE_H_
 
-#include "chrome/views/view.h"
-#include "chrome/views/event.h"
+#include "views/view.h"
+#include "views/event.h"
 
 class SkBitmap;
 
diff --git a/chrome/browser/views/status_bubble_views.cc b/chrome/browser/views/status_bubble_views.cc
index 38eebbd..d44c967 100644
--- a/chrome/browser/views/status_bubble_views.cc
+++ b/chrome/browser/views/status_bubble_views.cc
@@ -13,16 +13,16 @@
 #include "app/resource_bundle.h"
 #include "base/string_util.h"
 #include "chrome/common/gfx/text_elider.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"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "net/base/net_util.h"
-#include "SkPaint.h"
-#include "SkPath.h"
-#include "SkRect.h"
+#include "skia/include/SkPaint.h"
+#include "skia/include/SkPath.h"
+#include "skia/include/corecg/SkRect.h"
+#include "views/controls/label.h"
+#include "views/widget/root_view.h"
+#include "views/widget/widget_win.h"
 
 // The color of the background bubble.
 static const SkColor kBubbleColor = SkColorSetRGB(222, 234, 248);
diff --git a/chrome/browser/views/status_bubble_views.h b/chrome/browser/views/status_bubble_views.h
index 4985d51..cdda382 100644
--- a/chrome/browser/views/status_bubble_views.h
+++ b/chrome/browser/views/status_bubble_views.h
@@ -7,8 +7,8 @@
 
 #include "base/gfx/rect.h"
 #include "chrome/browser/status_bubble.h"
-#include "chrome/views/widget/widget.h"
-#include "chrome/views/widget/widget_win.h"
+#include "views/widget/widget.h"
+#include "views/widget/widget_win.h"
 
 class GURL;
 
diff --git a/chrome/browser/views/tab_contents_container_view.cc b/chrome/browser/views/tab_contents_container_view.cc
index 4a3311d..cb08fcb 100644
--- a/chrome/browser/views/tab_contents_container_view.cc
+++ b/chrome/browser/views/tab_contents_container_view.cc
@@ -15,8 +15,8 @@
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/view_ids.h"
 #include "chrome/common/notification_service.h"
-#include "chrome/views/widget/root_view.h"
-#include "chrome/views/widget/widget.h"
+#include "views/widget/root_view.h"
+#include "views/widget/widget.h"
 
 using views::FocusTraversable;
 using views::FocusManager;
diff --git a/chrome/browser/views/tab_contents_container_view.h b/chrome/browser/views/tab_contents_container_view.h
index 6840460..cc901ba 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_registrar.h"
-#include "chrome/views/controls/hwnd_view.h"
-#include "chrome/views/focus/focus_manager.h"
+#include "views/controls/hwnd_view.h"
+#include "views/focus/focus_manager.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.h b/chrome/browser/views/tab_icon_view.h
index d210ba4..2860699 100644
--- a/chrome/browser/views/tab_icon_view.h
+++ b/chrome/browser/views/tab_icon_view.h
@@ -5,7 +5,7 @@
 #ifndef CHROME_BROWSER_VIEW_TAB_ICON_VIEW_H_
 #define CHROME_BROWSER_VIEW_TAB_ICON_VIEW_H_
 
-#include "chrome/views/view.h"
+#include "views/view.h"
 
 class SkBitmap;
 class TabContents;
diff --git a/chrome/browser/views/tabs/dragged_tab_controller.cc b/chrome/browser/views/tabs/dragged_tab_controller.cc
index c53622f..56ed9c7 100644
--- a/chrome/browser/views/tabs/dragged_tab_controller.cc
+++ b/chrome/browser/views/tabs/dragged_tab_controller.cc
@@ -21,10 +21,10 @@
 #include "chrome/browser/views/tabs/tab_strip.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/common/notification_service.h"
-#include "chrome/views/event.h"
-#include "chrome/views/widget/root_view.h"
 #include "grit/theme_resources.h"
 #include "skia/include/SkBitmap.h"
+#include "views/event.h"
+#include "views/widget/root_view.h"
 
 static const int kHorizontalMoveThreshold = 16; // pixels
 
diff --git a/chrome/browser/views/tabs/dragged_tab_view.cc b/chrome/browser/views/tabs/dragged_tab_view.cc
index 90e6d23..1977f56 100644
--- a/chrome/browser/views/tabs/dragged_tab_view.cc
+++ b/chrome/browser/views/tabs/dragged_tab_view.cc
@@ -9,8 +9,8 @@
 #include "chrome/browser/tabs/tab_strip_model.h"
 #include "chrome/browser/views/tabs/hwnd_photobooth.h"
 #include "chrome/browser/views/tabs/tab_renderer.h"
-#include "chrome/views/widget/widget_win.h"
 #include "skia/include/SkShader.h"
+#include "views/widget/widget_win.h"
 
 const int kTransparentAlpha = 200;
 const int kOpaqueAlpha = 255;
diff --git a/chrome/browser/views/tabs/dragged_tab_view.h b/chrome/browser/views/tabs/dragged_tab_view.h
index 5802ec2..1b55654 100644
--- a/chrome/browser/views/tabs/dragged_tab_view.h
+++ b/chrome/browser/views/tabs/dragged_tab_view.h
@@ -9,8 +9,8 @@
 #include "base/gfx/point.h"
 #include "base/gfx/size.h"
 #include "base/task.h"
-#include "chrome/views/view.h"
 #include "skia/include/SkBitmap.h"
+#include "views/view.h"
 
 namespace views {
 class WidgetWin;
diff --git a/chrome/browser/views/tabs/hwnd_photobooth.cc b/chrome/browser/views/tabs/hwnd_photobooth.cc
index ba825b0..8d59592 100644
--- a/chrome/browser/views/tabs/hwnd_photobooth.cc
+++ b/chrome/browser/views/tabs/hwnd_photobooth.cc
@@ -6,8 +6,8 @@
 #include "base/gfx/point.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/views/tabs/hwnd_photobooth.h"
-#include "chrome/views/widget/widget_win.h"
 #include "skia/include/SkBitmap.h"
+#include "views/widget/widget_win.h"
 
 namespace {
 
diff --git a/chrome/browser/views/tabs/tab.cc b/chrome/browser/views/tabs/tab.cc
index f2193dc..3975604 100644
--- a/chrome/browser/views/tabs/tab.cc
+++ b/chrome/browser/views/tabs/tab.cc
@@ -9,10 +9,10 @@
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/gfx/size.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"
+#include "views/controls/menu/chrome_menu.h"
+#include "views/widget/tooltip_manager.h"
+#include "views/widget/widget.h"
 
 const std::string Tab::kTabClassName = "browser/tabs/Tab";
 
diff --git a/chrome/browser/views/tabs/tab_dragging_test.cc b/chrome/browser/views/tabs/tab_dragging_test.cc
index 94ea24d..18226a1 100644
--- a/chrome/browser/views/tabs/tab_dragging_test.cc
+++ b/chrome/browser/views/tabs/tab_dragging_test.cc
@@ -13,9 +13,9 @@
 #include "chrome/test/automation/browser_proxy.h"
 #include "chrome/test/automation/window_proxy.h"
 #include "chrome/test/ui/ui_test.h"
-#include "chrome/views/event.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/net_util.h"
+#include "views/event.h"
 
 
 class TabDraggingTest : public UITest {
diff --git a/chrome/browser/views/tabs/tab_renderer.cc b/chrome/browser/views/tabs/tab_renderer.cc
index ca69bdd..9bb88ae 100644
--- a/chrome/browser/views/tabs/tab_renderer.cc
+++ b/chrome/browser/views/tabs/tab_renderer.cc
@@ -15,12 +15,12 @@
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/tabs/tab_strip_model.h"
 #include "chrome/common/win_util.h"
-#include "chrome/views/widget/widget.h"
-#include "chrome/views/window/non_client_view.h"
-#include "chrome/views/window/window.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "skia/ext/image_operations.h"
+#include "views/widget/widget.h"
+#include "views/window/non_client_view.h"
+#include "views/window/window.h"
 
 static const int kLeftPadding = 16;
 static const int kTopPadding = 6;
diff --git a/chrome/browser/views/tabs/tab_renderer.h b/chrome/browser/views/tabs/tab_renderer.h
index 67c4639..f498c2a 100644
--- a/chrome/browser/views/tabs/tab_renderer.h
+++ b/chrome/browser/views/tabs/tab_renderer.h
@@ -9,9 +9,9 @@
 #include "app/slide_animation.h"
 #include "app/throb_animation.h"
 #include "base/gfx/point.h"
-#include "chrome/views/controls/button/image_button.h"
-#include "chrome/views/controls/menu/menu.h"
-#include "chrome/views/view.h"
+#include "views/controls/button/image_button.h"
+#include "views/controls/menu/menu.h"
+#include "views/view.h"
 
 class TabContents;
 
diff --git a/chrome/browser/views/tabs/tab_strip.cc b/chrome/browser/views/tabs/tab_strip.cc
index 5f41cc8..365e000 100644
--- a/chrome/browser/views/tabs/tab_strip.cc
+++ b/chrome/browser/views/tabs/tab_strip.cc
@@ -23,12 +23,12 @@
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/win_util.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"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
+#include "views/controls/image_view.h"
+#include "views/painter.h"
+#include "views/window/non_client_view.h"
+#include "views/window/window.h"
 
 #undef min
 #undef max
diff --git a/chrome/browser/views/tabs/tab_strip.h b/chrome/browser/views/tabs/tab_strip.h
index 8e10b5e..1c52a45 100644
--- a/chrome/browser/views/tabs/tab_strip.h
+++ b/chrome/browser/views/tabs/tab_strip.h
@@ -8,10 +8,10 @@
 #include "base/gfx/point.h"
 #include "chrome/browser/tabs/tab_strip_model.h"
 #include "chrome/browser/views/tabs/tab.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"
+#include "views/controls/button/image_button.h"
+#include "views/controls/menu/menu.h"
+#include "views/view.h"
+#include "views/widget/widget_win.h"
 
 class DraggedTabController;
 class ScopedMouseCloseWidthCalculator;
diff --git a/chrome/browser/views/toolbar_star_toggle.h b/chrome/browser/views/toolbar_star_toggle.h
index efd3bd3..f63cffc7 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/controls/button/image_button.h"
+#include "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 6d0f02b..f4657eb 100644
--- a/chrome/browser/views/toolbar_view.cc
+++ b/chrome/browser/views/toolbar_view.cc
@@ -42,17 +42,17 @@
 #ifdef CHROME_PERSONALIZATION
 #include "chrome/personalization/personalization.h"
 #endif
-#include "chrome/views/background.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"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "net/base/net_util.h"
+#include "views/background.h"
+#include "views/controls/button/button_dropdown.h"
+#include "views/controls/hwnd_view.h"
+#include "views/controls/label.h"
+#include "views/widget/tooltip_manager.h"
+#include "views/window/non_client_view.h"
+#include "views/window/window.h"
 
 static const int kControlHorizOffset = 4;
 static const int kControlVertOffset = 6;
diff --git a/chrome/browser/views/toolbar_view.h b/chrome/browser/views/toolbar_view.h
index ca2502a..c5a9f83 100644
--- a/chrome/browser/views/toolbar_view.h
+++ b/chrome/browser/views/toolbar_view.h
@@ -18,10 +18,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/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 "views/controls/button/menu_button.h"
+#include "views/controls/menu/menu.h"
+#include "views/controls/menu/view_menu_delegate.h"
+#include "views/view.h"
 
 class Browser;
 class Profile;
diff --git a/chrome/browser/views/uninstall_dialog.cc b/chrome/browser/views/uninstall_dialog.cc
index f9b2c04..f54fbc8 100644
--- a/chrome/browser/views/uninstall_dialog.cc
+++ b/chrome/browser/views/uninstall_dialog.cc
@@ -8,9 +8,9 @@
 #include "app/message_box_flags.h"
 #include "base/message_loop.h"
 #include "chrome/common/result_codes.h"
-#include "chrome/views/controls/message_box_view.h"
-#include "chrome/views/window/window.h"
 #include "grit/chromium_strings.h"
+#include "views/controls/message_box_view.h"
+#include "views/window/window.h"
 
 // static
 void UninstallDialog::ShowUninstallDialog(int& user_selection) {
diff --git a/chrome/browser/views/uninstall_dialog.h b/chrome/browser/views/uninstall_dialog.h
index bf9a6c9..6987cb2 100644
--- a/chrome/browser/views/uninstall_dialog.h
+++ b/chrome/browser/views/uninstall_dialog.h
@@ -6,7 +6,7 @@
 #define CHROME_BROWSER_VIEWS_UNINSTALL_DIALOG_H_
 
 #include "base/basictypes.h"
-#include "chrome/views/window/dialog_delegate.h"
+#include "views/window/dialog_delegate.h"
 
 class MessageBoxView;
 
diff --git a/chrome/browser/views/user_data_dir_dialog.cc b/chrome/browser/views/user_data_dir_dialog.cc
index 00aef5f..c6b17f3 100644
--- a/chrome/browser/views/user_data_dir_dialog.cc
+++ b/chrome/browser/views/user_data_dir_dialog.cc
@@ -6,11 +6,11 @@
 #include "app/message_box_flags.h"
 #include "base/logging.h"
 #include "chrome/browser/views/user_data_dir_dialog.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"
 #include "grit/generated_resources.h"
+#include "views/controls/message_box_view.h"
+#include "views/widget/widget.h"
+#include "views/window/window.h"
 
 // static
 std::wstring UserDataDirDialog::RunUserDataDirDialog(
diff --git a/chrome/browser/views/user_data_dir_dialog.h b/chrome/browser/views/user_data_dir_dialog.h
index 7408132..5e658c23 100644
--- a/chrome/browser/views/user_data_dir_dialog.h
+++ b/chrome/browser/views/user_data_dir_dialog.h
@@ -11,7 +11,7 @@
 #include "base/basictypes.h"
 #include "base/message_loop.h"
 #include "chrome/browser/shell_dialogs.h"
-#include "chrome/views/window/dialog_delegate.h"
+#include "views/window/dialog_delegate.h"
 
 class MessageBoxView;
 namespace views {