views: Move view.h to ui/views/.

BUG=104039
R=ben@chromium.org
TBR=stevenjb@chromium.org

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

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

191 files changed, 202 insertions, 201 deletions

diff --git a/chrome/browser/automation/testing_automation_provider_views.cc b/chrome/browser/automation/testing_automation_provider_views.cc
index fae5cfe..d5cd60fa 100644
--- a/chrome/browser/automation/testing_automation_provider_views.cc
+++ b/chrome/browser/automation/testing_automation_provider_views.cc
@@ -15,8 +15,8 @@
 #include "chrome/common/automation_messages.h"
 #include "ui/gfx/point.h"
 #include "ui/views/controls/menu/menu_listener.h"
+#include "ui/views/view.h"
 #include "ui/views/widget/widget.h"
-#include "views/view.h"
 
 namespace {
 
diff --git a/chrome/browser/automation/ui_controls_aurawin.cc b/chrome/browser/automation/ui_controls_aurawin.cc
index d23b3e7..50e5f87 100644
--- a/chrome/browser/automation/ui_controls_aurawin.cc
+++ b/chrome/browser/automation/ui_controls_aurawin.cc
@@ -7,7 +7,7 @@
 #include "base/logging.h"
 #include "chrome/browser/automation/ui_controls_internal.h"
 #include "ui/aura/desktop.h"
-#include "views/view.h"
+#include "ui/views/view.h"
 
 namespace ui_controls {
 
diff --git a/chrome/browser/automation/ui_controls_aurax11.cc b/chrome/browser/automation/ui_controls_aurax11.cc
index 43bc219c..1ab2747 100644
--- a/chrome/browser/automation/ui_controls_aurax11.cc
+++ b/chrome/browser/automation/ui_controls_aurax11.cc
@@ -13,7 +13,7 @@
 #include "chrome/browser/automation/ui_controls_internal.h"
 #include "ui/aura/desktop.h"
 #include "ui/base/keycodes/keyboard_code_conversion_x.h"
-#include "views/view.h"
+#include "ui/views/view.h"
 
 namespace {
 
diff --git a/chrome/browser/automation/ui_controls_gtk.cc b/chrome/browser/automation/ui_controls_gtk.cc
index 1422031..32e3100 100644
--- a/chrome/browser/automation/ui_controls_gtk.cc
+++ b/chrome/browser/automation/ui_controls_gtk.cc
@@ -17,8 +17,8 @@
 #include "ui/gfx/rect.h"
 
 #if defined(TOOLKIT_VIEWS)
+#include "ui/views/view.h"
 #include "ui/views/widget/widget.h"
-#include "views/view.h"
 #endif
 
 namespace {
diff --git a/chrome/browser/automation/ui_controls_win.cc b/chrome/browser/automation/ui_controls_win.cc
index 62b98609..5d2c873 100644
--- a/chrome/browser/automation/ui_controls_win.cc
+++ b/chrome/browser/automation/ui_controls_win.cc
@@ -7,7 +7,7 @@
 #include "base/callback.h"
 #include "chrome/browser/automation/ui_controls_internal.h"
 #include "ui/gfx/point.h"
-#include "views/view.h"
+#include "ui/views/view.h"
 
 namespace ui_controls {
 
diff --git a/chrome/browser/browser_focus_uitest.cc b/chrome/browser/browser_focus_uitest.cc
index dada7af..a71111c 100644
--- a/chrome/browser/browser_focus_uitest.cc
+++ b/chrome/browser/browser_focus_uitest.cc
@@ -32,7 +32,7 @@
 
 #if defined(TOOLKIT_VIEWS) || defined(OS_WIN)
 #include "ui/views/focus/focus_manager.h"
-#include "views/view.h"
+#include "ui/views/view.h"
 #endif
 
 #if defined(TOOLKIT_VIEWS)
diff --git a/chrome/browser/chromeos/brightness_bubble_browsertest.cc b/chrome/browser/chromeos/brightness_bubble_browsertest.cc
index 21e3e36..e6d837a 100644
--- a/chrome/browser/chromeos/brightness_bubble_browsertest.cc
+++ b/chrome/browser/chromeos/brightness_bubble_browsertest.cc
@@ -6,7 +6,7 @@
 #include "chrome/browser/chromeos/brightness_bubble.h"
 #include "chrome/browser/chromeos/setting_level_bubble_view.h"
 #include "chrome/test/base/in_process_browser_test.h"
-#include "views/view.h"
+#include "ui/views/view.h"
 
 typedef InProcessBrowserTest BrightnessBubbleTest;
 
diff --git a/chrome/browser/chromeos/choose_mobile_network_dialog.cc b/chrome/browser/chromeos/choose_mobile_network_dialog.cc
index 2886c6b..8dc4c30 100644
--- a/chrome/browser/chromeos/choose_mobile_network_dialog.cc
+++ b/chrome/browser/chromeos/choose_mobile_network_dialog.cc
@@ -11,8 +11,8 @@
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/views/html_dialog_view.h"
 #include "chrome/common/url_constants.h"
+#include "ui/views/view.h"
 #include "ui/views/widget/widget.h"
-#include "views/view.h"
 
 namespace {
 
diff --git a/chrome/browser/chromeos/frame/bubble_window.h b/chrome/browser/chromeos/frame/bubble_window.h
index 33de290..0405ebf 100644
--- a/chrome/browser/chromeos/frame/bubble_window.h
+++ b/chrome/browser/chromeos/frame/bubble_window.h
@@ -15,7 +15,7 @@
 // in a matter of days / crbug.com/98322.
 #include "ui/views/widget/native_widget_gtk.h"
 #else // TOOLKIT_USES_GTK
-#include "views/view.h"
+#include "ui/views/view.h"
 #endif
 
 namespace views {
diff --git a/chrome/browser/chromeos/frame/panel_controller.cc b/chrome/browser/chromeos/frame/panel_controller.cc
index fec051d..a410341 100644
--- a/chrome/browser/chromeos/frame/panel_controller.cc
+++ b/chrome/browser/chromeos/frame/panel_controller.cc
@@ -32,9 +32,9 @@
 #include "ui/views/controls/image_view.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/events/event.h"
+#include "ui/views/view.h"
 #include "ui/views/widget/widget.h"
 #include "views/painter.h"
-#include "views/view.h"
 
 #if defined(TOOLKIT_USES_GTK)
 #include "chrome/browser/chromeos/legacy_window_manager/wm_ipc.h"
diff --git a/chrome/browser/chromeos/input_method/candidate_window_view.h b/chrome/browser/chromeos/input_method/candidate_window_view.h
index 2ceaa86..fcbc758 100644
--- a/chrome/browser/chromeos/input_method/candidate_window_view.h
+++ b/chrome/browser/chromeos/input_method/candidate_window_view.h
@@ -6,7 +6,7 @@
 #define CHROME_BROWSER_CHROMEOS_INPUT_METHOD_CANDIDATE_WINDOW_VIEW_H_
 
 #include "chrome/browser/chromeos/input_method/ibus_ui_controller.h"
-#include "views/view.h"
+#include "ui/views/view.h"
 
 namespace chromeos {
 namespace input_method {
diff --git a/chrome/browser/chromeos/login/background_view.h b/chrome/browser/chromeos/login/background_view.h
index ba51784..03987dd 100644
--- a/chrome/browser/chromeos/login/background_view.h
+++ b/chrome/browser/chromeos/login/background_view.h
@@ -12,7 +12,7 @@
 #include "chrome/browser/chromeos/login/version_info_updater.h"
 #include "chrome/browser/chromeos/status/status_area_button.h"
 #include "chrome/browser/chromeos/status/status_area_view_chromeos.h"
-#include "views/view.h"
+#include "ui/views/view.h"
 
 class DOMView;
 class GURL;
diff --git a/chrome/browser/chromeos/login/helper.h b/chrome/browser/chromeos/login/helper.h
index 8766751..61b18e4 100644
--- a/chrome/browser/chromeos/login/helper.h
+++ b/chrome/browser/chromeos/login/helper.h
@@ -12,7 +12,7 @@
 #include "base/string16.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/views/controls/button/text_button.h"
-#include "views/view.h"
+#include "ui/views/view.h"
 
 class GURL;
 
diff --git a/chrome/browser/chromeos/login/language_switch_menu.h b/chrome/browser/chromeos/login/language_switch_menu.h
index fd6c3f4..30bf781 100644
--- a/chrome/browser/chromeos/login/language_switch_menu.h
+++ b/chrome/browser/chromeos/login/language_switch_menu.h
@@ -12,7 +12,7 @@
 #include "testing/gtest/include/gtest/gtest_prod.h"
 #include "ui/views/controls/menu/menu_delegate.h"
 #include "ui/views/controls/menu/view_menu_delegate.h"
-#include "views/view.h"
+#include "ui/views/view.h"
 
 class WizardControllerTest_SwitchLanguage_Test;
 
diff --git a/chrome/browser/chromeos/login/message_bubble.h b/chrome/browser/chromeos/login/message_bubble.h
index 2b28ac6..e506aab 100644
--- a/chrome/browser/chromeos/login/message_bubble.h
+++ b/chrome/browser/chromeos/login/message_bubble.h
@@ -13,6 +13,7 @@
 #include "ui/views/bubble/bubble_delegate.h"
 #include "ui/views/controls/button/button.h"
 #include "ui/views/controls/link_listener.h"
+#include "ui/views/view.h"
 
 class SkBitmap;
 
diff --git a/chrome/browser/chromeos/login/password_changed_view.h b/chrome/browser/chromeos/login/password_changed_view.h
index 8573c00..c520e9b 100644
--- a/chrome/browser/chromeos/login/password_changed_view.h
+++ b/chrome/browser/chromeos/login/password_changed_view.h
@@ -11,8 +11,8 @@
 #include "base/compiler_specific.h"
 #include "ui/views/controls/button/button.h"
 #include "ui/views/controls/textfield/textfield_controller.h"
+#include "ui/views/view.h"
 #include "ui/views/window/dialog_delegate.h"
-#include "views/view.h"
 
 namespace views {
 class Button;
diff --git a/chrome/browser/chromeos/login/screen_lock_view.h b/chrome/browser/chromeos/login/screen_lock_view.h
index 5f8aaf1..e98d718 100644
--- a/chrome/browser/chromeos/login/screen_lock_view.h
+++ b/chrome/browser/chromeos/login/screen_lock_view.h
@@ -12,7 +12,7 @@
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "ui/views/controls/textfield/textfield_controller.h"
-#include "views/view.h"
+#include "ui/views/view.h"
 
 namespace chromeos {
 
diff --git a/chrome/browser/chromeos/login/take_photo_view.h b/chrome/browser/chromeos/login/take_photo_view.h
index 781e079..f773dc3 100644
--- a/chrome/browser/chromeos/login/take_photo_view.h
+++ b/chrome/browser/chromeos/login/take_photo_view.h
@@ -8,7 +8,7 @@
 
 #include "base/compiler_specific.h"
 #include "ui/views/controls/button/button.h"
-#include "views/view.h"
+#include "ui/views/view.h"
 
 class PhotoCaptureObserver;
 class SkBitmap;
diff --git a/chrome/browser/chromeos/login/user_view.h b/chrome/browser/chromeos/login/user_view.h
index a9333de..043090b 100644
--- a/chrome/browser/chromeos/login/user_view.h
+++ b/chrome/browser/chromeos/login/user_view.h
@@ -10,7 +10,7 @@
 
 #include "ui/views/controls/button/button.h"
 #include "ui/views/controls/link_listener.h"
-#include "views/view.h"
+#include "ui/views/view.h"
 
 class SkBitmap;
 
diff --git a/chrome/browser/chromeos/login/web_page_view.h b/chrome/browser/chromeos/login/web_page_view.h
index 8f0c58d..ad9c10e 100644
--- a/chrome/browser/chromeos/login/web_page_view.h
+++ b/chrome/browser/chromeos/login/web_page_view.h
@@ -12,7 +12,7 @@
 #include "base/timer.h"
 #include "chrome/browser/ui/views/dom_view.h"
 #include "content/browser/tab_contents/tab_contents.h"
-#include "views/view.h"
+#include "ui/views/view.h"
 
 class Profile;
 class TabContentsDelegate;
diff --git a/chrome/browser/chromeos/login/wizard_accessibility_helper.cc b/chrome/browser/chromeos/login/wizard_accessibility_helper.cc
index df32693..e5c9dc2 100644
--- a/chrome/browser/chromeos/login/wizard_accessibility_helper.cc
+++ b/chrome/browser/chromeos/login/wizard_accessibility_helper.cc
@@ -19,7 +19,7 @@
 #include "grit/generated_resources.h"
 #include "ui/base/accelerators/accelerator.h"
 #include "ui/base/l10n/l10n_util.h"
-#include "views/view.h"
+#include "ui/views/view.h"
 
 namespace chromeos {
 
diff --git a/chrome/browser/chromeos/notifications/balloon_view.h b/chrome/browser/chromeos/notifications/balloon_view.h
index 552a4b9..3431c64 100644
--- a/chrome/browser/chromeos/notifications/balloon_view.h
+++ b/chrome/browser/chromeos/notifications/balloon_view.h
@@ -19,7 +19,7 @@
 #include "ui/gfx/point.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/size.h"
-#include "views/view.h"
+#include "ui/views/view.h"
 
 namespace views {
 class Widget;
diff --git a/chrome/browser/chromeos/options/vpn_config_view.h b/chrome/browser/chromeos/options/vpn_config_view.h
index 74ae431..a52f682 100644
--- a/chrome/browser/chromeos/options/vpn_config_view.h
+++ b/chrome/browser/chromeos/options/vpn_config_view.h
@@ -15,7 +15,7 @@
 #include "ui/views/controls/button/button.h"
 #include "ui/views/controls/combobox/combobox_listener.h"
 #include "ui/views/controls/textfield/textfield_controller.h"
-#include "views/view.h"
+#include "ui/views/view.h"
 
 namespace views {
 class Label;
diff --git a/chrome/browser/chromeos/options/wifi_config_view.h b/chrome/browser/chromeos/options/wifi_config_view.h
index c353324..b7ef2bc 100644
--- a/chrome/browser/chromeos/options/wifi_config_view.h
+++ b/chrome/browser/chromeos/options/wifi_config_view.h
@@ -18,7 +18,7 @@
 #include "ui/views/controls/button/button.h"
 #include "ui/views/controls/combobox/combobox_listener.h"
 #include "ui/views/controls/textfield/textfield_controller.h"
-#include "views/view.h"
+#include "ui/views/view.h"
 
 namespace views {
 class Checkbox;
diff --git a/chrome/browser/chromeos/panels/panel_scroller.h b/chrome/browser/chromeos/panels/panel_scroller.h
index 75834fb..ed02812 100644
--- a/chrome/browser/chromeos/panels/panel_scroller.h
+++ b/chrome/browser/chromeos/panels/panel_scroller.h
@@ -12,7 +12,7 @@
 #include "base/compiler_specific.h"
 #include "ui/base/animation/animation_delegate.h"
 #include "ui/base/animation/slide_animation.h"
-#include "views/view.h"
+#include "ui/views/view.h"
 
 class PanelScrollerHeader;
 
diff --git a/chrome/browser/chromeos/panels/panel_scroller_container.h b/chrome/browser/chromeos/panels/panel_scroller_container.h
index 57c7983..01de62f 100644
--- a/chrome/browser/chromeos/panels/panel_scroller_container.h
+++ b/chrome/browser/chromeos/panels/panel_scroller_container.h
@@ -8,7 +8,7 @@
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
-#include "views/view.h"
+#include "ui/views/view.h"
 
 class PanelScroller;
 
diff --git a/chrome/browser/chromeos/panels/panel_scroller_header.h b/chrome/browser/chromeos/panels/panel_scroller_header.h
index de2c682..5a154e5 100644
--- a/chrome/browser/chromeos/panels/panel_scroller_header.h
+++ b/chrome/browser/chromeos/panels/panel_scroller_header.h
@@ -9,7 +9,7 @@
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/string16.h"
-#include "views/view.h"
+#include "ui/views/view.h"
 
 class PanelScroller;
 
diff --git a/chrome/browser/chromeos/setting_level_bubble_browsertest.cc b/chrome/browser/chromeos/setting_level_bubble_browsertest.cc
index 411850d..56d2d25 100644
--- a/chrome/browser/chromeos/setting_level_bubble_browsertest.cc
+++ b/chrome/browser/chromeos/setting_level_bubble_browsertest.cc
@@ -8,7 +8,7 @@
 #include "chrome/test/base/in_process_browser_test.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/views/controls/progress_bar.h"
-#include "views/view.h"
+#include "ui/views/view.h"
 
 
 class SettingLevelBubbleTest : public InProcessBrowserTest {
diff --git a/chrome/browser/chromeos/setting_level_bubble_view.h b/chrome/browser/chromeos/setting_level_bubble_view.h
index 4904abe..a9c07f5 100644
--- a/chrome/browser/chromeos/setting_level_bubble_view.h
+++ b/chrome/browser/chromeos/setting_level_bubble_view.h
@@ -7,7 +7,7 @@
 #pragma once
 
 #include "base/gtest_prod_util.h"
-#include "views/view.h"
+#include "ui/views/view.h"
 
 namespace views {
 class ProgressBar;
diff --git a/chrome/browser/chromeos/sim_dialog_delegate.cc b/chrome/browser/chromeos/sim_dialog_delegate.cc
index 447c4cb..d20e8cb 100644
--- a/chrome/browser/chromeos/sim_dialog_delegate.cc
+++ b/chrome/browser/chromeos/sim_dialog_delegate.cc
@@ -12,8 +12,8 @@
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/views/html_dialog_view.h"
 #include "chrome/common/url_constants.h"
+#include "ui/views/view.h"
 #include "ui/views/widget/widget.h"
-#include "views/view.h"
 
 namespace {
 
diff --git a/chrome/browser/chromeos/status/power_menu_button_browsertest.cc b/chrome/browser/chromeos/status/power_menu_button_browsertest.cc
index 475cad5..dcdd462 100644
--- a/chrome/browser/chromeos/status/power_menu_button_browsertest.cc
+++ b/chrome/browser/chromeos/status/power_menu_button_browsertest.cc
@@ -9,7 +9,7 @@
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/test/base/in_process_browser_test.h"
-#include "views/view.h"
+#include "ui/views/view.h"
 
 #if defined(USE_AURA)
 #include "chrome/browser/ui/views/aura/chrome_shell_delegate.h"
diff --git a/chrome/browser/chromeos/status/status_area_button.cc b/chrome/browser/chromeos/status/status_area_button.cc
index 9e2e7cd..3701d07 100644
--- a/chrome/browser/chromeos/status/status_area_button.cc
+++ b/chrome/browser/chromeos/status/status_area_button.cc
@@ -8,8 +8,8 @@
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/skbitmap_operations.h"
+#include "ui/views/view.h"
 #include "views/border.h"
-#include "views/view.h"
 
 namespace {
 
diff --git a/chrome/browser/chromeos/status/status_area_view.h b/chrome/browser/chromeos/status/status_area_view.h
index b7da1f2..22ecbfb 100644
--- a/chrome/browser/chromeos/status/status_area_view.h
+++ b/chrome/browser/chromeos/status/status_area_view.h
@@ -11,8 +11,8 @@
 #include "base/basictypes.h"
 #include "base/callback.h"
 #include "chrome/browser/chromeos/status/status_area_button.h"
+#include "ui/views/view.h"
 #include "views/accessible_pane_view.h"
-#include "views/view.h"
 
 // This class is used to wrap the small informative widgets in the upper-right
 // of the window title bar. It is used on ChromeOS only.
diff --git a/chrome/browser/chromeos/status/status_area_view_browsertest.cc b/chrome/browser/chromeos/status/status_area_view_browsertest.cc
index 1d92962..523f24c 100644
--- a/chrome/browser/chromeos/status/status_area_view_browsertest.cc
+++ b/chrome/browser/chromeos/status/status_area_view_browsertest.cc
@@ -7,7 +7,7 @@
 #include "chrome/browser/chromeos/view_ids.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "views/view.h"
+#include "ui/views/view.h"
 
 #if defined(USE_AURA)
 #include "chrome/browser/ui/views/aura/chrome_shell_delegate.h"
diff --git a/chrome/browser/chromeos/views/copy_background.cc b/chrome/browser/chromeos/views/copy_background.cc
index 723103e..a6dd3ed 100644
--- a/chrome/browser/chromeos/views/copy_background.cc
+++ b/chrome/browser/chromeos/views/copy_background.cc
@@ -6,8 +6,8 @@
 
 #include "base/logging.h"
 #include "ui/gfx/canvas.h"
+#include "ui/views/view.h"
 #include "views/background.h"
-#include "views/view.h"
 
 namespace chromeos {
 
diff --git a/chrome/browser/chromeos/volume_bubble_browsertest.cc b/chrome/browser/chromeos/volume_bubble_browsertest.cc
index cbe6178..5a9b1af 100644
--- a/chrome/browser/chromeos/volume_bubble_browsertest.cc
+++ b/chrome/browser/chromeos/volume_bubble_browsertest.cc
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "chrome/browser/chromeos/setting_level_bubble_view.h"
 #include "chrome/browser/chromeos/volume_bubble.h"
 #include "chrome/test/base/in_process_browser_test.h"
-#include "chrome/browser/chromeos/setting_level_bubble_view.h"
-#include "views/view.h"
+#include "ui/views/view.h"
 
 typedef InProcessBrowserTest VolumeBubbleTest;
 
diff --git a/chrome/browser/download/download_util.h b/chrome/browser/download/download_util.h
index b69806c..2f50855 100644
--- a/chrome/browser/download/download_util.h
+++ b/chrome/browser/download/download_util.h
@@ -17,7 +17,7 @@
 #include "ui/gfx/native_widget_types.h"
 
 #if defined(TOOLKIT_VIEWS)
-#include "views/view.h"
+#include "ui/views/view.h"
 #endif
 
 class DownloadItem;
diff --git a/chrome/browser/instant/instant_controller.cc b/chrome/browser/instant/instant_controller.cc
index d4d3078..b1396f6 100644
--- a/chrome/browser/instant/instant_controller.cc
+++ b/chrome/browser/instant/instant_controller.cc
@@ -32,8 +32,8 @@
 
 #if defined(TOOLKIT_VIEWS)
 #include "ui/views/focus/focus_manager.h"
+#include "ui/views/view.h"
 #include "ui/views/widget/widget.h"
-#include "views/view.h"
 #endif
 
 InstantController::InstantController(Profile* profile,
diff --git a/chrome/browser/ui/tests/ui_gfx_image_unittest.cc b/chrome/browser/ui/tests/ui_gfx_image_unittest.cc
index 640560c..6e0fe52 100644
--- a/chrome/browser/ui/tests/ui_gfx_image_unittest.cc
+++ b/chrome/browser/ui/tests/ui_gfx_image_unittest.cc
@@ -16,7 +16,7 @@
 
 #if defined(TOOLKIT_VIEWS)
 #include "ui/views/controls/image_view.h"
-#include "views/view.h"
+#include "ui/views/view.h"
 #endif
 
 namespace {
diff --git a/chrome/browser/ui/views/about_chrome_view.h b/chrome/browser/ui/views/about_chrome_view.h
index 378ea2a..76b0896 100644
--- a/chrome/browser/ui/views/about_chrome_view.h
+++ b/chrome/browser/ui/views/about_chrome_view.h
@@ -13,8 +13,8 @@
 #include "ui/views/controls/image_view.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/controls/link_listener.h"
+#include "ui/views/view.h"
 #include "ui/views/window/dialog_delegate.h"
-#include "views/view.h"
 
 #if defined(OS_WIN) && !defined(USE_AURA)
 #include "chrome/browser/google/google_update.h"
diff --git a/chrome/browser/ui/views/accessibility_event_router_views.cc b/chrome/browser/ui/views/accessibility_event_router_views.cc
index 2162d85..cda7795 100644
--- a/chrome/browser/ui/views/accessibility_event_router_views.cc
+++ b/chrome/browser/ui/views/accessibility_event_router_views.cc
@@ -17,8 +17,8 @@
 #include "ui/views/controls/button/text_button.h"
 #include "ui/views/controls/menu/menu_item_view.h"
 #include "ui/views/controls/menu/submenu_view.h"
+#include "ui/views/view.h"
 #include "ui/views/widget/widget.h"
-#include "views/view.h"
 
 using views::FocusManager;
 
diff --git a/chrome/browser/ui/views/autocomplete/autocomplete_popup_contents_view.h b/chrome/browser/ui/views/autocomplete/autocomplete_popup_contents_view.h
index 2a86a52..e326055 100644
--- a/chrome/browser/ui/views/autocomplete/autocomplete_popup_contents_view.h
+++ b/chrome/browser/ui/views/autocomplete/autocomplete_popup_contents_view.h
@@ -13,7 +13,7 @@
 #include "ui/base/animation/animation_delegate.h"
 #include "ui/base/animation/slide_animation.h"
 #include "ui/gfx/font.h"
-#include "views/view.h"
+#include "ui/views/view.h"
 #include "webkit/glue/window_open_disposition.h"
 
 class AutocompleteEditModel;
diff --git a/chrome/browser/ui/views/autocomplete/autocomplete_result_view.h b/chrome/browser/ui/views/autocomplete/autocomplete_result_view.h
index d1efb6b..2c405929 100644
--- a/chrome/browser/ui/views/autocomplete/autocomplete_result_view.h
+++ b/chrome/browser/ui/views/autocomplete/autocomplete_result_view.h
@@ -10,7 +10,7 @@
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/gfx/font.h"
 #include "ui/gfx/rect.h"
-#include "views/view.h"
+#include "ui/views/view.h"
 
 class AutocompleteResultViewModel;
 namespace gfx {
diff --git a/chrome/browser/ui/views/autocomplete/touch_autocomplete_popup_contents_view.cc b/chrome/browser/ui/views/autocomplete/touch_autocomplete_popup_contents_view.cc
index c49b4b1..cd810de 100644
--- a/chrome/browser/ui/views/autocomplete/touch_autocomplete_popup_contents_view.cc
+++ b/chrome/browser/ui/views/autocomplete/touch_autocomplete_popup_contents_view.cc
@@ -12,7 +12,7 @@
 #include "ui/gfx/path.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/size.h"
-#include "views/view.h"
+#include "ui/views/view.h"
 
 
 // TouchAutocompleteResultView ------------------------------------------------
diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bar_instructions_view.h b/chrome/browser/ui/views/bookmarks/bookmark_bar_instructions_view.h
index 3e982a0..8ce2de8 100644
--- a/chrome/browser/ui/views/bookmarks/bookmark_bar_instructions_view.h
+++ b/chrome/browser/ui/views/bookmarks/bookmark_bar_instructions_view.h
@@ -10,7 +10,7 @@
 #include "base/compiler_specific.h"
 #include "ui/base/accessibility/accessible_view_state.h"
 #include "ui/views/controls/link_listener.h"
-#include "views/view.h"
+#include "ui/views/view.h"
 
 namespace views {
 class Label;
diff --git a/chrome/browser/ui/views/browser_actions_container.h b/chrome/browser/ui/views/browser_actions_container.h
index a13a3d0..ca47cbb 100644
--- a/chrome/browser/ui/views/browser_actions_container.h
+++ b/chrome/browser/ui/views/browser_actions_container.h
@@ -26,7 +26,7 @@
 #include "ui/views/controls/menu/view_menu_delegate.h"
 #include "ui/views/controls/resize_area_delegate.h"
 #include "ui/views/drag_controller.h"
-#include "views/view.h"
+#include "ui/views/view.h"
 
 class Browser;
 class BrowserActionOverflowMenuController;
diff --git a/chrome/browser/ui/views/bubble/bubble.h b/chrome/browser/ui/views/bubble/bubble.h
index 62ee096..edbd745 100644
--- a/chrome/browser/ui/views/bubble/bubble.h
+++ b/chrome/browser/ui/views/bubble/bubble.h
@@ -11,7 +11,7 @@
 #include "ui/base/accelerators/accelerator.h"
 #include "ui/base/animation/animation_delegate.h"
 #include "ui/views/bubble/bubble_border.h"
-#include "views/view.h"
+#include "ui/views/view.h"
 
 #if defined(USE_AURA)
 #include "ui/views/widget/native_widget_aura.h"
diff --git a/chrome/browser/ui/views/constrained_html_delegate_views.cc b/chrome/browser/ui/views/constrained_html_delegate_views.cc
index bb7fdfc..ad68005 100644
--- a/chrome/browser/ui/views/constrained_html_delegate_views.cc
+++ b/chrome/browser/ui/views/constrained_html_delegate_views.cc
@@ -13,8 +13,8 @@
 #include "chrome/browser/ui/webui/html_dialog_ui.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "ui/gfx/rect.h"
+#include "ui/views/view.h"
 #include "ui/views/widget/widget_delegate.h"
-#include "views/view.h"
 
 class ConstrainedHtmlDelegateViews : public TabContentsContainer,
                                      public ConstrainedHtmlUIDelegate,
diff --git a/chrome/browser/ui/views/cookie_info_view.h b/chrome/browser/ui/views/cookie_info_view.h
index 0354abe..06c0259 100644
--- a/chrome/browser/ui/views/cookie_info_view.h
+++ b/chrome/browser/ui/views/cookie_info_view.h
@@ -15,7 +15,7 @@
 #include "net/base/cookie_monster.h"
 #include "ui/base/models/combobox_model.h"
 #include "ui/views/controls/combobox/combobox_listener.h"
-#include "views/view.h"
+#include "ui/views/view.h"
 
 namespace views {
 class GridLayout;
diff --git a/chrome/browser/ui/views/database_info_view.h b/chrome/browser/ui/views/database_info_view.h
index 28aec02..93a1033 100644
--- a/chrome/browser/ui/views/database_info_view.h
+++ b/chrome/browser/ui/views/database_info_view.h
@@ -6,8 +6,8 @@
 #define CHROME_BROWSER_UI_VIEWS_DATABASE_INFO_VIEW_H_
 #pragma once
 
-#include "views/view.h"
 #include "chrome/browser/browsing_data_database_helper.h"
+#include "ui/views/view.h"
 
 namespace views {
 class Textfield;
diff --git a/chrome/browser/ui/views/download/download_in_progress_dialog_view.h b/chrome/browser/ui/views/download/download_in_progress_dialog_view.h
index 2124828..4fddbd4 100644
--- a/chrome/browser/ui/views/download/download_in_progress_dialog_view.h
+++ b/chrome/browser/ui/views/download/download_in_progress_dialog_view.h
@@ -11,8 +11,8 @@
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/string16.h"
+#include "ui/views/view.h"
 #include "ui/views/window/dialog_delegate.h"
-#include "views/view.h"
 
 class Browser;
 
diff --git a/chrome/browser/ui/views/download/download_item_view.h b/chrome/browser/ui/views/download/download_item_view.h
index 361fb1f..e190e60 100644
--- a/chrome/browser/ui/views/download/download_item_view.h
+++ b/chrome/browser/ui/views/download/download_item_view.h
@@ -33,7 +33,7 @@
 #include "ui/gfx/font.h"
 #include "ui/views/controls/button/button.h"
 #include "ui/views/events/event.h"
-#include "views/view.h"
+#include "ui/views/view.h"
 
 class BaseDownloadItemModel;
 class DownloadShelfView;
diff --git a/chrome/browser/ui/views/extensions/extension_install_dialog_view.cc b/chrome/browser/ui/views/extensions/extension_install_dialog_view.cc
index ee06d5c..03e3552 100644
--- a/chrome/browser/ui/views/extensions/extension_install_dialog_view.cc
+++ b/chrome/browser/ui/views/extensions/extension_install_dialog_view.cc
@@ -24,10 +24,10 @@
 #include "ui/views/layout/box_layout.h"
 #include "ui/views/layout/grid_layout.h"
 #include "ui/views/layout/layout_constants.h"
+#include "ui/views/view.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/window/dialog_delegate.h"
 #include "views/border.h"
-#include "views/view.h"
 
 namespace {
 
diff --git a/chrome/browser/ui/views/extensions/extension_installed_bubble.cc b/chrome/browser/ui/views/extensions/extension_installed_bubble.cc
index 352987e..88fb3dd 100644
--- a/chrome/browser/ui/views/extensions/extension_installed_bubble.cc
+++ b/chrome/browser/ui/views/extensions/extension_installed_bubble.cc
@@ -36,7 +36,7 @@
 #include "ui/views/controls/link_listener.h"
 #include "ui/views/layout/fill_layout.h"
 #include "ui/views/layout/layout_constants.h"
-#include "views/view.h"
+#include "ui/views/view.h"
 
 namespace {
 
diff --git a/chrome/browser/ui/views/extensions/extension_uninstall_dialog_view.cc b/chrome/browser/ui/views/extensions/extension_uninstall_dialog_view.cc
index 71c2921..a7a122e 100644
--- a/chrome/browser/ui/views/extensions/extension_uninstall_dialog_view.cc
+++ b/chrome/browser/ui/views/extensions/extension_uninstall_dialog_view.cc
@@ -20,9 +20,9 @@
 #include "ui/views/controls/image_view.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/layout/layout_constants.h"
+#include "ui/views/view.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/window/dialog_delegate.h"
-#include "views/view.h"
 
 namespace {
 
diff --git a/chrome/browser/ui/views/find_bar_host_interactive_uitest.cc b/chrome/browser/ui/views/find_bar_host_interactive_uitest.cc
index e6eb370..134edf7 100644
--- a/chrome/browser/ui/views/find_bar_host_interactive_uitest.cc
+++ b/chrome/browser/ui/views/find_bar_host_interactive_uitest.cc
@@ -21,7 +21,7 @@
 #include "ui/base/clipboard/clipboard.h"
 #include "ui/base/keycodes/keyboard_codes.h"
 #include "ui/views/focus/focus_manager.h"
-#include "views/view.h"
+#include "ui/views/view.h"
 #include "views/views_delegate.h"
 
 namespace {
diff --git a/chrome/browser/ui/views/first_run_bubble_unittest.cc b/chrome/browser/ui/views/first_run_bubble_unittest.cc
index d6bd67a..f069217 100644
--- a/chrome/browser/ui/views/first_run_bubble_unittest.cc
+++ b/chrome/browser/ui/views/first_run_bubble_unittest.cc
@@ -9,8 +9,8 @@
 #include "chrome/test/base/testing_profile.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/views/test/views_test_base.h"
+#include "ui/views/view.h"
 #include "ui/views/widget/widget.h"
-#include "views/view.h"
 
 class FirstRunBubbleTest : public views::ViewsTestBase {
  public:
diff --git a/chrome/browser/ui/views/first_run_search_engine_view.h b/chrome/browser/ui/views/first_run_search_engine_view.h
index 9498fa7..28ef439 100644
--- a/chrome/browser/ui/views/first_run_search_engine_view.h
+++ b/chrome/browser/ui/views/first_run_search_engine_view.h
@@ -11,8 +11,8 @@
 #include "chrome/browser/search_engines/template_url_service_observer.h"
 #include "ui/gfx/size.h"
 #include "ui/views/controls/button/text_button.h"
+#include "ui/views/view.h"
 #include "ui/views/widget/widget_delegate.h"
-#include "views/view.h"
 
 class Profile;
 class TemplateURL;
diff --git a/chrome/browser/ui/views/frame/contents_container.h b/chrome/browser/ui/views/frame/contents_container.h
index d8269d6..f36882f 100644
--- a/chrome/browser/ui/views/frame/contents_container.h
+++ b/chrome/browser/ui/views/frame/contents_container.h
@@ -6,7 +6,7 @@
 #define CHROME_BROWSER_UI_VIEWS_FRAME_CONTENTS_CONTAINER_H_
 #pragma once
 
-#include "views/view.h"
+#include "ui/views/view.h"
 
 class TabContents;
 
diff --git a/chrome/browser/ui/views/fullscreen_exit_bubble_views.cc b/chrome/browser/ui/views/fullscreen_exit_bubble_views.cc
index 85c276a..9b5df30 100644
--- a/chrome/browser/ui/views/fullscreen_exit_bubble_views.cc
+++ b/chrome/browser/ui/views/fullscreen_exit_bubble_views.cc
@@ -22,8 +22,8 @@
 #include "ui/views/controls/link_listener.h"
 #include "ui/views/layout/box_layout.h"
 #include "ui/views/layout/grid_layout.h"
+#include "ui/views/view.h"
 #include "ui/views/widget/widget.h"
-#include "views/view.h"
 
 #if defined(OS_WIN)
 #include "ui/base/l10n/l10n_util_win.h"
diff --git a/chrome/browser/ui/views/generic_info_view.h b/chrome/browser/ui/views/generic_info_view.h
index fc0de27..a7dd290 100644
--- a/chrome/browser/ui/views/generic_info_view.h
+++ b/chrome/browser/ui/views/generic_info_view.h
@@ -9,7 +9,7 @@
 #include "base/gtest_prod_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/string16.h"
-#include "views/view.h"
+#include "ui/views/view.h"
 
 namespace views {
 class GridLayout;
diff --git a/chrome/browser/ui/views/importer/import_lock_dialog_view.h b/chrome/browser/ui/views/importer/import_lock_dialog_view.h
index 515e25e..de3dc0c 100644
--- a/chrome/browser/ui/views/importer/import_lock_dialog_view.h
+++ b/chrome/browser/ui/views/importer/import_lock_dialog_view.h
@@ -9,8 +9,8 @@
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/ref_counted.h"
+#include "ui/views/view.h"
 #include "ui/views/window/dialog_delegate.h"
-#include "views/view.h"
 
 namespace views {
 class Label;
diff --git a/chrome/browser/ui/views/importer/import_progress_dialog_view.h b/chrome/browser/ui/views/importer/import_progress_dialog_view.h
index cbf5b6e..0db1ad8 100644
--- a/chrome/browser/ui/views/importer/import_progress_dialog_view.h
+++ b/chrome/browser/ui/views/importer/import_progress_dialog_view.h
@@ -12,8 +12,8 @@
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/importer/importer_data_types.h"
 #include "chrome/browser/importer/importer_progress_observer.h"
+#include "ui/views/view.h"
 #include "ui/views/window/dialog_delegate.h"
-#include "views/view.h"
 
 class ImporterHost;
 class ImporterObserver;
diff --git a/chrome/browser/ui/views/indexed_db_info_view.h b/chrome/browser/ui/views/indexed_db_info_view.h
index 341a094..e0c13cb 100644
--- a/chrome/browser/ui/views/indexed_db_info_view.h
+++ b/chrome/browser/ui/views/indexed_db_info_view.h
@@ -6,8 +6,8 @@
 #define CHROME_BROWSER_UI_VIEWS_INDEXED_DB_INFO_VIEW_H_
 #pragma once
 
-#include "views/view.h"
 #include "chrome/browser/browsing_data_indexed_db_helper.h"
+#include "ui/views/view.h"
 
 namespace views {
 class Textfield;
diff --git a/chrome/browser/ui/views/infobars/infobar_background.cc b/chrome/browser/ui/views/infobars/infobar_background.cc
index d345fa5..78a27a5 100644
--- a/chrome/browser/ui/views/infobars/infobar_background.cc
+++ b/chrome/browser/ui/views/infobars/infobar_background.cc
@@ -10,7 +10,7 @@
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/canvas_skia_paint.h"
 #include "ui/gfx/color_utils.h"
-#include "views/view.h"
+#include "ui/views/view.h"
 
 InfoBarBackground::InfoBarBackground(InfoBarDelegate::Type infobar_type)
     : separator_color_(SK_ColorBLACK),
diff --git a/chrome/browser/ui/views/instant_confirm_view.h b/chrome/browser/ui/views/instant_confirm_view.h
index 3cc4d43..c46e29d 100644
--- a/chrome/browser/ui/views/instant_confirm_view.h
+++ b/chrome/browser/ui/views/instant_confirm_view.h
@@ -9,8 +9,8 @@
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "ui/views/controls/link_listener.h"
+#include "ui/views/view.h"
 #include "ui/views/window/dialog_delegate.h"
-#include "views/view.h"
 
 class Profile;
 
diff --git a/chrome/browser/ui/views/local_storage_info_view.h b/chrome/browser/ui/views/local_storage_info_view.h
index a757e74..0ca663d 100644
--- a/chrome/browser/ui/views/local_storage_info_view.h
+++ b/chrome/browser/ui/views/local_storage_info_view.h
@@ -6,8 +6,8 @@
 #define CHROME_BROWSER_UI_VIEWS_LOCAL_STORAGE_INFO_VIEW_H_
 #pragma once
 
-#include "views/view.h"
 #include "chrome/browser/browsing_data_local_storage_helper.h"
+#include "ui/views/view.h"
 
 namespace views {
 class Textfield;
diff --git a/chrome/browser/ui/views/local_storage_set_item_info_view.h b/chrome/browser/ui/views/local_storage_set_item_info_view.h
index b696ce3..bfc993d 100644
--- a/chrome/browser/ui/views/local_storage_set_item_info_view.h
+++ b/chrome/browser/ui/views/local_storage_set_item_info_view.h
@@ -9,7 +9,7 @@
 #include <string>
 
 #include "base/string16.h"
-#include "views/view.h"
+#include "ui/views/view.h"
 
 namespace views {
 class Textfield;
diff --git a/chrome/browser/ui/views/location_bar/click_handler.cc b/chrome/browser/ui/views/location_bar/click_handler.cc
index 87b5bfc..710ec09 100644
--- a/chrome/browser/ui/views/location_bar/click_handler.cc
+++ b/chrome/browser/ui/views/location_bar/click_handler.cc
@@ -8,7 +8,7 @@
 #include "chrome/browser/ui/views/location_bar/location_bar_view.h"
 #include "content/browser/tab_contents/navigation_controller.h"
 #include "content/browser/tab_contents/tab_contents.h"
-#include "views/view.h"
+#include "ui/views/view.h"
 
 ClickHandler::ClickHandler(const views::View* owner,
                            LocationBarView* location_bar)
diff --git a/chrome/browser/ui/views/location_bar/icon_label_bubble_view.h b/chrome/browser/ui/views/location_bar/icon_label_bubble_view.h
index 38458f5..9c28321 100644
--- a/chrome/browser/ui/views/location_bar/icon_label_bubble_view.h
+++ b/chrome/browser/ui/views/location_bar/icon_label_bubble_view.h
@@ -10,8 +10,8 @@
 
 #include "base/string16.h"
 #include "ui/gfx/size.h"
+#include "ui/views/view.h"
 #include "views/painter.h"
-#include "views/view.h"
 
 namespace gfx {
 class Canvas;
diff --git a/chrome/browser/ui/views/location_bar/keyword_hint_view.h b/chrome/browser/ui/views/location_bar/keyword_hint_view.h
index 1a18fe8..3bf733a 100644
--- a/chrome/browser/ui/views/location_bar/keyword_hint_view.h
+++ b/chrome/browser/ui/views/location_bar/keyword_hint_view.h
@@ -10,7 +10,7 @@
 
 #include "base/compiler_specific.h"
 #include "ui/gfx/size.h"
-#include "views/view.h"
+#include "ui/views/view.h"
 
 namespace gfx {
 class Font;
diff --git a/chrome/browser/ui/views/location_bar/page_action_with_badge_view.h b/chrome/browser/ui/views/location_bar/page_action_with_badge_view.h
index a988f7a..84931dc 100644
--- a/chrome/browser/ui/views/location_bar/page_action_with_badge_view.h
+++ b/chrome/browser/ui/views/location_bar/page_action_with_badge_view.h
@@ -8,7 +8,7 @@
 
 #include "base/compiler_specific.h"
 #include "ui/gfx/size.h"
-#include "views/view.h"
+#include "ui/views/view.h"
 
 class GURL;
 class PageActionImageView;
diff --git a/chrome/browser/ui/views/login_view.h b/chrome/browser/ui/views/login_view.h
index e7b5b88..cb50699 100644
--- a/chrome/browser/ui/views/login_view.h
+++ b/chrome/browser/ui/views/login_view.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -8,7 +8,7 @@
 
 #include "base/task.h"
 #include "chrome/browser/ui/login/login_model.h"
-#include "views/view.h"
+#include "ui/views/view.h"
 
 namespace views {
 class Label;
diff --git a/chrome/browser/ui/views/notifications/balloon_view.h b/chrome/browser/ui/views/notifications/balloon_view.h
index 64e7cea..76ef55c 100644
--- a/chrome/browser/ui/views/notifications/balloon_view.h
+++ b/chrome/browser/ui/views/notifications/balloon_view.h
@@ -22,8 +22,8 @@
 #include "ui/views/controls/button/menu_button.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/controls/menu/view_menu_delegate.h"
+#include "ui/views/view.h"
 #include "ui/views/widget/widget_delegate.h"
-#include "views/view.h"
 
 class BalloonCollection;
 class NotificationOptionsMenuModel;
diff --git a/chrome/browser/ui/views/omnibox/omnibox_view_views.h b/chrome/browser/ui/views/omnibox/omnibox_view_views.h
index a3627ac..f9c165d 100644
--- a/chrome/browser/ui/views/omnibox/omnibox_view_views.h
+++ b/chrome/browser/ui/views/omnibox/omnibox_view_views.h
@@ -16,7 +16,7 @@
 #include "content/public/browser/notification_observer.h"
 #include "ui/base/range/range.h"
 #include "ui/views/controls/textfield/textfield_controller.h"
-#include "views/view.h"
+#include "ui/views/view.h"
 #include "webkit/glue/window_open_disposition.h"
 
 class AutocompleteEditController;
diff --git a/chrome/browser/ui/views/sad_tab_view.h b/chrome/browser/ui/views/sad_tab_view.h
index 5cdd467..9eda1ed 100644
--- a/chrome/browser/ui/views/sad_tab_view.h
+++ b/chrome/browser/ui/views/sad_tab_view.h
@@ -10,7 +10,7 @@
 #include "base/memory/scoped_ptr.h"
 #include "ui/views/controls/button/button.h"
 #include "ui/views/controls/link_listener.h"
-#include "views/view.h"
+#include "ui/views/view.h"
 
 class TabContents;
 
diff --git a/chrome/browser/ui/views/ssl_client_certificate_selector.h b/chrome/browser/ui/views/ssl_client_certificate_selector.h
index fd21a54..d06ee45 100644
--- a/chrome/browser/ui/views/ssl_client_certificate_selector.h
+++ b/chrome/browser/ui/views/ssl_client_certificate_selector.h
@@ -15,8 +15,8 @@
 #include "content/browser/ssl/ssl_client_auth_handler.h"
 #include "ui/views/controls/button/button.h"
 #include "ui/views/controls/table/table_view_observer.h"
+#include "ui/views/view.h"
 #include "ui/views/window/dialog_delegate.h"
-#include "views/view.h"
 
 // This header file exists only for testing.  Chrome should access the
 // certificate selector only through the cross-platform interface
diff --git a/chrome/browser/ui/views/tab_contents/tab_contents_container.h b/chrome/browser/ui/views/tab_contents/tab_contents_container.h
index ef96561..58353e6 100644
--- a/chrome/browser/ui/views/tab_contents/tab_contents_container.h
+++ b/chrome/browser/ui/views/tab_contents/tab_contents_container.h
@@ -9,7 +9,7 @@
 #include "chrome/browser/ui/views/tab_contents/native_tab_contents_container.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
-#include "views/view.h"
+#include "ui/views/view.h"
 
 class NativeTabContentsContainer;
 class RenderViewHost;
diff --git a/chrome/browser/ui/views/tab_contents/tab_contents_container_native.h b/chrome/browser/ui/views/tab_contents/tab_contents_container_native.h
index f4d0edb..db48ab6 100644
--- a/chrome/browser/ui/views/tab_contents/tab_contents_container_native.h
+++ b/chrome/browser/ui/views/tab_contents/tab_contents_container_native.h
@@ -9,7 +9,7 @@
 #include "chrome/browser/ui/views/tab_contents/native_tab_contents_container.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
-#include "views/view.h"
+#include "ui/views/view.h"
 
 class NativeTabContentsContainer;
 class RenderViewHost;
diff --git a/chrome/browser/ui/views/tab_icon_view.h b/chrome/browser/ui/views/tab_icon_view.h
index ef49649..2786599 100644
--- a/chrome/browser/ui/views/tab_icon_view.h
+++ b/chrome/browser/ui/views/tab_icon_view.h
@@ -7,7 +7,7 @@
 #pragma once
 
 #include "base/compiler_specific.h"
-#include "views/view.h"
+#include "ui/views/view.h"
 
 class SkBitmap;
 
diff --git a/chrome/browser/ui/views/tabs/abstract_tab_strip_view.h b/chrome/browser/ui/views/tabs/abstract_tab_strip_view.h
index 1ce1814..3fc82c10 100644
--- a/chrome/browser/ui/views/tabs/abstract_tab_strip_view.h
+++ b/chrome/browser/ui/views/tabs/abstract_tab_strip_view.h
@@ -6,7 +6,7 @@
 #define CHROME_BROWSER_UI_VIEWS_TABS_ABSTRACT_TAB_STRIP_VIEW_H_
 #pragma once
 
-#include "views/view.h"
+#include "ui/views/view.h"
 
 // This interface is the way the browser view sees a tab strip's view.
 class AbstractTabStripView : public views::View {
diff --git a/chrome/browser/ui/views/tabs/base_tab.h b/chrome/browser/ui/views/tabs/base_tab.h
index bcf92c6..34dfaa5 100644
--- a/chrome/browser/ui/views/tabs/base_tab.h
+++ b/chrome/browser/ui/views/tabs/base_tab.h
@@ -12,7 +12,7 @@
 #include "ui/base/animation/animation_delegate.h"
 #include "ui/views/context_menu_controller.h"
 #include "ui/views/controls/button/button.h"
-#include "views/view.h"
+#include "ui/views/view.h"
 
 class BaseTab;
 class TabController;
diff --git a/chrome/browser/ui/views/tabs/base_tab_strip.h b/chrome/browser/ui/views/tabs/base_tab_strip.h
index faeeeb7..73d1a8a 100644
--- a/chrome/browser/ui/views/tabs/base_tab_strip.h
+++ b/chrome/browser/ui/views/tabs/base_tab_strip.h
@@ -13,7 +13,7 @@
 #include "chrome/browser/ui/views/tabs/base_tab.h"
 #include "chrome/browser/ui/views/tabs/tab_controller.h"
 #include "ui/views/animation/bounds_animator.h"
-#include "views/view.h"
+#include "ui/views/view.h"
 
 class BaseTab;
 class TabDragController;
diff --git a/chrome/browser/ui/views/tabs/dragged_tab_view.h b/chrome/browser/ui/views/tabs/dragged_tab_view.h
index e1ecacf..89339b9 100644
--- a/chrome/browser/ui/views/tabs/dragged_tab_view.h
+++ b/chrome/browser/ui/views/tabs/dragged_tab_view.h
@@ -12,7 +12,7 @@
 #include "ui/gfx/point.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/size.h"
-#include "views/view.h"
+#include "ui/views/view.h"
 
 class NativeViewPhotobooth;
 
diff --git a/chrome/browser/ui/views/theme_background.cc b/chrome/browser/ui/views/theme_background.cc
index 74b89be..05acbcd 100644
--- a/chrome/browser/ui/views/theme_background.cc
+++ b/chrome/browser/ui/views/theme_background.cc
@@ -14,7 +14,7 @@
 #include "grit/ui_resources.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas.h"
-#include "views/view.h"
+#include "ui/views/view.h"
 
 ThemeBackground::ThemeBackground(BrowserView* browser_view)
     : browser_view_(browser_view) {
diff --git a/chrome/browser/ui/views/toolbar_view.h b/chrome/browser/ui/views/toolbar_view.h
index 2b57d07..b6f33c0 100644
--- a/chrome/browser/ui/views/toolbar_view.h
+++ b/chrome/browser/ui/views/toolbar_view.h
@@ -20,8 +20,8 @@
 #include "ui/base/animation/slide_animation.h"
 #include "ui/views/controls/button/menu_button.h"
 #include "ui/views/controls/menu/view_menu_delegate.h"
+#include "ui/views/view.h"
 #include "views/accessible_pane_view.h"
-#include "views/view.h"
 
 class BrowserActionsContainer;
 class Browser;
diff --git a/chrome/browser/ui/views/unhandled_keyboard_event_handler.h b/chrome/browser/ui/views/unhandled_keyboard_event_handler.h
index f5653d7..41f1a84 100644
--- a/chrome/browser/ui/views/unhandled_keyboard_event_handler.h
+++ b/chrome/browser/ui/views/unhandled_keyboard_event_handler.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -7,7 +7,7 @@
 #pragma once
 
 #include "content/public/browser/native_web_keyboard_event.h"
-#include "views/view.h"
+#include "ui/views/view.h"
 
 namespace views {
 class FocusManager;
diff --git a/chrome/test/base/view_event_test_base.cc b/chrome/test/base/view_event_test_base.cc
index 91cced3..f370e3d 100644
--- a/chrome/test/base/view_event_test_base.cc
+++ b/chrome/test/base/view_event_test_base.cc
@@ -15,8 +15,8 @@
 #include "base/string_number_conversions.h"
 #include "chrome/browser/automation/ui_controls.h"
 #include "chrome/test/base/ui_test_utils.h"
+#include "ui/views/view.h"
 #include "ui/views/widget/widget.h"
-#include "views/view.h"
 
 namespace {
 
diff --git a/chrome/test/reliability/automated_ui_tests.cc b/chrome/test/reliability/automated_ui_tests.cc
index ca5cad2..3e6a98a 100644
--- a/chrome/test/reliability/automated_ui_tests.cc
+++ b/chrome/test/reliability/automated_ui_tests.cc
@@ -11,6 +11,7 @@
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/file_version_info.h"
+#include "base/i18n/time_formatting.h"
 #include "base/logging.h"
 #include "base/path_service.h"
 #include "base/rand_util.h"
@@ -19,7 +20,6 @@
 #include "base/string_util.h"
 #include "base/threading/platform_thread.h"
 #include "base/time.h"
-#include "base/i18n/time_formatting.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/character_encoding.h"
@@ -39,7 +39,7 @@
 #include "ui/base/keycodes/keyboard_codes.h"
 
 #if defined(TOOLKIT_VIEWS)
-#include "views/view.h"
+#include "ui/views/view.h"
 #endif
 
 namespace {
diff --git a/ui/aura_shell/desktop_background_view.h b/ui/aura_shell/desktop_background_view.h
index 25b61f8..5937e8f 100644
--- a/ui/aura_shell/desktop_background_view.h
+++ b/ui/aura_shell/desktop_background_view.h
@@ -7,8 +7,8 @@
 #pragma once
 
 #include "third_party/skia/include/core/SkBitmap.h"
+#include "ui/views/view.h"
 #include "ui/views/widget/widget_delegate.h"
-#include "views/view.h"
 
 namespace aura_shell {
 namespace internal {
diff --git a/ui/aura_shell/drag_drop_controller_unittest.cc b/ui/aura_shell/drag_drop_controller_unittest.cc
index 3ebdbdc..6464a50 100644
--- a/ui/aura_shell/drag_drop_controller_unittest.cc
+++ b/ui/aura_shell/drag_drop_controller_unittest.cc
@@ -14,8 +14,8 @@
 #include "ui/base/dragdrop/drag_drop_types.h"
 #include "ui/base/dragdrop/os_exchange_data.h"
 #include "ui/views/events/event.h"
+#include "ui/views/view.h"
 #include "ui/views/widget/widget.h"
-#include "views/view.h"
 
 namespace aura_shell {
 namespace test {
diff --git a/ui/aura_shell/launcher/view_model.cc b/ui/aura_shell/launcher/view_model.cc
index f7a3922..f59e6a8 100644
--- a/ui/aura_shell/launcher/view_model.cc
+++ b/ui/aura_shell/launcher/view_model.cc
@@ -5,7 +5,7 @@
 #include "ui/aura_shell/launcher/view_model.h"
 
 #include "base/logging.h"
-#include "views/view.h"
+#include "ui/views/view.h"
 
 namespace aura_shell {
 
diff --git a/ui/aura_shell/launcher/view_model_unittest.cc b/ui/aura_shell/launcher/view_model_unittest.cc
index 366cb21..7caadf2 100644
--- a/ui/aura_shell/launcher/view_model_unittest.cc
+++ b/ui/aura_shell/launcher/view_model_unittest.cc
@@ -5,7 +5,7 @@
 #include "ui/aura_shell/launcher/view_model.h"
 
 #include "testing/gtest/include/gtest/gtest.h"
-#include "views/view.h"
+#include "ui/views/view.h"
 
 namespace aura_shell {
 
diff --git a/ui/aura_shell/launcher/view_model_utils.cc b/ui/aura_shell/launcher/view_model_utils.cc
index 068016f..de68b8e 100644
--- a/ui/aura_shell/launcher/view_model_utils.cc
+++ b/ui/aura_shell/launcher/view_model_utils.cc
@@ -7,7 +7,7 @@
 #include <algorithm>
 
 #include "ui/aura_shell/launcher/view_model.h"
-#include "views/view.h"
+#include "ui/views/view.h"
 
 namespace aura_shell {
 
diff --git a/ui/aura_shell/launcher/view_model_utils_unittest.cc b/ui/aura_shell/launcher/view_model_utils_unittest.cc
index 2b8ab4c..e49ba13 100644
--- a/ui/aura_shell/launcher/view_model_utils_unittest.cc
+++ b/ui/aura_shell/launcher/view_model_utils_unittest.cc
@@ -6,7 +6,7 @@
 
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/aura_shell/launcher/view_model.h"
-#include "views/view.h"
+#include "ui/views/view.h"
 
 namespace aura_shell {
 
diff --git a/ui/aura_shell/modal_container_layout_manager.cc b/ui/aura_shell/modal_container_layout_manager.cc
index 7961499..7410a23 100644
--- a/ui/aura_shell/modal_container_layout_manager.cc
+++ b/ui/aura_shell/modal_container_layout_manager.cc
@@ -15,8 +15,8 @@
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/compositor/layer.h"
 #include "ui/gfx/compositor/layer_animator.h"
+#include "ui/views/view.h"
 #include "ui/views/widget/widget.h"
-#include "views/view.h"
 
 namespace aura_shell {
 namespace internal {
diff --git a/ui/views/accessibility/native_view_accessibility_win.h b/ui/views/accessibility/native_view_accessibility_win.h
index e017050..51254d9 100644
--- a/ui/views/accessibility/native_view_accessibility_win.h
+++ b/ui/views/accessibility/native_view_accessibility_win.h
@@ -15,7 +15,7 @@
 #include "third_party/iaccessible2/ia2_api_all.h"
 #include "ui/base/accessibility/accessible_view_state.h"
 #include "ui/views/controls/native/native_view_host.h"
-#include "views/view.h"
+#include "ui/views/view.h"
 
 namespace ui {
 enum TextBoundaryDirection;
diff --git a/ui/views/animation/bounds_animator.cc b/ui/views/animation/bounds_animator.cc
index d656d0a..2e4b0c1 100644
--- a/ui/views/animation/bounds_animator.cc
+++ b/ui/views/animation/bounds_animator.cc
@@ -7,7 +7,7 @@
 #include "base/memory/scoped_ptr.h"
 #include "ui/base/animation/animation_container.h"
 #include "ui/base/animation/slide_animation.h"
-#include "views/view.h"
+#include "ui/views/view.h"
 
 // Duration in milliseconds for animations.
 static const int kAnimationDuration = 200;
diff --git a/ui/views/animation/bounds_animator_unittest.cc b/ui/views/animation/bounds_animator_unittest.cc
index d030ba1..bf1f08c 100644
--- a/ui/views/animation/bounds_animator_unittest.cc
+++ b/ui/views/animation/bounds_animator_unittest.cc
@@ -6,7 +6,7 @@
 #include "ui/base/animation/slide_animation.h"
 #include "ui/base/animation/test_animation_delegate.h"
 #include "ui/views/animation/bounds_animator.h"
-#include "views/view.h"
+#include "ui/views/view.h"
 
 using views::BoundsAnimator;
 using ui::Animation;
diff --git a/ui/views/bubble/border_contents_view.h b/ui/views/bubble/border_contents_view.h
index e30ba19..2e86662 100644
--- a/ui/views/bubble/border_contents_view.h
+++ b/ui/views/bubble/border_contents_view.h
@@ -8,7 +8,7 @@
 
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/views/bubble/bubble_border.h"
-#include "views/view.h"
+#include "ui/views/view.h"
 
 namespace views {
 
diff --git a/ui/views/controls/button/button.h b/ui/views/controls/button/button.h
index 41aba33..7cba9d1 100644
--- a/ui/views/controls/button/button.h
+++ b/ui/views/controls/button/button.h
@@ -6,7 +6,7 @@
 #define UI_VIEWS_CONTROLS_BUTTON_BUTTON_H_
 #pragma once
 
-#include "views/view.h"
+#include "ui/views/view.h"
 
 namespace views {
 
diff --git a/ui/views/controls/combobox/combobox.h b/ui/views/controls/combobox/combobox.h
index dbd62db..a6f7e35 100644
--- a/ui/views/controls/combobox/combobox.h
+++ b/ui/views/controls/combobox/combobox.h
@@ -10,7 +10,7 @@
 
 #include "ui/gfx/native_widget_types.h"
 #include "ui/views/controls/combobox/native_combobox_wrapper.h"
-#include "views/view.h"
+#include "ui/views/view.h"
 
 namespace ui {
 class ComboboxModel;
diff --git a/ui/views/controls/combobox/native_combobox_views.h b/ui/views/controls/combobox/native_combobox_views.h
index 784539e..61c70a3 100644
--- a/ui/views/controls/combobox/native_combobox_views.h
+++ b/ui/views/controls/combobox/native_combobox_views.h
@@ -8,7 +8,7 @@
 
 #include "ui/views/controls/combobox/native_combobox_wrapper.h"
 #include "ui/views/controls/menu/menu_delegate.h"
-#include "views/view.h"
+#include "ui/views/view.h"
 
 namespace gfx {
 class Canvas;
diff --git a/ui/views/controls/focusable_border.h b/ui/views/controls/focusable_border.h
index 098809b..903bb61 100644
--- a/ui/views/controls/focusable_border.h
+++ b/ui/views/controls/focusable_border.h
@@ -8,8 +8,8 @@
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
+#include "ui/views/view.h"
 #include "views/border.h"
-#include "views/view.h"
 
 namespace gfx {
 class Canvas;
diff --git a/ui/views/controls/image_view.h b/ui/views/controls/image_view.h
index 1149c8d..8827d4e 100644
--- a/ui/views/controls/image_view.h
+++ b/ui/views/controls/image_view.h
@@ -7,7 +7,7 @@
 #pragma once
 
 #include "third_party/skia/include/core/SkBitmap.h"
-#include "views/view.h"
+#include "ui/views/view.h"
 
 namespace gfx {
 class Canvas;
diff --git a/ui/views/controls/label.h b/ui/views/controls/label.h
index 4f0d6c2..e2c15cc 100644
--- a/ui/views/controls/label.h
+++ b/ui/views/controls/label.h
@@ -14,7 +14,7 @@
 #include "googleurl/src/gurl.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/gfx/font.h"
-#include "views/view.h"
+#include "ui/views/view.h"
 
 namespace views {
 
diff --git a/ui/views/controls/menu/menu_item_view.h b/ui/views/controls/menu/menu_item_view.h
index 28481e8..91da31b 100644
--- a/ui/views/controls/menu/menu_item_view.h
+++ b/ui/views/controls/menu/menu_item_view.h
@@ -14,7 +14,7 @@
 #include "base/string16.h"
 #include "build/build_config.h"
 #include "third_party/skia/include/core/SkBitmap.h"
-#include "views/view.h"
+#include "ui/views/view.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
diff --git a/ui/views/controls/menu/menu_scroll_view_container.h b/ui/views/controls/menu/menu_scroll_view_container.h
index a19b73a..234c8f1 100644
--- a/ui/views/controls/menu/menu_scroll_view_container.h
+++ b/ui/views/controls/menu/menu_scroll_view_container.h
@@ -6,7 +6,7 @@
 #define UI_VIEWS_CONTROLS_MENU_MENU_SCROLL_VIEW_CONTAINER_H_
 #pragma once
 
-#include "views/view.h"
+#include "ui/views/view.h"
 
 namespace views {
 
diff --git a/ui/views/controls/menu/menu_separator.h b/ui/views/controls/menu/menu_separator.h
index 4e968a3..d404ddb 100644
--- a/ui/views/controls/menu/menu_separator.h
+++ b/ui/views/controls/menu/menu_separator.h
@@ -7,7 +7,7 @@
 #pragma once
 
 #include "base/compiler_specific.h"
-#include "views/view.h"
+#include "ui/views/view.h"
 
 namespace views {
 
diff --git a/ui/views/controls/menu/submenu_view.h b/ui/views/controls/menu/submenu_view.h
index 693a538..d4d0497 100644
--- a/ui/views/controls/menu/submenu_view.h
+++ b/ui/views/controls/menu/submenu_view.h
@@ -10,7 +10,7 @@
 
 #include "base/compiler_specific.h"
 #include "ui/views/controls/menu/menu_delegate.h"
-#include "views/view.h"
+#include "ui/views/view.h"
 
 namespace views {
 
diff --git a/ui/views/controls/message_box_view.h b/ui/views/controls/message_box_view.h
index 64e1f27..cd81e40 100644
--- a/ui/views/controls/message_box_view.h
+++ b/ui/views/controls/message_box_view.h
@@ -9,7 +9,7 @@
 #include <string>
 
 #include "base/string16.h"
-#include "views/view.h"
+#include "ui/views/view.h"
 
 namespace views {
 
diff --git a/ui/views/controls/native/native_view_host.h b/ui/views/controls/native/native_view_host.h
index 674222b..52575f0 100644
--- a/ui/views/controls/native/native_view_host.h
+++ b/ui/views/controls/native/native_view_host.h
@@ -9,7 +9,7 @@
 #include <string>
 
 #include "ui/gfx/native_widget_types.h"
-#include "views/view.h"
+#include "ui/views/view.h"
 
 namespace views {
 
diff --git a/ui/views/controls/native_control.h b/ui/views/controls/native_control.h
index ba419c1..f439d3f 100644
--- a/ui/views/controls/native_control.h
+++ b/ui/views/controls/native_control.h
@@ -9,7 +9,7 @@
 #include <windows.h>
 
 #include "ui/base/keycodes/keyboard_codes.h"
-#include "views/view.h"
+#include "ui/views/view.h"
 
 namespace views {
 
diff --git a/ui/views/controls/progress_bar.h b/ui/views/controls/progress_bar.h
index 02674de..10ce757 100644
--- a/ui/views/controls/progress_bar.h
+++ b/ui/views/controls/progress_bar.h
@@ -8,7 +8,7 @@
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
-#include "views/view.h"
+#include "ui/views/view.h"
 
 namespace views {
 
diff --git a/ui/views/controls/resize_area.h b/ui/views/controls/resize_area.h
index 1cebd9d..57c65ca 100644
--- a/ui/views/controls/resize_area.h
+++ b/ui/views/controls/resize_area.h
@@ -8,7 +8,7 @@
 
 #include <string>
 
-#include "views/view.h"
+#include "ui/views/view.h"
 
 namespace views {
 
diff --git a/ui/views/controls/scrollbar/base_scroll_bar_thumb.h b/ui/views/controls/scrollbar/base_scroll_bar_thumb.h
index f015478..c7daf93 100644
--- a/ui/views/controls/scrollbar/base_scroll_bar_thumb.h
+++ b/ui/views/controls/scrollbar/base_scroll_bar_thumb.h
@@ -9,7 +9,7 @@
 #include "ui/gfx/size.h"
 #include "ui/views/controls/button/custom_button.h"
 #include "ui/views/controls/scrollbar/scroll_bar.h"
-#include "views/view.h"
+#include "ui/views/view.h"
 
 namespace gfx {
 class Canvas;
diff --git a/ui/views/controls/scrollbar/native_scroll_bar.h b/ui/views/controls/scrollbar/native_scroll_bar.h
index 73892fc..c5a9776 100644
--- a/ui/views/controls/scrollbar/native_scroll_bar.h
+++ b/ui/views/controls/scrollbar/native_scroll_bar.h
@@ -11,7 +11,7 @@
 #include "base/compiler_specific.h"
 #include "base/gtest_prod_util.h"
 #include "ui/views/controls/scrollbar/scroll_bar.h"
-#include "views/view.h"
+#include "ui/views/view.h"
 
 namespace views {
 
diff --git a/ui/views/controls/scrollbar/native_scroll_bar_views.h b/ui/views/controls/scrollbar/native_scroll_bar_views.h
index 6e26487d..136338c 100644
--- a/ui/views/controls/scrollbar/native_scroll_bar_views.h
+++ b/ui/views/controls/scrollbar/native_scroll_bar_views.h
@@ -12,7 +12,7 @@
 #include "ui/views/controls/button/button.h"
 #include "ui/views/controls/scrollbar/base_scroll_bar.h"
 #include "ui/views/controls/scrollbar/native_scroll_bar_wrapper.h"
-#include "views/view.h"
+#include "ui/views/view.h"
 
 namespace gfx {
 class Canvas;
diff --git a/ui/views/controls/scrollbar/scroll_bar.h b/ui/views/controls/scrollbar/scroll_bar.h
index 6e83ffa..39263d6 100644
--- a/ui/views/controls/scrollbar/scroll_bar.h
+++ b/ui/views/controls/scrollbar/scroll_bar.h
@@ -8,7 +8,7 @@
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
-#include "views/view.h"
+#include "ui/views/view.h"
 #include "views/views_export.h"
 
 namespace views {
diff --git a/ui/views/controls/separator.h b/ui/views/controls/separator.h
index f47d238..44df432 100644
--- a/ui/views/controls/separator.h
+++ b/ui/views/controls/separator.h
@@ -8,7 +8,7 @@
 
 #include <string>
 
-#include "views/view.h"
+#include "ui/views/view.h"
 
 namespace views {
 
diff --git a/ui/views/controls/single_split_view.h b/ui/views/controls/single_split_view.h
index c3f2bc3..6c3cd97 100644
--- a/ui/views/controls/single_split_view.h
+++ b/ui/views/controls/single_split_view.h
@@ -7,7 +7,7 @@
 #pragma once
 
 #include "base/gtest_prod_util.h"
-#include "views/view.h"
+#include "ui/views/view.h"
 
 namespace views {
 
diff --git a/ui/views/controls/tabbed_pane/native_tabbed_pane_views.h b/ui/views/controls/tabbed_pane/native_tabbed_pane_views.h
index 87a9291..5ab456a 100644
--- a/ui/views/controls/tabbed_pane/native_tabbed_pane_views.h
+++ b/ui/views/controls/tabbed_pane/native_tabbed_pane_views.h
@@ -9,7 +9,7 @@
 #include <vector>
 
 #include "ui/views/controls/tabbed_pane/native_tabbed_pane_wrapper.h"
-#include "views/view.h"
+#include "ui/views/view.h"
 
 namespace views {
 
diff --git a/ui/views/controls/tabbed_pane/tabbed_pane.h b/ui/views/controls/tabbed_pane/tabbed_pane.h
index 97a9d63..4150662 100644
--- a/ui/views/controls/tabbed_pane/tabbed_pane.h
+++ b/ui/views/controls/tabbed_pane/tabbed_pane.h
@@ -9,7 +9,7 @@
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/string16.h"
-#include "views/view.h"
+#include "ui/views/view.h"
 
 namespace views {
 
diff --git a/ui/views/controls/table/table_view2.h b/ui/views/controls/table/table_view2.h
index d4f4e86..5ba5c1b 100644
--- a/ui/views/controls/table/table_view2.h
+++ b/ui/views/controls/table/table_view2.h
@@ -16,7 +16,7 @@
 #include "ui/gfx/canvas.h"
 #include "ui/views/controls/table/native_table_wrapper.h"
 #include "ui/views/controls/table/table_view.h"
-#include "views/view.h"
+#include "ui/views/view.h"
 
 namespace ui {
 struct TableColumn;
diff --git a/ui/views/controls/textfield/native_textfield_views.h b/ui/views/controls/textfield/native_textfield_views.h
index a9cfbb8..8ff590c 100644
--- a/ui/views/controls/textfield/native_textfield_views.h
+++ b/ui/views/controls/textfield/native_textfield_views.h
@@ -16,8 +16,8 @@
 #include "ui/views/controls/textfield/textfield_views_model.h"
 #include "ui/views/drag_controller.h"
 #include "ui/views/touchui/touch_selection_controller.h"
+#include "ui/views/view.h"
 #include "views/border.h"
-#include "views/view.h"
 
 namespace base {
 class Time;
diff --git a/ui/views/controls/textfield/textfield.h b/ui/views/controls/textfield/textfield.h
index abdd590..5ff542d 100644
--- a/ui/views/controls/textfield/textfield.h
+++ b/ui/views/controls/textfield/textfield.h
@@ -19,7 +19,7 @@
 #include "ui/gfx/font.h"
 #include "ui/gfx/native_widget_types.h"
 #include "ui/views/controls/textfield/native_textfield_wrapper.h"
-#include "views/view.h"
+#include "ui/views/view.h"
 
 #if !defined(OS_LINUX)
 #include "base/logging.h"
diff --git a/ui/views/controls/throbber.h b/ui/views/controls/throbber.h
index e40828f..28ead31 100644
--- a/ui/views/controls/throbber.h
+++ b/ui/views/controls/throbber.h
@@ -10,7 +10,7 @@
 #include "base/compiler_specific.h"
 #include "base/time.h"
 #include "base/timer.h"
-#include "views/view.h"
+#include "ui/views/view.h"
 
 class SkBitmap;
 
diff --git a/ui/views/debug_utils.cc b/ui/views/debug_utils.cc
index 23a75d2..9298122 100644
--- a/ui/views/debug_utils.cc
+++ b/ui/views/debug_utils.cc
@@ -6,7 +6,7 @@
 
 #include "base/logging.h"
 #include "base/utf_string_conversions.h"
-#include "views/view.h"
+#include "ui/views/view.h"
 
 #ifndef NDEBUG
 #include <iostream>
diff --git a/ui/views/events/event.cc b/ui/views/events/event.cc
index 1fd17ec..5f2d320 100644
--- a/ui/views/events/event.cc
+++ b/ui/views/events/event.cc
@@ -6,8 +6,8 @@
 
 #include "base/logging.h"
 #include "ui/base/keycodes/keyboard_code_conversion.h"
+#include "ui/views/view.h"
 #include "ui/views/widget/root_view.h"
-#include "views/view.h"
 
 namespace views {
 
diff --git a/ui/views/examples/button_example.cc b/ui/views/examples/button_example.cc
index ca15c36..6a16864 100644
--- a/ui/views/examples/button_example.cc
+++ b/ui/views/examples/button_example.cc
@@ -9,7 +9,7 @@
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/views/controls/button/checkbox.h"
 #include "ui/views/layout/fill_layout.h"
-#include "views/view.h"
+#include "ui/views/view.h"
 
 namespace views {
 namespace examples {
diff --git a/ui/views/examples/example_base.cc b/ui/views/examples/example_base.cc
index f86278e..1336c0c 100644
--- a/ui/views/examples/example_base.cc
+++ b/ui/views/examples/example_base.cc
@@ -9,7 +9,7 @@
 #include "base/compiler_specific.h"
 #include "base/stringprintf.h"
 #include "ui/views/examples/examples_window.h"
-#include "views/view.h"
+#include "ui/views/view.h"
 
 namespace views {
 namespace examples {
diff --git a/ui/views/examples/link_example.cc b/ui/views/examples/link_example.cc
index 183badc..4882aaa 100644
--- a/ui/views/examples/link_example.cc
+++ b/ui/views/examples/link_example.cc
@@ -7,7 +7,7 @@
 #include "base/utf_string_conversions.h"
 #include "ui/views/controls/link.h"
 #include "ui/views/layout/fill_layout.h"
-#include "views/view.h"
+#include "ui/views/view.h"
 
 namespace views {
 namespace examples {
diff --git a/ui/views/examples/menu_example.cc b/ui/views/examples/menu_example.cc
index db27e07..50640c3 100644
--- a/ui/views/examples/menu_example.cc
+++ b/ui/views/examples/menu_example.cc
@@ -13,7 +13,7 @@
 #include "ui/views/controls/menu/menu_2.h"
 #include "ui/views/controls/menu/view_menu_delegate.h"
 #include "ui/views/layout/fill_layout.h"
-#include "views/view.h"
+#include "ui/views/view.h"
 
 namespace views {
 namespace examples {
diff --git a/ui/views/examples/message_box_example.cc b/ui/views/examples/message_box_example.cc
index 942f22b..3bb6eb7 100644
--- a/ui/views/examples/message_box_example.cc
+++ b/ui/views/examples/message_box_example.cc
@@ -7,7 +7,7 @@
 #include "base/utf_string_conversions.h"
 #include "ui/views/controls/message_box_view.h"
 #include "ui/views/layout/grid_layout.h"
-#include "views/view.h"
+#include "ui/views/view.h"
 
 namespace views {
 namespace examples {
diff --git a/ui/views/examples/native_widget_views_example.cc b/ui/views/examples/native_widget_views_example.cc
index c42bc72..783ca4a 100644
--- a/ui/views/examples/native_widget_views_example.cc
+++ b/ui/views/examples/native_widget_views_example.cc
@@ -9,9 +9,9 @@
 #include "ui/views/controls/button/text_button.h"
 #include "ui/views/examples/example_base.h"
 #include "ui/views/test/test_views_delegate.h"
+#include "ui/views/view.h"
 #include "ui/views/widget/native_widget_views.h"
 #include "ui/views/widget/widget.h"
-#include "views/view.h"
 
 namespace examples {
 
diff --git a/ui/views/examples/progress_bar_example.cc b/ui/views/examples/progress_bar_example.cc
index f355007..3a93bc5 100644
--- a/ui/views/examples/progress_bar_example.cc
+++ b/ui/views/examples/progress_bar_example.cc
@@ -8,7 +8,7 @@
 #include "ui/views/controls/button/text_button.h"
 #include "ui/views/controls/progress_bar.h"
 #include "ui/views/layout/grid_layout.h"
-#include "views/view.h"
+#include "ui/views/view.h"
 
 namespace {
 
diff --git a/ui/views/examples/radio_button_example.cc b/ui/views/examples/radio_button_example.cc
index 315793a..42a6ea9 100644
--- a/ui/views/examples/radio_button_example.cc
+++ b/ui/views/examples/radio_button_example.cc
@@ -8,7 +8,7 @@
 #include "base/utf_string_conversions.h"
 #include "ui/views/controls/button/text_button.h"
 #include "ui/views/layout/grid_layout.h"
-#include "views/view.h"
+#include "ui/views/view.h"
 
 namespace views {
 namespace examples {
diff --git a/ui/views/examples/scroll_view_example.cc b/ui/views/examples/scroll_view_example.cc
index 5247640..a0f293f 100644
--- a/ui/views/examples/scroll_view_example.cc
+++ b/ui/views/examples/scroll_view_example.cc
@@ -8,7 +8,7 @@
 #include "base/utf_string_conversions.h"
 #include "ui/views/controls/button/radio_button.h"
 #include "ui/views/layout/grid_layout.h"
-#include "views/view.h"
+#include "ui/views/view.h"
 
 namespace views {
 namespace examples {
diff --git a/ui/views/examples/text_example.cc b/ui/views/examples/text_example.cc
index d51b1d5..c167d00 100644
--- a/ui/views/examples/text_example.cc
+++ b/ui/views/examples/text_example.cc
@@ -13,7 +13,7 @@
 #include "ui/views/controls/label.h"
 #include "ui/views/examples/example_combobox_model.h"
 #include "ui/views/layout/grid_layout.h"
-#include "views/view.h"
+#include "ui/views/view.h"
 
 namespace {
 
diff --git a/ui/views/examples/textfield_example.cc b/ui/views/examples/textfield_example.cc
index 780cd81..7b4986c 100644
--- a/ui/views/examples/textfield_example.cc
+++ b/ui/views/examples/textfield_example.cc
@@ -10,7 +10,7 @@
 #include "ui/views/controls/label.h"
 #include "ui/views/controls/textfield/textfield.h"
 #include "ui/views/layout/grid_layout.h"
-#include "views/view.h"
+#include "ui/views/view.h"
 
 namespace views {
 namespace examples {
diff --git a/ui/views/examples/throbber_example.cc b/ui/views/examples/throbber_example.cc
index a3af5cf..913d079 100644
--- a/ui/views/examples/throbber_example.cc
+++ b/ui/views/examples/throbber_example.cc
@@ -6,7 +6,7 @@
 
 #include "ui/views/controls/throbber.h"
 #include "ui/views/layout/fill_layout.h"
-#include "views/view.h"
+#include "ui/views/view.h"
 
 namespace views {
 namespace examples {
diff --git a/ui/views/examples/widget_example.cc b/ui/views/examples/widget_example.cc
index 76ccb49..11d6504 100644
--- a/ui/views/examples/widget_example.cc
+++ b/ui/views/examples/widget_example.cc
@@ -8,8 +8,8 @@
 #include "ui/views/controls/button/text_button.h"
 #include "ui/views/layout/box_layout.h"
 #include "ui/views/layout/layout_manager.h"
+#include "ui/views/view.h"
 #include "ui/views/widget/widget.h"
-#include "views/view.h"
 
 namespace views {
 namespace examples {
diff --git a/ui/views/focus/accelerator_handler_gtk_unittest.cc b/ui/views/focus/accelerator_handler_gtk_unittest.cc
index cdf24e1..d4db6f5 100644
--- a/ui/views/focus/accelerator_handler_gtk_unittest.cc
+++ b/ui/views/focus/accelerator_handler_gtk_unittest.cc
@@ -9,9 +9,9 @@
 #include "ui/gfx/rect.h"
 #include "ui/views/focus/accelerator_handler.h"
 #include "ui/views/focus/focus_manager.h"
+#include "ui/views/view.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/widget/widget_delegate.h"
-#include "views/view.h"
 
 namespace views {
 
diff --git a/ui/views/focus/external_focus_tracker.cc b/ui/views/focus/external_focus_tracker.cc
index 7e58bc6..cd14496 100644
--- a/ui/views/focus/external_focus_tracker.cc
+++ b/ui/views/focus/external_focus_tracker.cc
@@ -6,7 +6,7 @@
 
 #include "base/logging.h"
 #include "ui/views/focus/view_storage.h"
-#include "views/view.h"
+#include "ui/views/view.h"
 
 namespace views {
 
diff --git a/ui/views/focus/focus_manager.cc b/ui/views/focus/focus_manager.cc
index 61567bc..ca2a55f 100644
--- a/ui/views/focus/focus_manager.cc
+++ b/ui/views/focus/focus_manager.cc
@@ -15,9 +15,9 @@
 #include "ui/views/focus/focus_search.h"
 #include "ui/views/focus/view_storage.h"
 #include "ui/views/focus/widget_focus_manager.h"
+#include "ui/views/view.h"
 #include "ui/views/widget/root_view.h"
 #include "ui/views/widget/widget.h"
-#include "views/view.h"
 
 namespace views {
 
diff --git a/ui/views/focus/focus_search.cc b/ui/views/focus/focus_search.cc
index e1f3c7b..56ec02f 100644
--- a/ui/views/focus/focus_search.cc
+++ b/ui/views/focus/focus_search.cc
@@ -5,7 +5,7 @@
 #include "base/logging.h"
 #include "ui/views/focus/focus_manager.h"
 #include "ui/views/focus/focus_search.h"
-#include "views/view.h"
+#include "ui/views/view.h"
 
 namespace views {
 
diff --git a/ui/views/focus/focus_search.h b/ui/views/focus/focus_search.h
index 9fe37a0..50ba6f8 100644
--- a/ui/views/focus/focus_search.h
+++ b/ui/views/focus/focus_search.h
@@ -6,7 +6,7 @@
 #define UI_VIEWS_FOCUS_FOCUS_SEARCH_H_
 #pragma once
 
-#include "views/view.h"
+#include "ui/views/view.h"
 
 namespace views {
 
diff --git a/ui/views/focus/view_storage.h b/ui/views/focus/view_storage.h
index 7d748e2..80ea032 100644
--- a/ui/views/focus/view_storage.h
+++ b/ui/views/focus/view_storage.h
@@ -7,7 +7,7 @@
 #pragma once
 
 #include "base/memory/singleton.h"
-#include "views/view.h"
+#include "ui/views/view.h"
 
 // This class is a simple storage place for storing/retrieving views.  It is
 // used for example in the FocusManager to store/restore focused views when the
diff --git a/ui/views/ime/input_method_base.cc b/ui/views/ime/input_method_base.cc
index cb9573c..14d2efd 100644
--- a/ui/views/ime/input_method_base.cc
+++ b/ui/views/ime/input_method_base.cc
@@ -5,8 +5,8 @@
 #include "ui/base/ime/text_input_client.h"
 #include "ui/views/ime/input_method_base.h"
 #include "ui/views/ime/text_input_type_tracker.h"
+#include "ui/views/view.h"
 #include "ui/views/widget/widget.h"
-#include "views/view.h"
 
 #include "base/logging.h"
 
diff --git a/ui/views/ime/input_method_gtk.h b/ui/views/ime/input_method_gtk.h
index 670669f..ddb9f240 100644
--- a/ui/views/ime/input_method_gtk.h
+++ b/ui/views/ime/input_method_gtk.h
@@ -14,7 +14,7 @@
 #include "ui/base/ime/composition_text.h"
 #include "ui/base/ime/text_input_client.h"
 #include "ui/views/ime/input_method_base.h"
-#include "views/view.h"
+#include "ui/views/view.h"
 
 namespace views {
 
diff --git a/ui/views/ime/input_method_ibus.h b/ui/views/ime/input_method_ibus.h
index c4b516b..8af9c11 100644
--- a/ui/views/ime/input_method_ibus.h
+++ b/ui/views/ime/input_method_ibus.h
@@ -19,7 +19,7 @@
 #include "ui/base/ime/text_input_client.h"
 #include "ui/views/events/event.h"
 #include "ui/views/ime/input_method_base.h"
-#include "views/view.h"
+#include "ui/views/view.h"
 
 // Forward declarations, so that we don't need to include ibus.h in this file.
 typedef struct _GAsyncResult GAsyncResult;
diff --git a/ui/views/ime/input_method_win.h b/ui/views/ime/input_method_win.h
index 5a34673..2be706c 100644
--- a/ui/views/ime/input_method_win.h
+++ b/ui/views/ime/input_method_win.h
@@ -14,8 +14,8 @@
 #include "base/compiler_specific.h"
 #include "ui/base/win/ime_input.h"
 #include "ui/views/ime/input_method_base.h"
+#include "ui/views/view.h"
 #include "ui/views/widget/widget.h"
-#include "views/view.h"
 
 namespace views {
 
diff --git a/ui/views/ime/mock_input_method.h b/ui/views/ime/mock_input_method.h
index 5384661..1fe432e 100644
--- a/ui/views/ime/mock_input_method.h
+++ b/ui/views/ime/mock_input_method.h
@@ -12,7 +12,7 @@
 #include "base/compiler_specific.h"
 #include "ui/base/ime/composition_text.h"
 #include "ui/views/ime/input_method_base.h"
-#include "views/view.h"
+#include "ui/views/view.h"
 
 namespace views {
 
diff --git a/ui/views/layout/box_layout.cc b/ui/views/layout/box_layout.cc
index 7471b4c..332322f 100644
--- a/ui/views/layout/box_layout.cc
+++ b/ui/views/layout/box_layout.cc
@@ -6,7 +6,7 @@
 
 #include "ui/gfx/insets.h"
 #include "ui/gfx/rect.h"
-#include "views/view.h"
+#include "ui/views/view.h"
 
 namespace views {
 
diff --git a/ui/views/layout/box_layout_unittest.cc b/ui/views/layout/box_layout_unittest.cc
index 0430c0c..dcf3227 100644
--- a/ui/views/layout/box_layout_unittest.cc
+++ b/ui/views/layout/box_layout_unittest.cc
@@ -4,7 +4,7 @@
 
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/views/layout/box_layout.h"
-#include "views/view.h"
+#include "ui/views/view.h"
 
 class StaticSizedView : public views::View {
  public:
diff --git a/ui/views/layout/fill_layout.h b/ui/views/layout/fill_layout.h
index b7d4c41..59a3f5d 100644
--- a/ui/views/layout/fill_layout.h
+++ b/ui/views/layout/fill_layout.h
@@ -8,7 +8,7 @@
 
 #include "base/compiler_specific.h"
 #include "ui/views/layout/layout_manager.h"
-#include "views/view.h"
+#include "ui/views/view.h"
 
 namespace views {
 
diff --git a/ui/views/layout/grid_layout.cc b/ui/views/layout/grid_layout.cc
index 7444b8b..8fb1005 100644
--- a/ui/views/layout/grid_layout.cc
+++ b/ui/views/layout/grid_layout.cc
@@ -10,7 +10,7 @@
 #include "base/stl_util.h"
 #include "ui/gfx/insets.h"
 #include "ui/views/layout/layout_constants.h"
-#include "views/view.h"
+#include "ui/views/view.h"
 
 namespace views {
 
diff --git a/ui/views/layout/grid_layout.h b/ui/views/layout/grid_layout.h
index a57e16d..70e9502 100644
--- a/ui/views/layout/grid_layout.h
+++ b/ui/views/layout/grid_layout.h
@@ -11,7 +11,7 @@
 
 #include "base/compiler_specific.h"
 #include "ui/views/layout/layout_manager.h"
-#include "views/view.h"
+#include "ui/views/view.h"
 
 namespace gfx {
 class Insets;
diff --git a/ui/views/layout/grid_layout_unittest.cc b/ui/views/layout/grid_layout_unittest.cc
index d7911c6..4c29cc6 100644
--- a/ui/views/layout/grid_layout_unittest.cc
+++ b/ui/views/layout/grid_layout_unittest.cc
@@ -4,7 +4,7 @@
 
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/views/layout/grid_layout.h"
-#include "views/view.h"
+#include "ui/views/view.h"
 
 using views::ColumnSet;
 using views::GridLayout;
diff --git a/ui/views/layout/layout_manager.cc b/ui/views/layout/layout_manager.cc
index f2b4e8a..188cc6f1 100644
--- a/ui/views/layout/layout_manager.cc
+++ b/ui/views/layout/layout_manager.cc
@@ -4,7 +4,7 @@
 
 #include "ui/views/layout/layout_manager.h"
 
-#include "views/view.h"
+#include "ui/views/view.h"
 
 namespace views {
 
diff --git a/ui/views/mouse_watcher.cc b/ui/views/mouse_watcher.cc
index 555af23..1115901 100644
--- a/ui/views/mouse_watcher.cc
+++ b/ui/views/mouse_watcher.cc
@@ -11,8 +11,8 @@
 #include "base/message_loop.h"
 #include "ui/base/events.h"
 #include "ui/gfx/screen.h"
+#include "ui/views/view.h"
 #include "ui/views/widget/widget.h"
-#include "views/view.h"
 
 namespace views {
 
diff --git a/ui/views/touchui/gesture_manager.cc b/ui/views/touchui/gesture_manager.cc
index 8aba2a31..4dd6b0a 100644
--- a/ui/views/touchui/gesture_manager.cc
+++ b/ui/views/touchui/gesture_manager.cc
@@ -10,8 +10,8 @@
 
 #include "base/logging.h"
 #include "ui/views/events/event.h"
+#include "ui/views/view.h"
 #include "ui/views/widget/widget.h"
-#include "views/view.h"
 
 namespace views {
 
diff --git a/ui/views/touchui/gesture_manager.h b/ui/views/touchui/gesture_manager.h
index 50e266c..e5ec4b5 100644
--- a/ui/views/touchui/gesture_manager.h
+++ b/ui/views/touchui/gesture_manager.h
@@ -7,7 +7,7 @@
 #pragma once
 
 #include "base/memory/singleton.h"
-#include "views/view.h"
+#include "ui/views/view.h"
 
 namespace ui {
 enum TouchStatus;
diff --git a/ui/views/touchui/touch_selection_controller.h b/ui/views/touchui/touch_selection_controller.h
index c117dc2..5318c9d 100644
--- a/ui/views/touchui/touch_selection_controller.h
+++ b/ui/views/touchui/touch_selection_controller.h
@@ -8,7 +8,7 @@
 
 #include "ui/base/models/simple_menu_model.h"
 #include "ui/gfx/point.h"
-#include "views/view.h"
+#include "ui/views/view.h"
 
 namespace views {
 
diff --git a/ui/views/touchui/touch_selection_controller_impl.h b/ui/views/touchui/touch_selection_controller_impl.h
index 494482e..f0d5a5d 100644
--- a/ui/views/touchui/touch_selection_controller_impl.h
+++ b/ui/views/touchui/touch_selection_controller_impl.h
@@ -9,7 +9,7 @@
 #include "base/timer.h"
 #include "ui/gfx/point.h"
 #include "ui/views/touchui/touch_selection_controller.h"
-#include "views/view.h"
+#include "ui/views/view.h"
 #include "views/views_export.h"
 
 namespace views {
diff --git a/views/view.cc b/ui/views/view.cc
index 6a0db83..09d3cbe 100644
--- a/views/view.cc
+++ b/ui/views/view.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "views/view.h"
+#include "ui/views/view.h"
 
 #include <algorithm>
 
diff --git a/views/view.h b/ui/views/view.h
index e93a125..6e8eb28 100644
--- a/views/view.h
+++ b/ui/views/view.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef VIEWS_VIEW_H_
-#define VIEWS_VIEW_H_
+#ifndef UI_VIEWS_VIEW_H_
+#define UI_VIEWS_VIEW_H_
 #pragma once
 
 #include <algorithm>
@@ -1437,4 +1437,4 @@ class VIEWS_EXPORT View : public ui::LayerDelegate,
 
 }  // namespace views
 
-#endif  // VIEWS_VIEW_H_
+#endif  // UI_VIEWS_VIEW_H_
diff --git a/views/view_aura.cc b/ui/views/view_aura.cc
index 0f5911d..6045b91 100644
--- a/views/view_aura.cc
+++ b/ui/views/view_aura.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "views/view.h"
+#include "ui/views/view.h"
 
 namespace {
 
diff --git a/views/view_gtk.cc b/ui/views/view_gtk.cc
index af62f1e..459cd31 100644
--- a/views/view_gtk.cc
+++ b/ui/views/view_gtk.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "views/view.h"
+#include "ui/views/view.h"
 
 #include <gtk/gtk.h>
 
diff --git a/views/view_unittest.cc b/ui/views/view_unittest.cc
index baee824..e64fae6 100644
--- a/views/view_unittest.cc
+++ b/ui/views/view_unittest.cc
@@ -31,11 +31,11 @@
 #include "ui/views/focus/view_storage.h"
 #include "ui/views/test/views_test_base.h"
 #include "ui/views/touchui/gesture_manager.h"
+#include "ui/views/view.h"
 #include "ui/views/widget/native_widget.h"
 #include "ui/views/widget/root_view.h"
 #include "ui/views/window/dialog_delegate.h"
 #include "views/background.h"
-#include "views/view.h"
 #include "views/views_delegate.h"
 
 #if defined(OS_WIN)
diff --git a/views/view_win.cc b/ui/views/view_win.cc
index f8adb43..472fbcd 100644
--- a/views/view_win.cc
+++ b/ui/views/view_win.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "views/view.h"
+#include "ui/views/view.h"
 
 // Necessary to define oleacc GUID's.
 #include <windows.h>
diff --git a/ui/views/widget/drop_helper.cc b/ui/views/widget/drop_helper.cc
index a351090..5b70260 100644
--- a/ui/views/widget/drop_helper.cc
+++ b/ui/views/widget/drop_helper.cc
@@ -5,8 +5,8 @@
 #include "ui/views/widget/drop_helper.h"
 
 #include "ui/base/dragdrop/drag_drop_types.h"
+#include "ui/views/view.h"
 #include "ui/views/widget/widget.h"
-#include "views/view.h"
 
 namespace views {
 
diff --git a/ui/views/widget/native_widget_test_utils_aura.cc b/ui/views/widget/native_widget_test_utils_aura.cc
index 4b0ecec..af7cf59 100644
--- a/ui/views/widget/native_widget_test_utils_aura.cc
+++ b/ui/views/widget/native_widget_test_utils_aura.cc
@@ -4,9 +4,9 @@
 
 #include "ui/views/widget/native_widget_test_utils.h"
 
+#include "ui/views/view.h"
 #include "ui/views/widget/native_widget_private.h"
 #include "ui/views/widget/widget.h"
-#include "views/view.h"
 
 namespace views {
 namespace internal {
diff --git a/ui/views/widget/native_widget_test_utils_gtk.cc b/ui/views/widget/native_widget_test_utils_gtk.cc
index 60c2050..3f3fc76 100644
--- a/ui/views/widget/native_widget_test_utils_gtk.cc
+++ b/ui/views/widget/native_widget_test_utils_gtk.cc
@@ -4,9 +4,9 @@
 
 #include "ui/views/widget/native_widget_test_utils.h"
 
+#include "ui/views/view.h"
 #include "ui/views/widget/native_widget_private.h"
 #include "ui/views/widget/widget.h"
-#include "views/view.h"
 
 namespace views {
 namespace internal {
diff --git a/ui/views/widget/native_widget_test_utils_win.cc b/ui/views/widget/native_widget_test_utils_win.cc
index 4b0ecec..af7cf59 100644
--- a/ui/views/widget/native_widget_test_utils_win.cc
+++ b/ui/views/widget/native_widget_test_utils_win.cc
@@ -4,9 +4,9 @@
 
 #include "ui/views/widget/native_widget_test_utils.h"
 
+#include "ui/views/view.h"
 #include "ui/views/widget/native_widget_private.h"
 #include "ui/views/widget/widget.h"
-#include "views/view.h"
 
 namespace views {
 namespace internal {
diff --git a/ui/views/widget/native_widget_unittest.cc b/ui/views/widget/native_widget_unittest.cc
index 7e9b4de..808649a 100644
--- a/ui/views/widget/native_widget_unittest.cc
+++ b/ui/views/widget/native_widget_unittest.cc
@@ -5,10 +5,10 @@
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/views/controls/native/native_view_host.h"
 #include "ui/views/test/views_test_base.h"
+#include "ui/views/view.h"
 #include "ui/views/widget/native_widget_private.h"
 #include "ui/views/widget/native_widget_test_utils.h"
 #include "ui/views/widget/widget.h"
-#include "views/view.h"
 
 namespace views {
 
diff --git a/ui/views/widget/root_view.h b/ui/views/widget/root_view.h
index d5df829..0158f7f 100644
--- a/ui/views/widget/root_view.h
+++ b/ui/views/widget/root_view.h
@@ -11,7 +11,7 @@
 #include "base/memory/ref_counted.h"
 #include "ui/views/focus/focus_manager.h"
 #include "ui/views/focus/focus_search.h"
-#include "views/view.h"
+#include "ui/views/view.h"
 
 namespace ui {
 enum TouchStatus;
diff --git a/ui/views/widget/tooltip_manager_gtk.cc b/ui/views/widget/tooltip_manager_gtk.cc
index b33e5ad..8114128 100644
--- a/ui/views/widget/tooltip_manager_gtk.cc
+++ b/ui/views/widget/tooltip_manager_gtk.cc
@@ -9,8 +9,8 @@
 #include "ui/gfx/font.h"
 #include "ui/gfx/screen.h"
 #include "ui/views/focus/focus_manager.h"
+#include "ui/views/view.h"
 #include "ui/views/widget/native_widget_gtk.h"
-#include "views/view.h"
 
 // WARNING: this implementation is good for a start, but it doesn't give us
 // control of tooltip positioning both on mouse events and when showing from
diff --git a/ui/views/widget/tooltip_manager_views.cc b/ui/views/widget/tooltip_manager_views.cc
index fa3cb63..264dbc3 100644
--- a/ui/views/widget/tooltip_manager_views.cc
+++ b/ui/views/widget/tooltip_manager_views.cc
@@ -28,10 +28,10 @@
 #include "ui/gfx/screen.h"
 #include "ui/views/events/event.h"
 #include "ui/views/focus/focus_manager.h"
+#include "ui/views/view.h"
 #include "ui/views/widget/native_widget.h"
 #include "views/background.h"
 #include "views/border.h"
-#include "views/view.h"
 
 namespace {
 SkColor kTooltipBackground = 0xFF7F7F00;
diff --git a/ui/views/widget/tooltip_manager_views.h b/ui/views/widget/tooltip_manager_views.h
index e844ddf..1a6ef18 100644
--- a/ui/views/widget/tooltip_manager_views.h
+++ b/ui/views/widget/tooltip_manager_views.h
@@ -9,10 +9,10 @@
 #include "base/message_loop.h"
 #include "base/timer.h"
 #include "ui/views/controls/label.h"
+#include "ui/views/view.h"
 #include "ui/views/widget/native_widget.h"
 #include "ui/views/widget/tooltip_manager.h"
 #include "ui/views/widget/widget_delegate.h"
-#include "views/view.h"
 
 #if defined(USE_X11)
 typedef union _XEvent XEvent;
diff --git a/ui/views/widget/tooltip_manager_win.cc b/ui/views/widget/tooltip_manager_win.cc
index fedb700..f03d858 100644
--- a/ui/views/widget/tooltip_manager_win.cc
+++ b/ui/views/widget/tooltip_manager_win.cc
@@ -17,9 +17,9 @@
 #include "ui/base/win/hwnd_util.h"
 #include "ui/gfx/font.h"
 #include "ui/gfx/screen.h"
+#include "ui/views/view.h"
 #include "ui/views/widget/monitor_win.h"
 #include "ui/views/widget/widget.h"
-#include "views/view.h"
 
 namespace views {
 
diff --git a/ui/views/widget/widget_delegate.cc b/ui/views/widget/widget_delegate.cc
index 94ebcf1..84af2343 100644
--- a/ui/views/widget/widget_delegate.cc
+++ b/ui/views/widget/widget_delegate.cc
@@ -7,9 +7,9 @@
 #include "base/utf_string_conversions.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/views/bubble/bubble_delegate.h"
+#include "ui/views/view.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/window/client_view.h"
-#include "views/view.h"
 #include "views/views_delegate.h"
 
 namespace views {
diff --git a/ui/views/widget/widget_delegate.h b/ui/views/widget/widget_delegate.h
index b771d33..58a2c72 100644
--- a/ui/views/widget/widget_delegate.h
+++ b/ui/views/widget/widget_delegate.h
@@ -11,7 +11,7 @@
 #include "base/memory/scoped_ptr.h"
 #include "ui/base/accessibility/accessibility_types.h"
 #include "ui/base/ui_base_types.h"
-#include "views/view.h"
+#include "ui/views/view.h"
 
 class SkBitmap;
 
diff --git a/ui/views/window/client_view.h b/ui/views/window/client_view.h
index 4b809f2..46da6e2 100644
--- a/ui/views/window/client_view.h
+++ b/ui/views/window/client_view.h
@@ -6,7 +6,7 @@
 #define UI_VIEWS_WINDOW_CLIENT_VIEW_H_
 #pragma once
 
-#include "views/view.h"
+#include "ui/views/view.h"
 
 namespace views {
 
diff --git a/ui/views/window/non_client_view.h b/ui/views/window/non_client_view.h
index fc97d69..eaea2bc 100644
--- a/ui/views/window/non_client_view.h
+++ b/ui/views/window/non_client_view.h
@@ -6,8 +6,8 @@
 #define UI_VIEWS_WINDOW_NON_CLIENT_VIEW_H_
 #pragma once
 
+#include "ui/views/view.h"
 #include "ui/views/window/client_view.h"
-#include "views/view.h"
 
 namespace gfx {
 class Path;
diff --git a/views/accessible_pane_view.h b/views/accessible_pane_view.h
index 655ebd9..104294e 100644
--- a/views/accessible_pane_view.h
+++ b/views/accessible_pane_view.h
@@ -11,7 +11,7 @@
 #include "base/memory/weak_ptr.h"
 #include "ui/base/accelerators/accelerator.h"
 #include "ui/views/focus/focus_manager.h"
-#include "views/view.h"
+#include "ui/views/view.h"
 
 namespace views {
 class FocusSearch;
diff --git a/views/background.cc b/views/background.cc
index fa79793..717261d 100644
--- a/views/background.cc
+++ b/views/background.cc
@@ -9,8 +9,8 @@
 #include "third_party/skia/include/core/SkPaint.h"
 #include "ui/gfx/canvas_skia.h"
 #include "ui/gfx/color_utils.h"
+#include "ui/views/view.h"
 #include "views/painter.h"
-#include "views/view.h"
 
 namespace views {
 
diff --git a/views/border.h b/views/border.h
index 27a46c6..fc7bdc4 100644
--- a/views/border.h
+++ b/views/border.h
@@ -8,7 +8,7 @@
 
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/gfx/insets.h"
-#include "views/view.h"
+#include "ui/views/view.h"
 
 namespace gfx{
 class Canvas;
diff --git a/views/paint_lock.cc b/views/paint_lock.cc
index 282c2c3..3b2ce1d 100644
--- a/views/paint_lock.cc
+++ b/views/paint_lock.cc
@@ -4,7 +4,7 @@
 
 #include "views/paint_lock.h"
 
-#include "views/view.h"
+#include "ui/views/view.h"
 
 namespace views {
 
diff --git a/views/run_all_unittests.cc b/views/run_all_unittests.cc
index 083d4a8..e675291 100644
--- a/views/run_all_unittests.cc
+++ b/views/run_all_unittests.cc
@@ -7,7 +7,7 @@
 #include "ui/base/ui_base_paths.h"
 #include "ui/gfx/compositor/test/compositor_test_support.h"
 #include "ui/gfx/test/gfx_test_utils.h"
-#include "views/view.h"
+#include "ui/views/view.h"
 
 class ViewTestSuite : public base::TestSuite {
  public:
diff --git a/views/views.gyp b/views/views.gyp
index 889df74..63373b8 100644
--- a/views/views.gyp
+++ b/views/views.gyp
@@ -60,15 +60,10 @@
         'painter.h',
         'repeat_controller.cc',
         'repeat_controller.h',
-        'view.cc',
-        'view.h',
-        'view_aura.cc',
         'view_constants.cc',
         'view_constants.h',
-        'view_gtk.cc',
         'view_text_utils.cc',
         'view_text_utils.h',
-        'view_win.cc',
         'views_delegate.h',
         '../ui/views/accessibility/native_view_accessibility_win.cc',
         '../ui/views/accessibility/native_view_accessibility_win.h',
@@ -325,6 +320,11 @@
         '../ui/views/touchui/gesture_manager.h',
         '../ui/views/touchui/touch_selection_controller.cc',
         '../ui/views/touchui/touch_selection_controller.h',
+        '../ui/views/view.cc',
+        '../ui/views/view.h',
+        '../ui/views/view_aura.cc',
+        '../ui/views/view_gtk.cc',
+        '../ui/views/view_win.cc',
         '../ui/views/widget/aero_tooltip_manager.cc',
         '../ui/views/widget/aero_tooltip_manager.h',
         '../ui/views/widget/child_window_message_processor.cc',
@@ -534,6 +534,7 @@
         '../ui/views/test/test_views_delegate.h',
         '../ui/views/test/views_test_base.cc',
         '../ui/views/test/views_test_base.h',
+        '../ui/views/view_unittest.cc',
         '../ui/views/widget/native_widget_test_utils.h',
         '../ui/views/widget/native_widget_test_utils_aura.cc',
         '../ui/views/widget/native_widget_test_utils_gtk.cc',
@@ -543,7 +544,6 @@
         '../ui/views/widget/widget_unittest.cc',
         'accessible_pane_view_unittest.cc',
         'run_all_unittests.cc',
-        'view_unittest.cc',
 
         '<(SHARED_INTERMEDIATE_DIR)/ui/gfx/gfx_resources.rc',
         '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc',