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

chrome/DEPS

@@ -2,6 +2,7 @@ include_rules = [
   "+app",
   "+net",
   "+printing",
+  "+views",
 
   # The subdirectories in chrome/ will manually allow their own include
   # directories in chrome/ so we disallow all of them.

chrome/browser/app_modal_dialog_win.cc

@@ -6,7 +6,7 @@
 
 #include "base/logging.h"
 #include "chrome/browser/views/jsmessage_box_dialog.h"
-#include "chrome/views/window/window.h"
+#include "views/window/window.h"
 
 AppModalDialog::~AppModalDialog() {
 }

chrome/browser/autocomplete/autocomplete_accessibility.cc

@@ -7,9 +7,9 @@
 #include "app/l10n_util.h"
 #include "chrome/browser/autocomplete/autocomplete_edit.h"
 #include "chrome/browser/autocomplete/autocomplete_edit_view_win.h"
-#include "chrome/views/accessibility/view_accessibility_wrapper.h"
-#include "chrome/views/view.h"
 #include "grit/generated_resources.h"
+#include "views/accessibility/view_accessibility_wrapper.h"
+#include "views/view.h"
 
 HRESULT AutocompleteAccessibility::Initialize(
     const AutocompleteEditViewWin* edit_box) {

chrome/browser/autocomplete/autocomplete_edit_view_win.cc

@@ -37,10 +37,10 @@
 #include "chrome/common/gfx/utils.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/win_util.h"
-#include "chrome/views/focus/focus_util_win.h"
 #include "googleurl/src/url_util.h"
 #include "grit/generated_resources.h"
 #include "skia/ext/skia_utils_win.h"
+#include "views/focus/focus_util_win.h"
 
 #pragma comment(lib, "oleacc.lib")  // Needed for accessibility support.
 

chrome/browser/autocomplete/autocomplete_edit_view_win.h

@@ -19,7 +19,7 @@
 #include "chrome/browser/toolbar_model.h"
 #include "chrome/browser/views/autocomplete/autocomplete_popup_contents_view.h"
 #include "chrome/common/page_transition_types.h"
-#include "chrome/views/controls/menu/menu.h"
+#include "views/controls/menu/menu.h"
 #include "webkit/glue/window_open_disposition.h"
 
 class AutocompletePopupModel;

chrome/browser/autocomplete/autocomplete_popup_view_win.cc

@@ -30,9 +30,9 @@
 #include "chrome/browser/views/location_bar_view.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/notification_service.h"
-#include "chrome/views/view.h"
 #include "grit/theme_resources.h"
 #include "third_party/icu38/public/common/unicode/ubidi.h"
+#include "views/view.h"
 
 // Padding between text and the star indicator, in pixels.
 static const int kStarPadding = 4;

chrome/browser/automation/automation_provider.cc

@@ -50,8 +50,8 @@
 
 #if defined(OS_WIN)
 #include "chrome/browser/views/bookmark_bar_view.h"
-#include "chrome/views/widget/widget_win.h"
-#include "chrome/views/window/window.h"
+#include "views/widget/widget_win.h"
+#include "views/window/window.h"
 #endif
 
 using base::Time;

chrome/browser/automation/automation_provider.h

@@ -27,7 +27,7 @@
 #include "chrome/common/ipc_sync_channel.h"
 #include "chrome/common/notification_observer.h"
 #include "chrome/test/automation/automation_messages.h"
-#include "chrome/views/event.h"
+#include "views/event.h"
 
 #if defined(OS_WIN)
 // TODO(port): enable these.

chrome/browser/automation/ui_controls.cc

@@ -8,7 +8,7 @@
 #include "base/message_loop.h"
 #include "base/ref_counted.h"
 #include "base/task.h"
-#include "chrome/views/view.h"
+#include "views/view.h"
 
 namespace ui_controls {
 

chrome/browser/back_forward_menu_model_win.h

@@ -8,7 +8,7 @@
 #include "base/basictypes.h"
 
 #include "chrome/browser/back_forward_menu_model.h"
-#include "chrome/views/controls/menu/menu.h"
+#include "views/controls/menu/menu.h"
 
 class SkBitmap;
 

chrome/browser/bookmarks/bookmark_context_menu.cc

@@ -23,7 +23,7 @@
 #if defined(OS_WIN)
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/views/bookmark_manager_view.h"
-#include "chrome/views/window/window.h"
+#include "views/window/window.h"
 #endif
 
 namespace {

chrome/browser/bookmarks/bookmark_context_menu.h

@@ -13,7 +13,7 @@
 
 // TODO(port): Port this file.
 #if defined(OS_WIN)
-#include "chrome/views/controls/menu/chrome_menu.h"
+#include "views/controls/menu/chrome_menu.h"
 #elif defined(OS_LINUX)
 #include "chrome/browser/gtk/menu_gtk.h"
 #else

chrome/browser/bookmarks/bookmark_drop_info.cc

@@ -9,8 +9,8 @@
 #endif
 
 #include "base/basictypes.h"
-#include "chrome/views/event.h"
-#include "chrome/views/view_constants.h"
+#include "views/event.h"
+#include "views/view_constants.h"
 
 BookmarkDropInfo::BookmarkDropInfo(gfx::NativeWindow wnd, int top_margin)
     : source_operations_(0),

chrome/browser/bookmarks/bookmark_folder_tree_model.h

@@ -6,7 +6,7 @@
 #define CHROME_BROWSER_BOOKMARKS_BOOKMARK_FOLDER_TREE_MODEL_H_
 
 #include "chrome/browser/bookmarks/bookmark_model.h"
-#include "chrome/views/controls/tree/tree_node_model.h"
+#include "views/controls/tree/tree_node_model.h"
 
 // The type of nodes created by BookmarkFolderTreeModel.
 typedef views::TreeNodeWithValue<BookmarkNode*> FolderNode;

chrome/browser/bookmarks/bookmark_folder_tree_model_unittest.cc

@@ -5,9 +5,9 @@
 #include "base/string_util.h"
 #include "chrome/browser/bookmarks/bookmark_folder_tree_model.h"
 #include "chrome/test/testing_profile.h"
-#include "chrome/views/controls/tree/tree_view.h"
 #include "grit/generated_resources.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "views/controls/tree/tree_view.h"
 
 // Base class for bookmark model tests.
 // Initial state of the bookmark model is as follows:

chrome/browser/bookmarks/bookmark_menu_controller_win.h

@@ -10,7 +10,7 @@
 #include "chrome/browser/bookmarks/base_bookmark_model_observer.h"
 #include "chrome/browser/bookmarks/bookmark_context_menu.h"
 #include "chrome/browser/bookmarks/bookmark_drag_data.h"
-#include "chrome/views/controls/menu/chrome_menu.h"
+#include "views/controls/menu/chrome_menu.h"
 
 class BookmarkContextMenu;
 class BookmarkNode;

chrome/browser/bookmarks/bookmark_model.h

@@ -19,10 +19,10 @@
 #include "chrome/browser/history/history.h"
 #include "chrome/browser/history/history_types.h"
 #include "chrome/common/notification_observer.h"
-#include "chrome/views/controls/tree/tree_node_model.h"
 #include "googleurl/src/gurl.h"
 #include "skia/include/SkBitmap.h"
 #include "testing/gtest/include/gtest/gtest_prod.h"
+#include "views/controls/tree/tree_node_model.h"
 
 class BookmarkEditorView;
 class BookmarkModel;

chrome/browser/bookmarks/bookmark_model_unittest.cc

@@ -11,8 +11,8 @@
 #include "chrome/common/notification_registrar.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/test/testing_profile.h"
-#include "chrome/views/controls/tree/tree_node_model.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "views/controls/tree/tree_node_model.h"
 
 using base::Time;
 using base::TimeDelta;

chrome/browser/bookmarks/bookmark_table_model.h

@@ -10,7 +10,7 @@
 #include "build/build_config.h"
 
 #if defined(OS_WIN)
-#include "chrome/views/controls/table/table_view.h"
+#include "views/controls/table/table_view.h"
 #elif defined(OS_POSIX)
 #include "chrome/common/temp_scaffolding_stubs.h"
 #endif

chrome/browser/bookmarks/bookmark_utils.cc

@@ -26,10 +26,10 @@
 #include "chrome/common/notification_service.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
-#include "chrome/views/controls/tree/tree_node_iterator.h"
-#include "chrome/views/event.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
+#include "views/controls/tree/tree_node_iterator.h"
+#include "views/event.h"
 
 using base::Time;
 

chrome/browser/browser_focus_uitest.cc

@@ -12,11 +12,11 @@
 #include "chrome/browser/views/frame/browser_view.h"
 #include "chrome/browser/views/location_bar_view.h"
 #include "chrome/common/chrome_paths.h"
-#include "chrome/views/focus/focus_manager.h"
-#include "chrome/views/view.h"
-#include "chrome/views/window/window.h"
 #include "chrome/test/in_process_browser_test.h"
 #include "chrome/test/ui_test_utils.h"
+#include "views/focus/focus_manager.h"
+#include "views/view.h"
+#include "views/window/window.h"
 
 namespace {
 

chrome/browser/browser_main.cc

@@ -89,12 +89,12 @@
 #include "chrome/installer/util/install_util.h"
 #include "chrome/installer/util/shell_util.h"
 #include "chrome/installer/util/version.h"
-#include "chrome/views/widget/accelerator_handler.h"
 #include "net/base/net_util.h"
 #include "net/base/sdch_manager.h"
 #include "net/base/winsock_init.h"
 #include "net/http/http_network_layer.h"
 #include "sandbox/src/sandbox.h"
+#include "views/widget/accelerator_handler.h"
 
 #endif  // defined(OS_WIN)
 

chrome/browser/browser_main_win.cc

@@ -23,11 +23,11 @@
 #include "chrome/installer/util/helper.h"
 #include "chrome/installer/util/install_util.h"
 #include "chrome/installer/util/shell_util.h"
-#include "chrome/views/controls/message_box_view.h"
-#include "chrome/views/widget/accelerator_handler.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/accelerator_handler.h"
+#include "views/window/window.h"
 
 // Displays a warning message if the user is running chrome on windows 2000.
 // Returns true if the OS is win2000, false otherwise.

chrome/browser/browser_process_impl.cc

@@ -34,8 +34,8 @@
 #include "chrome/browser/automation/automation_provider_list.h"
 #include "chrome/browser/icon_manager.h"
 #include "chrome/browser/printing/print_job_manager.h"
-#include "chrome/views/focus/view_storage.h"
-#include "chrome/views/widget/accelerator_handler.h"
+#include "views/focus/view_storage.h"
+#include "views/widget/accelerator_handler.h"
 #elif defined(OS_POSIX)
 // TODO(port): Remove the temporary scaffolding as we port the above headers.
 #include "chrome/common/temp_scaffolding_stubs.h"

chrome/browser/debugger/debugger_view.cc

@@ -22,13 +22,12 @@
 #include "chrome/browser/views/standard_layout.h"
 #include "chrome/browser/views/tab_contents_container_view.h"
 #include "chrome/common/url_constants.h"
-#include "chrome/views/grid_layout.h"
-#include "chrome/views/controls/scrollbar/native_scroll_bar.h"
-#include "chrome/views/controls/scroll_view.h"
-#include "chrome/views/controls/text_field.h"
-#include "chrome/views/view.h"
-
 #include "grit/debugger_resources.h"
+#include "views/grid_layout.h"
+#include "views/controls/scrollbar/native_scroll_bar.h"
+#include "views/controls/scroll_view.h"
+#include "views/controls/text_field.h"
+#include "views/view.h"
 
 DebuggerView::DebuggerView(DebuggerWindow* window)
     : window_(window), output_ready_(false) {

chrome/browser/debugger/debugger_view.h

@@ -12,8 +12,8 @@
 
 #include "base/gfx/size.h"
 #include "chrome/browser/tab_contents/tab_contents_delegate.h"
-#include "chrome/views/view.h"
-#include "chrome/views/controls/text_field.h"
+#include "views/view.h"
+#include "views/controls/text_field.h"
 
 class DebuggerView;
 class DebuggerWindow;

chrome/browser/debugger/debugger_window.h

@@ -6,8 +6,8 @@
 #define CHROME_BROWSER_DEBUGGER_DEBUGGER_WINDOW_H__
 
 #include "chrome/browser/debugger/debugger_io.h"
-#include "chrome/views/window/window.h"
-#include "chrome/views/window/window_delegate.h"
+#include "views/window/window.h"
+#include "views/window/window_delegate.h"
 
 class DebuggerView;
 class ListValue;

chrome/browser/debugger/devtools_view.h

@@ -10,7 +10,7 @@
 #include "base/basictypes.h"
 #include "base/gfx/size.h"
 #include "chrome/browser/tab_contents/tab_contents_delegate.h"
-#include "chrome/views/view.h"
+#include "views/view.h"
 
 namespace IPC {
 class Message;

chrome/browser/debugger/devtools_window_win.cc

@@ -8,7 +8,7 @@
 #include "chrome/browser/debugger/devtools_manager.h"
 #include "chrome/browser/debugger/devtools_view.h"
 #include "chrome/browser/debugger/devtools_window.h"
-#include "chrome/views/window/window.h"
+#include "views/window/window.h"
 #include "grit/generated_resources.h"
 
 // static

chrome/browser/debugger/devtools_window_win.h

@@ -7,7 +7,7 @@
 
 #include "base/basictypes.h"
 #include "chrome/browser/debugger/devtools_window.h"
-#include "chrome/views/window/window_delegate.h"
+#include "views/window/window_delegate.h"
 
 namespace views {
 class Window;

chrome/browser/download/download_request_dialog_delegate_win.cc

@@ -8,8 +8,8 @@
 #include "app/message_box_flags.h"
 #include "chrome/browser/tab_contents/constrained_window.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
-#include "chrome/views/controls/message_box_view.h"
 #include "grit/generated_resources.h"
+#include "views/controls/message_box_view.h"
 
 // static
 DownloadRequestDialogDelegate* DownloadRequestDialogDelegate::Create(

chrome/browser/download/download_request_dialog_delegate_win.h

@@ -9,7 +9,7 @@
 
 #include "chrome/browser/download/download_request_dialog_delegate.h"
 #include "chrome/browser/download/download_request_manager.h"
-#include "chrome/views/window/dialog_delegate.h"
+#include "views/window/dialog_delegate.h"
 
 class ConstrainedWindow;
 class MessageBoxView;

chrome/browser/download/download_util.cc

@@ -20,13 +20,13 @@
 #include "chrome/browser/download/download_item_model.h"
 #include "chrome/browser/download/download_manager.h"
 #include "chrome/browser/drag_utils.h"
-#include "chrome/views/view.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
 #include "grit/theme_resources.h"
 #include "skia/ext/image_operations.h"
-#include "SkPath.h"
-#include "SkShader.h"
+#include "skia/include/SkPath.h"
+#include "skia/include/SkShader.h"
+#include "views/view.h"
 
 namespace download_util {
 

chrome/browser/download/download_util.h

@@ -14,9 +14,9 @@
 
 #include "base/basictypes.h"
 #include "base/task.h"
-#include "chrome/views/controls/menu/menu.h"
-#include "chrome/views/event.h"
-#include "chrome/views/view.h"
+#include "views/controls/menu/menu.h"
+#include "views/event.h"
+#include "views/view.h"
 
 class BaseDownloadItemModel;
 class DownloadItem;

chrome/browser/drag_utils.cc

@@ -19,9 +19,9 @@
 #include "base/string_util.h"
 #include "chrome/browser/views/bookmark_bar_view.h"
 #include "chrome/common/win_util.h"
-#include "chrome/views/controls/button/text_button.h"
 #include "googleurl/src/gurl.h"
 #include "grit/theme_resources.h"
+#include "views/controls/button/text_button.h"
 
 namespace drag_utils {
 

chrome/browser/encoding_menu_controller_delegate.h

@@ -5,7 +5,7 @@
 #ifndef CHORME_BROWSER_ENCODING_MENU_CONTROLLER_DELEGATE_H__
 #define CHORME_BROWSER_ENCODING_MENU_CONTROLLER_DELEGATE_H__
 
-#include "chrome/views/controls/menu/menu.h"
+#include "views/controls/menu/menu.h"
 
 class Browser;
 class Controller;

chrome/browser/extensions/extension_shelf.h

@@ -8,7 +8,7 @@
 #include "chrome/browser/extensions/extensions_service.h"
 #include "app/gfx/chrome_canvas.h"
 #include "chrome/common/notification_observer.h"
-#include "chrome/views/view.h"
+#include "views/view.h"
 
 class Browser;
 

chrome/browser/extensions/extension_view.cc

@@ -7,11 +7,10 @@
 #include "chrome/browser/extensions/extension_host.h"
 #include "chrome/browser/renderer_host/render_view_host.h"
 #include "chrome/browser/renderer_host/render_widget_host_view.h"
-#include "chrome/views/widget/widget.h"
-
 #if defined(OS_WIN)
 #include "chrome/browser/renderer_host/render_widget_host_view_win.h"
 #endif
+#include "views/widget/widget.h"
 
 ExtensionView::ExtensionView(ExtensionHost* host, Browser* browser,
                              const GURL& content_url)

chrome/browser/extensions/extension_view.h

@@ -14,9 +14,9 @@
 
 // TODO(port): Port these files.
 #if defined(OS_WIN)
-#include "chrome/views/controls/hwnd_view.h"
+#include "views/controls/hwnd_view.h"
 #else
-#include "chrome/views/view.h"
+#include "views/view.h"
 #include "chrome/common/temp_scaffolding_stubs.h"
 #endif
 

chrome/browser/external_tab_container.cc

@@ -16,9 +16,9 @@
 #include "chrome/browser/views/tab_contents_container_view.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/win_util.h"
-// Included for SetRootViewForHWND.
-#include "chrome/views/widget/widget_win.h"
 #include "chrome/test/automation/automation_messages.h"
+// Included for SetRootViewForHWND.
+#include "views/widget/widget_win.h"
 
 static const wchar_t kWindowObjectKey[] = L"ChromeWindowObject";
 

chrome/browser/external_tab_container.h

@@ -16,9 +16,9 @@
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/notification_observer.h"
 #include "chrome/common/notification_registrar.h"
-#include "chrome/views/focus/focus_manager.h"
-#include "chrome/views/widget/root_view.h"
-#include "chrome/views/widget/widget.h"
+#include "views/focus/focus_manager.h"
+#include "views/widget/root_view.h"
+#include "views/widget/widget.h"
 
 class AutomationProvider;
 class TabContents;

chrome/browser/first_run.cc

@@ -43,13 +43,10 @@
 #include "chrome/installer/util/master_preferences.h"
 #include "chrome/installer/util/shell_util.h"
 #include "chrome/installer/util/util_constants.h"
-#include "chrome/views/widget/accelerator_handler.h"
-#include "chrome/views/window/window.h"
-
 #include "google_update_idl.h"
-
 #include "grit/locale_settings.h"
-
+#include "views/widget/accelerator_handler.h"
+#include "views/window/window.h"
 
 namespace {
 

chrome/browser/google_update.cc

@@ -18,7 +18,7 @@
 #include "chrome/installer/util/google_update_constants.h"
 #include "chrome/installer/util/helper.h"
 #include "chrome/installer/util/install_util.h"
-#include "chrome/views/window/window.h"
+#include "views/window/window.h"
 #include "google_update_idl_i.c"
 
 using views::Window;

chrome/browser/history/starred_url_database.h

@@ -12,8 +12,8 @@
 #include "base/file_path.h"
 #include "chrome/browser/history/history_types.h"
 #include "chrome/browser/history/url_database.h"
-#include "chrome/views/controls/tree/tree_node_model.h"
 #include "testing/gtest/include/gtest/gtest_prod.h"
+#include "views/controls/tree/tree_node_model.h"
 
 struct sqlite3;
 class SqliteStatementCache;

chrome/browser/importer/importer.cc

@@ -40,7 +40,7 @@
 #if defined(OS_WIN)
 #include "chrome/browser/views/importer_lock_view.h"
 #include "chrome/common/win_util.h"
-#include "chrome/views/window/window.h"
+#include "views/window/window.h"
 #endif
 
 // ProfileWriter.

chrome/browser/input_window_dialog_win.cc

@@ -8,11 +8,11 @@
 #include "base/message_loop.h"
 #include "base/task.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/window/dialog_delegate.h"
-#include "chrome/views/window/window.h"
+#include "views/grid_layout.h"
+#include "views/controls/label.h"
+#include "views/controls/text_field.h"
+#include "views/window/dialog_delegate.h"
+#include "views/window/window.h"
 #include "grit/generated_resources.h"
 
 // Width to make the text field, in pixels.

chrome/browser/login_prompt.cc

@@ -19,10 +19,10 @@
 #include "chrome/browser/views/login_view.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/notification_service.h"
-#include "chrome/views/window/dialog_delegate.h"
 #include "grit/generated_resources.h"
 #include "net/base/auth.h"
 #include "net/url_request/url_request.h"
+#include "views/window/dialog_delegate.h"
 
 using namespace std;
 using views::LoginView;

chrome/browser/renderer_host/render_widget_host.cc

@@ -13,7 +13,7 @@
 #include "chrome/browser/renderer_host/render_widget_host_view.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/render_messages.h"
-#include "chrome/views/view.h"
+#include "views/view.h"
 #include "webkit/glue/webcursor.h"
 #include "webkit/glue/webtextdirection.h"
 

chrome/browser/renderer_host/render_widget_host_view_win.cc

@@ -27,13 +27,13 @@
 #include "chrome/common/plugin_messages.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/common/win_util.h"
-#include "chrome/views/focus/focus_util_win.h"
-// Included for views::kReflectedMessage - TODO(beng): move this to win_util.h!
-#include "chrome/views/widget/widget_win.h"
 #include "grit/webkit_resources.h"
 #include "skia/ext/skia_utils_win.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebInputEvent.h"
 #include "third_party/WebKit/WebKit/chromium/public/win/WebInputEventFactory.h"
+#include "views/focus/focus_util_win.h"
+// Included for views::kReflectedMessage - TODO(beng): move this to win_util.h!
+#include "views/widget/widget_win.h"
 #include "webkit/glue/plugins/plugin_constants_win.h"
 #include "webkit/glue/plugins/webplugin_delegate_impl.h"
 #include "webkit/glue/webcursor.h"

chrome/browser/ssl/ssl_manager.cc

@@ -34,7 +34,7 @@
 #if defined(OS_WIN)
 // TODO(port): Port these files.
 #include "chrome/browser/load_notification_details.h"
-#include "chrome/views/controls/link.h"
+#include "views/controls/link.h"
 #else
 #include "chrome/common/temp_scaffolding_stubs.h"
 #endif

chrome/browser/tab_contents/interstitial_page.cc

@@ -16,9 +16,9 @@
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/tab_contents/tab_contents_view.h"
 #include "chrome/common/notification_service.h"
-#include "chrome/views/window/window_delegate.h"
 #include "grit/browser_resources.h"
 #include "net/base/escape.h"
+#include "views/window/window_delegate.h"
 
 namespace {
 

chrome/browser/tab_contents/render_view_context_menu_win.h

@@ -6,8 +6,8 @@
 #define CHROME_BROWSER_TAB_CONTENTS_RENDER_VIEW_CONTEXT_MENU_WIN_H_
 
 #include "chrome/browser/tab_contents/render_view_context_menu.h"
-#include "chrome/views/accelerator.h"
-#include "chrome/views/controls/menu/menu.h"
+#include "views/accelerator.h"
+#include "views/controls/menu/menu.h"
 
 class RenderViewContextMenuWin : public RenderViewContextMenu,
                                  public Menu::Delegate{

chrome/browser/tab_contents/tab_contents.cc

@@ -56,7 +56,7 @@
 #include "chrome/browser/tab_contents/infobar_delegate.h"
 #include "chrome/browser/views/blocked_popup_container.h"
 #include "chrome/browser/views/download_started_animation.h"
-#include "chrome/views/controls/scrollbar/native_scroll_bar.h"
+#include "views/controls/scrollbar/native_scroll_bar.h"
 #endif
 
 // Cross-Site Navigations

chrome/browser/tab_contents/tab_contents_view_win.cc

@@ -24,9 +24,9 @@
 #include "chrome/browser/tab_contents/web_drop_target.h"
 #include "chrome/browser/views/sad_tab_view.h"
 #include "chrome/common/url_constants.h"
-#include "chrome/views/focus/view_storage.h"
-#include "chrome/views/widget/root_view.h"
 #include "net/base/net_util.h"
+#include "views/focus/view_storage.h"
+#include "views/widget/root_view.h"
 #include "webkit/glue/plugins/webplugin_delegate_impl.h"
 #include "webkit/glue/webdropdata.h"
 

chrome/browser/tab_contents/tab_contents_view_win.h

@@ -8,7 +8,7 @@
 #include "base/gfx/size.h"
 #include "base/scoped_ptr.h"
 #include "chrome/browser/tab_contents/tab_contents_view.h"
-#include "chrome/views/widget/widget_win.h"
+#include "views/widget/widget_win.h"
 
 class SadTabView;
 struct WebDropData;

chrome/browser/task_manager.cc

@@ -18,19 +18,19 @@
 #include "chrome/browser/views/standard_layout.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
-#include "chrome/views/accelerator.h"
-#include "chrome/views/background.h"
-#include "chrome/views/controls/button/native_button.h"
-#include "chrome/views/controls/link.h"
-#include "chrome/views/controls/menu/menu.h"
-#include "chrome/views/widget/widget.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 "net/url_request/url_request.h"
 #include "net/url_request/url_request_job.h"
+#include "views/accelerator.h"
+#include "views/background.h"
+#include "views/controls/button/native_button.h"
+#include "views/controls/link.h"
+#include "views/controls/menu/menu.h"
+#include "views/widget/widget.h"
+#include "views/window/dialog_delegate.h"
+#include "views/window/window.h"
 
 // The task manager window default size.
 static const int kDefaultWidth = 460;

chrome/browser/task_manager.h

@@ -19,7 +19,7 @@
 #include "chrome/browser/tab_contents/tab_contents.h"
 #if defined(OS_WIN)
 // TODO(port): Port or produce equivalent.
-#include "chrome/views/controls/table/group_table_view.h"
+#include "views/controls/table/group_table_view.h"
 #endif  // defined(OS_WIN)
 #include "net/url_request/url_request_job_tracker.h"
 #include "testing/gtest/include/gtest/gtest_prod.h"

chrome/browser/task_manager_unittest.cc

@@ -6,10 +6,10 @@
 
 #include <string>
 
-#include "chrome/views/controls/table/table_view.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "views/controls/table/table_view.h"
 
 namespace {
 

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 {

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;

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 {
 

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)
 

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 {
 

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;

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 =

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;

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;

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);

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);

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;

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;

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 {
 

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;

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;
 

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;

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;

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();

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;

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

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;

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),

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;

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 {
 

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;

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;

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;

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;

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;

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;
 

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;

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:

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;

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;
 

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;

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.

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;

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;

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;

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;

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;