Revert 110949 - views: Move widget/ directory to ui/views.

BUG=104039
R=ben@chromium.org

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

TBR=tfarina@chromium.org
Review URL: http://codereview.chromium.org/8547015

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

51 files changed, 132 insertions, 133 deletions

diff --git a/views/accessible_pane_view.cc b/views/accessible_pane_view.cc
index 1b1387f..425523a 100644
--- a/views/accessible_pane_view.cc
+++ b/views/accessible_pane_view.cc
@@ -7,7 +7,7 @@
 #include "ui/base/accessibility/accessible_view_state.h"
 #include "ui/views/focus/focus_search.h"
 #include "ui/views/focus/view_storage.h"
-#include "ui/views/widget/widget.h"
+#include "views/widget/widget.h"
 
 namespace views {
 
diff --git a/views/accessible_pane_view_unittest.cc b/views/accessible_pane_view_unittest.cc
index 96b8b09..bc88aa4 100644
--- a/views/accessible_pane_view_unittest.cc
+++ b/views/accessible_pane_view_unittest.cc
@@ -7,8 +7,8 @@
 #include "ui/base/models/accelerator.h"
 #include "ui/views/layout/fill_layout.h"
 #include "ui/views/test/views_test_base.h"
-#include "ui/views/widget/widget.h"
 #include "views/controls/button/text_button.h"
+#include "views/widget/widget.h"
 
 namespace views {
 
diff --git a/views/controls/button/button_dropdown.cc b/views/controls/button/button_dropdown.cc
index 7df2164..f5477a5 100644
--- a/views/controls/button/button_dropdown.cc
+++ b/views/controls/button/button_dropdown.cc
@@ -12,10 +12,10 @@
 #include "ui/base/accessibility/accessible_view_state.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/models/menu_model.h"
-#include "ui/views/widget/widget.h"
 #include "views/controls/menu/menu_item_view.h"
 #include "views/controls/menu/menu_model_adapter.h"
 #include "views/controls/menu/menu_runner.h"
+#include "views/widget/widget.h"
 
 namespace views {
 
diff --git a/views/controls/button/custom_button.cc b/views/controls/button/custom_button.cc
index a4233b9..fc0c6b4 100644
--- a/views/controls/button/custom_button.cc
+++ b/views/controls/button/custom_button.cc
@@ -8,7 +8,7 @@
 #include "ui/base/animation/throb_animation.h"
 #include "ui/base/keycodes/keyboard_codes.h"
 #include "ui/gfx/screen.h"
-#include "ui/views/widget/widget.h"
+#include "views/widget/widget.h"
 
 namespace views {
 
diff --git a/views/controls/button/menu_button.cc b/views/controls/button/menu_button.cc
index 0248aaf..fc6afaa 100644
--- a/views/controls/button/menu_button.cc
+++ b/views/controls/button/menu_button.cc
@@ -14,10 +14,10 @@
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/screen.h"
 #include "ui/views/events/event.h"
-#include "ui/views/widget/root_view.h"
-#include "ui/views/widget/widget.h"
 #include "views/controls/button/button.h"
 #include "views/controls/menu/view_menu_delegate.h"
+#include "views/widget/root_view.h"
+#include "views/widget/widget.h"
 
 using base::Time;
 using base::TimeDelta;
diff --git a/views/controls/button/radio_button.cc b/views/controls/button/radio_button.cc
index 8cd1c4a..170d010 100644
--- a/views/controls/button/radio_button.cc
+++ b/views/controls/button/radio_button.cc
@@ -6,7 +6,7 @@
 
 #include "base/logging.h"
 #include "ui/base/accessibility/accessible_view_state.h"
-#include "ui/views/widget/widget.h"
+#include "views/widget/widget.h"
 
 namespace views {
 
diff --git a/views/controls/button/text_button.cc b/views/controls/button/text_button.cc
index 3456f84..12f28f5 100644
--- a/views/controls/button/text_button.cc
+++ b/views/controls/button/text_button.cc
@@ -12,8 +12,8 @@
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas_skia.h"
 #include "ui/views/events/event.h"
-#include "ui/views/widget/widget.h"
 #include "views/controls/button/button.h"
+#include "views/widget/widget.h"
 
 #if defined(OS_WIN)
 #include "skia/ext/skia_utils_win.h"
diff --git a/views/controls/combobox/combobox.cc b/views/controls/combobox/combobox.cc
index cb7310d..c8bd106 100644
--- a/views/controls/combobox/combobox.cc
+++ b/views/controls/combobox/combobox.cc
@@ -9,8 +9,8 @@
 #include "ui/base/accessibility/accessible_view_state.h"
 #include "ui/base/keycodes/keyboard_codes.h"
 #include "ui/base/models/combobox_model.h"
-#include "ui/views/widget/widget.h"
 #include "views/controls/native/native_view_host.h"
+#include "views/widget/widget.h"
 
 namespace views {
 
diff --git a/views/controls/combobox/native_combobox_gtk.cc b/views/controls/combobox/native_combobox_gtk.cc
index 810ff42..a3f6106 100644
--- a/views/controls/combobox/native_combobox_gtk.cc
+++ b/views/controls/combobox/native_combobox_gtk.cc
@@ -11,10 +11,10 @@
 #include "base/message_loop.h"
 #include "base/utf_string_conversions.h"
 #include "ui/base/models/combobox_model.h"
-#include "ui/views/widget/widget.h"
 #include "views/controls/combobox/combobox.h"
 #include "views/controls/combobox/native_combobox_views.h"
 #include "views/views_delegate.h"
+#include "views/widget/widget.h"
 
 namespace views {
 
diff --git a/views/controls/combobox/native_combobox_views.cc b/views/controls/combobox/native_combobox_views.cc
index f48f9bd..864b993 100644
--- a/views/controls/combobox/native_combobox_views.cc
+++ b/views/controls/combobox/native_combobox_views.cc
@@ -15,14 +15,14 @@
 #include "ui/gfx/canvas_skia.h"
 #include "ui/gfx/font.h"
 #include "ui/gfx/path.h"
-#include "ui/views/widget/root_view.h"
-#include "ui/views/widget/widget.h"
 #include "views/background.h"
 #include "views/border.h"
 #include "views/controls/combobox/combobox.h"
 #include "views/controls/focusable_border.h"
 #include "views/controls/menu/menu_runner.h"
 #include "views/controls/menu/submenu_view.h"
+#include "views/widget/root_view.h"
+#include "views/widget/widget.h"
 
 #if defined(OS_LINUX)
 #include "ui/gfx/gtk_util.h"
diff --git a/views/controls/combobox/native_combobox_views_unittest.cc b/views/controls/combobox/native_combobox_views_unittest.cc
index 30b03e1..76d0c3c 100644
--- a/views/controls/combobox/native_combobox_views_unittest.cc
+++ b/views/controls/combobox/native_combobox_views_unittest.cc
@@ -7,10 +7,10 @@
 #include "ui/base/models/combobox_model.h"
 #include "ui/views/ime/mock_input_method.h"
 #include "ui/views/test/views_test_base.h"
-#include "ui/views/widget/native_widget_private.h"
-#include "ui/views/widget/widget.h"
 #include "views/controls/combobox/combobox.h"
 #include "views/controls/combobox/native_combobox_views.h"
+#include "views/widget/native_widget_private.h"
+#include "views/widget/widget.h"
 
 namespace {
 
diff --git a/views/controls/combobox/native_combobox_win.cc b/views/controls/combobox/native_combobox_win.cc
index 151cab4..23c3b85 100644
--- a/views/controls/combobox/native_combobox_win.cc
+++ b/views/controls/combobox/native_combobox_win.cc
@@ -11,9 +11,9 @@
 #include "ui/base/win/hwnd_util.h"
 #include "ui/gfx/font.h"
 #include "ui/gfx/native_theme_win.h"
-#include "ui/views/widget/widget.h"
 #include "views/controls/combobox/combobox.h"
 #include "views/controls/combobox/native_combobox_views.h"
+#include "views/widget/widget.h"
 
 namespace views {
 
diff --git a/views/controls/menu/menu_controller.cc b/views/controls/menu/menu_controller.cc
index 90dd6b2..37b98b1 100644
--- a/views/controls/menu/menu_controller.cc
+++ b/views/controls/menu/menu_controller.cc
@@ -14,8 +14,6 @@
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/gfx/canvas_skia.h"
 #include "ui/gfx/screen.h"
-#include "ui/views/widget/root_view.h"
-#include "ui/views/widget/widget.h"
 #include "views/controls/button/menu_button.h"
 #include "views/controls/menu/menu_controller_delegate.h"
 #include "views/controls/menu/menu_scroll_view_container.h"
@@ -23,6 +21,8 @@
 #include "views/drag_utils.h"
 #include "views/view_constants.h"
 #include "views/views_delegate.h"
+#include "views/widget/root_view.h"
+#include "views/widget/widget.h"
 
 #if defined(USE_AURA)
 #include "ui/aura/desktop.h"
diff --git a/views/controls/menu/menu_host.cc b/views/controls/menu/menu_host.cc
index 075fa82..593fb10 100644
--- a/views/controls/menu/menu_host.cc
+++ b/views/controls/menu/menu_host.cc
@@ -4,13 +4,13 @@
 
 #include "views/controls/menu/menu_host.h"
 
-#include "ui/views/widget/native_widget_private.h"
-#include "ui/views/widget/widget.h"
 #include "views/controls/menu/menu_controller.h"
 #include "views/controls/menu/menu_host_root_view.h"
 #include "views/controls/menu/menu_item_view.h"
 #include "views/controls/menu/native_menu_host.h"
 #include "views/controls/menu/submenu_view.h"
+#include "views/widget/native_widget_private.h"
+#include "views/widget/widget.h"
 
 namespace views {
 
diff --git a/views/controls/menu/menu_host.h b/views/controls/menu/menu_host.h
index df079cb..377f128 100644
--- a/views/controls/menu/menu_host.h
+++ b/views/controls/menu/menu_host.h
@@ -8,8 +8,8 @@
 
 #include "base/compiler_specific.h"
 #include "ui/gfx/rect.h"
-#include "ui/views/widget/widget.h"
 #include "views/controls/menu/native_menu_host_delegate.h"
+#include "views/widget/widget.h"
 
 namespace views {
 
diff --git a/views/controls/menu/menu_host_root_view.h b/views/controls/menu/menu_host_root_view.h
index 8558c15..11c674c 100644
--- a/views/controls/menu/menu_host_root_view.h
+++ b/views/controls/menu/menu_host_root_view.h
@@ -6,7 +6,7 @@
 #define VIEWS_CONTROLS_MENU_MENU_HOST_ROOT_VIEW_H_
 #pragma once
 
-#include "ui/views/widget/root_view.h"
+#include "views/widget/root_view.h"
 
 namespace views {
 
diff --git a/views/controls/menu/native_menu_gtk.cc b/views/controls/menu/native_menu_gtk.cc
index 62d05cb..85b87b5 100644
--- a/views/controls/menu/native_menu_gtk.cc
+++ b/views/controls/menu/native_menu_gtk.cc
@@ -20,11 +20,11 @@
 #include "ui/base/models/menu_model.h"
 #include "ui/gfx/font.h"
 #include "ui/gfx/gtk_util.h"
-#include "ui/views/widget/native_widget_gtk.h"
 #include "views/controls/menu/menu_2.h"
 #include "views/controls/menu/menu_listener.h"
 #include "views/controls/menu/nested_dispatcher_gtk.h"
 #include "views/views_delegate.h"
+#include "views/widget/native_widget_gtk.h"
 
 namespace {
 
diff --git a/views/controls/menu/submenu_view.cc b/views/controls/menu/submenu_view.cc
index e89973f..50cb440 100644
--- a/views/controls/menu/submenu_view.cc
+++ b/views/controls/menu/submenu_view.cc
@@ -6,12 +6,12 @@
 
 #include "ui/base/accessibility/accessible_view_state.h"
 #include "ui/gfx/canvas.h"
-#include "ui/views/widget/root_view.h"
-#include "ui/views/widget/widget.h"
 #include "views/controls/menu/menu_config.h"
 #include "views/controls/menu/menu_controller.h"
 #include "views/controls/menu/menu_host.h"
 #include "views/controls/menu/menu_scroll_view_container.h"
+#include "views/widget/root_view.h"
+#include "views/widget/widget.h"
 
 namespace {
 
diff --git a/views/controls/message_box_view.cc b/views/controls/message_box_view.cc
index 53fae80..be8a305 100644
--- a/views/controls/message_box_view.cc
+++ b/views/controls/message_box_view.cc
@@ -13,13 +13,13 @@
 #include "ui/base/message_box_flags.h"
 #include "ui/views/layout/grid_layout.h"
 #include "ui/views/layout/layout_constants.h"
-#include "ui/views/widget/widget.h"
 #include "ui/views/window/client_view.h"
 #include "views/controls/button/checkbox.h"
 #include "views/controls/image_view.h"
 #include "views/controls/label.h"
 #include "views/controls/textfield/textfield.h"
 #include "views/views_delegate.h"
+#include "views/widget/widget.h"
 
 const int kDefaultMessageWidth = 320;
 
diff --git a/views/controls/native/native_view_host.cc b/views/controls/native/native_view_host.cc
index c75a54c..e8c5710 100644
--- a/views/controls/native/native_view_host.cc
+++ b/views/controls/native/native_view_host.cc
@@ -6,8 +6,8 @@
 
 #include "base/logging.h"
 #include "ui/gfx/canvas.h"
-#include "ui/views/widget/widget.h"
 #include "views/controls/native/native_view_host_wrapper.h"
+#include "views/widget/widget.h"
 
 namespace views {
 
diff --git a/views/controls/native/native_view_host_aura.cc b/views/controls/native/native_view_host_aura.cc
index f5ea43c..888ece7 100644
--- a/views/controls/native/native_view_host_aura.cc
+++ b/views/controls/native/native_view_host_aura.cc
@@ -7,8 +7,8 @@
 #include "base/logging.h"
 #include "ui/aura/focus_manager.h"
 #include "ui/aura/window.h"
-#include "ui/views/widget/widget.h"
 #include "views/controls/native/native_view_host.h"
+#include "views/widget/widget.h"
 
 namespace views {
 
diff --git a/views/controls/native/native_view_host_gtk.cc b/views/controls/native/native_view_host_gtk.cc
index 94315e9..85ad105 100644
--- a/views/controls/native/native_view_host_gtk.cc
+++ b/views/controls/native/native_view_host_gtk.cc
@@ -9,13 +9,12 @@
 #include <algorithm>
 
 #include "base/logging.h"
-#include "ui/views/focus/focus_manager.h"
-#include "ui/views/focus/focus_manager.h"
-#include "ui/views/widget/gtk_views_fixed.h"
-#include "ui/views/widget/native_widget_gtk.h"
-#include "ui/views/widget/widget.h"
 #include "views/controls/native/native_view_host.h"
+#include "ui/views/focus/focus_manager.h"
 #include "views/views_delegate.h"
+#include "views/widget/gtk_views_fixed.h"
+#include "views/widget/native_widget_gtk.h"
+#include "views/widget/widget.h"
 
 namespace views {
 
diff --git a/views/controls/native/native_view_host_win.cc b/views/controls/native/native_view_host_win.cc
index 017721c..d02bd9f 100644
--- a/views/controls/native/native_view_host_win.cc
+++ b/views/controls/native/native_view_host_win.cc
@@ -9,10 +9,10 @@
 #include "base/logging.h"
 #include "ui/gfx/canvas.h"
 #include "ui/views/focus/focus_manager.h"
-#include "ui/views/widget/native_widget.h"
-#include "ui/views/widget/root_view.h"
-#include "ui/views/widget/widget.h"
 #include "views/controls/native/native_view_host.h"
+#include "views/widget/native_widget.h"
+#include "views/widget/root_view.h"
+#include "views/widget/widget.h"
 
 namespace views {
 
diff --git a/views/controls/native_control.cc b/views/controls/native_control.cc
index e2680d9..f1550b8 100644
--- a/views/controls/native_control.cc
+++ b/views/controls/native_control.cc
@@ -19,10 +19,10 @@
 #include "ui/base/view_prop.h"
 #include "ui/base/win/hwnd_util.h"
 #include "ui/views/focus/focus_manager.h"
-#include "ui/views/widget/widget.h"
 #include "views/background.h"
 #include "views/border.h"
 #include "views/controls/native/native_view_host.h"
+#include "views/widget/widget.h"
 
 using ui::ViewProp;
 
diff --git a/views/controls/native_control_gtk.cc b/views/controls/native_control_gtk.cc
index 52b2d45..c1ec850 100644
--- a/views/controls/native_control_gtk.cc
+++ b/views/controls/native_control_gtk.cc
@@ -9,7 +9,7 @@
 #include "base/logging.h"
 #include "ui/base/accessibility/accessibility_types.h"
 #include "ui/views/focus/focus_manager.h"
-#include "ui/views/widget/widget.h"
+#include "views/widget/widget.h"
 
 #if defined(TOUCH_UI)
 namespace {
diff --git a/views/controls/native_control_win.cc b/views/controls/native_control_win.cc
index 20e829c..4b10afe 100644
--- a/views/controls/native_control_win.cc
+++ b/views/controls/native_control_win.cc
@@ -12,8 +12,8 @@
 #include "ui/base/view_prop.h"
 #include "ui/base/win/hwnd_util.h"
 #include "ui/views/focus/focus_manager.h"
-#include "ui/views/widget/widget.h"
 #include "views/controls/combobox/combobox.h"
+#include "views/widget/widget.h"
 
 using ui::ViewProp;
 
diff --git a/views/controls/native_control_win.h b/views/controls/native_control_win.h
index dc38926..a40b02f 100644
--- a/views/controls/native_control_win.h
+++ b/views/controls/native_control_win.h
@@ -9,8 +9,8 @@
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_vector.h"
-#include "ui/views/widget/child_window_message_processor.h"
 #include "views/controls/native/native_view_host.h"
+#include "views/widget/child_window_message_processor.h"
 
 namespace ui {
 class ViewProp;
diff --git a/views/controls/scroll_view.cc b/views/controls/scroll_view.cc
index 653b24f..6397f71 100644
--- a/views/controls/scroll_view.cc
+++ b/views/controls/scroll_view.cc
@@ -5,8 +5,8 @@
 #include "views/controls/scroll_view.h"
 
 #include "base/logging.h"
-#include "ui/views/widget/root_view.h"
 #include "views/controls/scrollbar/native_scroll_bar.h"
+#include "views/widget/root_view.h"
 
 namespace views {
 
diff --git a/views/controls/scrollbar/base_scroll_bar.cc b/views/controls/scrollbar/base_scroll_bar.cc
index 1b1ed86..9641cbe 100644
--- a/views/controls/scrollbar/base_scroll_bar.cc
+++ b/views/controls/scrollbar/base_scroll_bar.cc
@@ -16,11 +16,11 @@
 #include "ui/base/keycodes/keyboard_codes.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/gfx/canvas.h"
-#include "ui/views/widget/widget.h"
 #include "views/controls/menu/menu_item_view.h"
 #include "views/controls/menu/menu_runner.h"
 #include "views/controls/scroll_view.h"
 #include "views/controls/scrollbar/base_scroll_bar_thumb.h"
+#include "views/widget/widget.h"
 
 #if defined(OS_LINUX)
 #include "ui/gfx/screen.h"
diff --git a/views/controls/scrollbar/bitmap_scroll_bar.cc b/views/controls/scrollbar/bitmap_scroll_bar.cc
index 5cb7b46..7529f99 100644
--- a/views/controls/scrollbar/bitmap_scroll_bar.cc
+++ b/views/controls/scrollbar/bitmap_scroll_bar.cc
@@ -17,10 +17,10 @@
 #include "ui/base/keycodes/keyboard_codes.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/gfx/canvas.h"
-#include "ui/views/widget/widget.h"
 #include "views/controls/menu/menu.h"
 #include "views/controls/scroll_view.h"
 #include "views/controls/scrollbar/base_scroll_bar_thumb.h"
+#include "views/widget/widget.h"
 
 #if defined(OS_LINUX)
 #include "views/screen.h"
diff --git a/views/controls/scrollbar/native_scroll_bar.cc b/views/controls/scrollbar/native_scroll_bar.cc
index 16f0430..44fbafb 100644
--- a/views/controls/scrollbar/native_scroll_bar.cc
+++ b/views/controls/scrollbar/native_scroll_bar.cc
@@ -8,8 +8,8 @@
 #include <string>
 
 #include "base/message_loop.h"
-#include "ui/views/widget/widget.h"
 #include "views/controls/scrollbar/native_scroll_bar_wrapper.h"
+#include "views/widget/widget.h"
 
 #if defined(USE_AURA)
 #include "views/controls/scrollbar/native_scroll_bar_views.h"
diff --git a/views/controls/scrollbar/native_scroll_bar_gtk.cc b/views/controls/scrollbar/native_scroll_bar_gtk.cc
index baa8435..df6d904 100644
--- a/views/controls/scrollbar/native_scroll_bar_gtk.cc
+++ b/views/controls/scrollbar/native_scroll_bar_gtk.cc
@@ -7,10 +7,10 @@
 #include <gtk/gtk.h>
 
 #include "ui/base/keycodes/keyboard_codes_posix.h"
-#include "ui/views/widget/widget.h"
 #include "views/controls/scrollbar/native_scroll_bar.h"
 #include "views/controls/scrollbar/native_scroll_bar_views.h"
 #include "views/controls/scrollbar/scroll_bar.h"
+#include "views/widget/widget.h"
 
 namespace views {
 
diff --git a/views/controls/scrollbar/native_scroll_bar_win.cc b/views/controls/scrollbar/native_scroll_bar_win.cc
index 86e6e67..2f18db3 100644
--- a/views/controls/scrollbar/native_scroll_bar_win.cc
+++ b/views/controls/scrollbar/native_scroll_bar_win.cc
@@ -11,9 +11,9 @@
 #include "ui/base/keycodes/keyboard_codes.h"
 #include "ui/base/win/hwnd_util.h"
 #include "ui/base/win/window_impl.h"
-#include "ui/views/widget/widget.h"
 #include "views/controls/scrollbar/native_scroll_bar.h"
 #include "views/controls/scrollbar/scroll_bar.h"
+#include "views/widget/widget.h"
 
 namespace views {
 
diff --git a/views/controls/scrollbar/scrollbar_unittest.cc b/views/controls/scrollbar/scrollbar_unittest.cc
index 889ac2e..2704354 100644
--- a/views/controls/scrollbar/scrollbar_unittest.cc
+++ b/views/controls/scrollbar/scrollbar_unittest.cc
@@ -3,10 +3,10 @@
 // found in the LICENSE file.
 
 #include "ui/views/test/views_test_base.h"
-#include "ui/views/widget/widget.h"
 #include "views/controls/scrollbar/native_scroll_bar.h"
 #include "views/controls/scrollbar/native_scroll_bar_views.h"
 #include "views/controls/scrollbar/scroll_bar.h"
+#include "views/widget/widget.h"
 
 namespace {
 
diff --git a/views/controls/tabbed_pane/native_tabbed_pane_gtk.cc b/views/controls/tabbed_pane/native_tabbed_pane_gtk.cc
index e1e490c..1eaf48e 100644
--- a/views/controls/tabbed_pane/native_tabbed_pane_gtk.cc
+++ b/views/controls/tabbed_pane/native_tabbed_pane_gtk.cc
@@ -13,11 +13,11 @@
 #include "ui/gfx/font.h"
 #include "ui/gfx/skia_utils_gtk.h"
 #include "ui/views/layout/fill_layout.h"
-#include "ui/views/widget/native_widget.h"
-#include "ui/views/widget/widget.h"
 #include "views/background.h"
 #include "views/controls/tabbed_pane/tabbed_pane.h"
 #include "views/controls/tabbed_pane/tabbed_pane_listener.h"
+#include "views/widget/native_widget.h"
+#include "views/widget/widget.h"
 
 namespace views {
 
diff --git a/views/controls/tabbed_pane/native_tabbed_pane_win.cc b/views/controls/tabbed_pane/native_tabbed_pane_win.cc
index 5e29dba..654be79 100644
--- a/views/controls/tabbed_pane/native_tabbed_pane_win.cc
+++ b/views/controls/tabbed_pane/native_tabbed_pane_win.cc
@@ -15,10 +15,10 @@
 #include "ui/gfx/font.h"
 #include "ui/gfx/native_theme_win.h"
 #include "ui/views/layout/fill_layout.h"
-#include "ui/views/widget/root_view.h"
-#include "ui/views/widget/widget.h"
 #include "views/controls/tabbed_pane/tabbed_pane.h"
 #include "views/controls/tabbed_pane/tabbed_pane_listener.h"
+#include "views/widget/root_view.h"
+#include "views/widget/widget.h"
 
 namespace views {
 
diff --git a/views/controls/tabbed_pane/tabbed_pane.cc b/views/controls/tabbed_pane/tabbed_pane.cc
index 6931fe2..72ff0ed 100644
--- a/views/controls/tabbed_pane/tabbed_pane.cc
+++ b/views/controls/tabbed_pane/tabbed_pane.cc
@@ -7,10 +7,10 @@
 #include "base/logging.h"
 #include "ui/base/accessibility/accessible_view_state.h"
 #include "ui/base/keycodes/keyboard_codes.h"
-#include "ui/views/widget/widget.h"
 #include "views/controls/native/native_view_host.h"
 #include "views/controls/tabbed_pane/native_tabbed_pane_wrapper.h"
 #include "views/controls/tabbed_pane/tabbed_pane_listener.h"
+#include "views/widget/widget.h"
 
 namespace views {
 
diff --git a/views/controls/tabbed_pane/tabbed_pane_unittest.cc b/views/controls/tabbed_pane/tabbed_pane_unittest.cc
index 80264c5..75e8214 100644
--- a/views/controls/tabbed_pane/tabbed_pane_unittest.cc
+++ b/views/controls/tabbed_pane/tabbed_pane_unittest.cc
@@ -6,9 +6,9 @@
 #include "base/utf_string_conversions.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/views/test/views_test_base.h"
-#include "ui/views/widget/widget.h"
-#include "ui/views/widget/widget_delegate.h"
 #include "views/controls/tabbed_pane/tabbed_pane.h"
+#include "views/widget/widget.h"
+#include "views/widget/widget_delegate.h"
 
 namespace views {
 
diff --git a/views/controls/table/native_table_gtk.cc b/views/controls/table/native_table_gtk.cc
index 8e01b19..61e3978 100644
--- a/views/controls/table/native_table_gtk.cc
+++ b/views/controls/table/native_table_gtk.cc
@@ -10,9 +10,9 @@
 #include "base/utf_string_conversions.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/gfx/gtk_util.h"
-#include "ui/views/widget/widget.h"
 #include "views/controls/table/table_view2.h"
 #include "views/controls/table/table_view_observer.h"
+#include "views/widget/widget.h"
 
 namespace views {
 
diff --git a/views/controls/table/native_table_win.cc b/views/controls/table/native_table_win.cc
index 23b1780..94bc54d 100644
--- a/views/controls/table/native_table_win.cc
+++ b/views/controls/table/native_table_win.cc
@@ -19,9 +19,9 @@
 #include "ui/gfx/canvas_skia.h"
 #include "ui/gfx/favicon_size.h"
 #include "ui/gfx/icon_util.h"
-#include "ui/views/widget/widget.h"
 #include "views/controls/table/table_view2.h"
 #include "views/controls/table/table_view_observer.h"
+#include "views/widget/widget.h"
 
 namespace views {
 
diff --git a/views/controls/table/table_view_unittest.cc b/views/controls/table/table_view_unittest.cc
index 95a6820..aa63143 100644
--- a/views/controls/table/table_view_unittest.cc
+++ b/views/controls/table/table_view_unittest.cc
@@ -20,10 +20,10 @@
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/base/models/table_model.h"
 #include "ui/base/models/table_model_observer.h"
-#include "ui/views/widget/widget.h"
-#include "ui/views/widget/widget_delegate.h"
 #include "views/controls/table/table_view.h"
 #include "views/controls/table/table_view2.h"
+#include "views/widget/widget.h"
+#include "views/widget/widget_delegate.h"
 
 // Put the tests in the views namespace to make it easier to declare them as
 // friend classes.
diff --git a/views/controls/textfield/native_textfield_gtk.cc b/views/controls/textfield/native_textfield_gtk.cc
index da96a37..d2a353a 100644
--- a/views/controls/textfield/native_textfield_gtk.cc
+++ b/views/controls/textfield/native_textfield_gtk.cc
@@ -14,12 +14,12 @@
 #include "ui/gfx/insets.h"
 #include "ui/gfx/selection_model.h"
 #include "ui/gfx/skia_utils_gtk.h"
-#include "ui/views/widget/native_widget_gtk.h"
 #include "views/controls/textfield/gtk_views_entry.h"
 #include "views/controls/textfield/gtk_views_textview.h"
 #include "views/controls/textfield/native_textfield_views.h"
 #include "views/controls/textfield/textfield.h"
 #include "views/controls/textfield/textfield_controller.h"
+#include "views/widget/native_widget_gtk.h"
 
 namespace views {
 
diff --git a/views/controls/textfield/native_textfield_views.cc b/views/controls/textfield/native_textfield_views.cc
index 5b5e86e..fa22340 100644
--- a/views/controls/textfield/native_textfield_views.cc
+++ b/views/controls/textfield/native_textfield_views.cc
@@ -20,7 +20,6 @@
 #include "ui/gfx/render_text.h"
 #include "ui/views/events/event.h"
 #include "ui/views/ime/input_method.h"
-#include "ui/views/widget/widget.h"
 #include "views/background.h"
 #include "views/border.h"
 #include "views/controls/focusable_border.h"
@@ -32,6 +31,7 @@
 #include "views/controls/textfield/textfield_views_model.h"
 #include "views/metrics.h"
 #include "views/views_delegate.h"
+#include "views/widget/widget.h"
 
 #if defined(OS_LINUX)
 #include "ui/gfx/gtk_util.h"
diff --git a/views/controls/textfield/native_textfield_views_unittest.cc b/views/controls/textfield/native_textfield_views_unittest.cc
index 9033f81..aa1e20d 100644
--- a/views/controls/textfield/native_textfield_views_unittest.cc
+++ b/views/controls/textfield/native_textfield_views_unittest.cc
@@ -26,13 +26,13 @@
 #include "ui/views/ime/mock_input_method.h"
 #include "ui/views/test/test_views_delegate.h"
 #include "ui/views/test/views_test_base.h"
-#include "ui/views/widget/native_widget_private.h"
-#include "ui/views/widget/widget.h"
 #include "views/controls/textfield/native_textfield_views.h"
 #include "views/controls/textfield/textfield.h"
 #include "views/controls/textfield/textfield_controller.h"
 #include "views/controls/textfield/textfield_views_model.h"
 #include "views/views_delegate.h"
+#include "views/widget/native_widget_private.h"
+#include "views/widget/widget.h"
 
 // Drag and drop for aura in linux hasn't been implemented yet.
 // Bug http://crbug.com/97845
diff --git a/views/controls/textfield/native_textfield_win.cc b/views/controls/textfield/native_textfield_win.cc
index ecacf91..e0ef11f 100644
--- a/views/controls/textfield/native_textfield_win.cc
+++ b/views/controls/textfield/native_textfield_win.cc
@@ -24,7 +24,6 @@
 #include "ui/base/win/mouse_wheel_util.h"
 #include "ui/gfx/native_theme_win.h"
 #include "ui/views/focus/focus_manager.h"
-#include "ui/views/widget/widget.h"
 #include "views/controls/label.h"
 #include "views/controls/menu/menu_2.h"
 #include "views/controls/menu/menu_win.h"
@@ -34,6 +33,7 @@
 #include "views/controls/textfield/textfield_controller.h"
 #include "views/metrics.h"
 #include "views/views_delegate.h"
+#include "views/widget/widget.h"
 
 namespace views {
 
diff --git a/views/controls/textfield/textfield.cc b/views/controls/textfield/textfield.cc
index cee525a..a8e041e 100644
--- a/views/controls/textfield/textfield.cc
+++ b/views/controls/textfield/textfield.cc
@@ -18,10 +18,10 @@
 #include "ui/base/range/range.h"
 #include "ui/gfx/insets.h"
 #include "ui/gfx/selection_model.h"
-#include "ui/views/widget/widget.h"
 #include "views/controls/native/native_view_host.h"
 #include "views/controls/textfield/native_textfield_wrapper.h"
 #include "views/controls/textfield/textfield_controller.h"
+#include "views/widget/widget.h"
 
 #if defined(OS_LINUX)
 #include "ui/base/keycodes/keyboard_code_conversion_gtk.h"
diff --git a/views/controls/tree/tree_view.cc b/views/controls/tree/tree_view.cc
index 77692b4..18fdc85 100644
--- a/views/controls/tree/tree_view.cc
+++ b/views/controls/tree/tree_view.cc
@@ -24,7 +24,7 @@
 #include "ui/gfx/icon_util.h"
 #include "ui/gfx/point.h"
 #include "ui/views/focus/focus_manager.h"
-#include "ui/views/widget/widget.h"
+#include "views/widget/widget.h"
 
 using ui::TreeModel;
 using ui::TreeModelNode;
diff --git a/views/mouse_watcher.cc b/views/mouse_watcher.cc
index 3b2b039..b88e85f 100644
--- a/views/mouse_watcher.cc
+++ b/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/widget/widget.h"
 #include "views/view.h"
+#include "views/widget/widget.h"
 
 namespace views {
 
diff --git a/views/view.cc b/views/view.cc
index ed7f675..152e416 100644
--- a/views/view.cc
+++ b/views/view.cc
@@ -24,18 +24,14 @@
 #include "ui/gfx/point3.h"
 #include "ui/gfx/transform.h"
 #include "ui/views/layout/layout_manager.h"
-#include "ui/views/widget/native_widget_private.h"
-#include "ui/views/widget/native_widget_private.h"
-#include "ui/views/widget/root_view.h"
-#include "ui/views/widget/root_view.h"
-#include "ui/views/widget/tooltip_manager.h"
-#include "ui/views/widget/tooltip_manager.h"
-#include "ui/views/widget/widget.h"
-#include "ui/views/widget/widget.h"
 #include "views/background.h"
 #include "views/context_menu_controller.h"
 #include "views/drag_controller.h"
 #include "views/views_delegate.h"
+#include "views/widget/native_widget_private.h"
+#include "views/widget/root_view.h"
+#include "views/widget/tooltip_manager.h"
+#include "views/widget/widget.h"
 
 #if defined(OS_WIN)
 #include "base/win/scoped_gdi_object.h"
diff --git a/views/view_unittest.cc b/views/view_unittest.cc
index 1eabedd..eac26ed 100644
--- a/views/view_unittest.cc
+++ b/views/view_unittest.cc
@@ -26,8 +26,6 @@
 #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/widget/native_widget.h"
-#include "ui/views/widget/root_view.h"
 #include "ui/views/window/dialog_delegate.h"
 #include "views/background.h"
 #include "views/controls/button/button_dropdown.h"
@@ -37,6 +35,8 @@
 #include "views/controls/textfield/textfield.h"
 #include "views/view.h"
 #include "views/views_delegate.h"
+#include "views/widget/native_widget.h"
+#include "views/widget/root_view.h"
 
 #if defined(OS_WIN)
 #include "ui/views/test/test_views_delegate.h"
diff --git a/views/views.gyp b/views/views.gyp
index 3c07dcd..ce53e67 100644
--- a/views/views.gyp
+++ b/views/views.gyp
@@ -266,6 +266,49 @@
         'view_text_utils.h',
         'view_win.cc',
         'views_delegate.h',
+        'widget/aero_tooltip_manager.cc',
+        'widget/aero_tooltip_manager.h',
+        'widget/child_window_message_processor.cc',
+        'widget/child_window_message_processor.h',
+        'widget/default_theme_provider.cc',
+        'widget/default_theme_provider.h',
+        'widget/drop_helper.cc',
+        'widget/drop_helper.h',
+        'widget/drop_target_gtk.cc',
+        'widget/drop_target_gtk.h',
+        'widget/drop_target_win.cc',
+        'widget/drop_target_win.h',
+        'widget/gtk_views_fixed.cc',
+        'widget/gtk_views_fixed.h',
+        'widget/gtk_views_window.cc',
+        'widget/gtk_views_window.h',
+        'widget/root_view.cc',
+        'widget/root_view.h',
+        'widget/tooltip_manager_gtk.cc',
+        'widget/tooltip_manager_gtk.h',
+        'widget/tooltip_manager_views.cc',
+        'widget/tooltip_manager_views.h',
+        'widget/tooltip_manager_win.cc',
+        'widget/tooltip_manager_win.h',
+        'widget/tooltip_manager.cc',
+        'widget/tooltip_manager.h',
+        'widget/monitor_win.cc',
+        'widget/monitor_win.h',
+        'widget/native_widget.h',
+        'widget/native_widget_aura.cc',
+        'widget/native_widget_aura.h',
+        'widget/native_widget_delegate.h',
+        'widget/native_widget_private.h',
+        'widget/native_widget_gtk.cc',
+        'widget/native_widget_gtk.h',
+        'widget/native_widget_win.cc',
+        'widget/native_widget_win.h',
+        'widget/widget.cc',
+        'widget/widget.h',
+        'widget/widget_delegate.cc',
+        'widget/widget_delegate.h',
+        'widget/window_manager.cc',
+        'widget/window_manager.h',
         '../ui/views/accessibility/native_view_accessibility_win.cc',
         '../ui/views/accessibility/native_view_accessibility_win.h',
         '../ui/views/animation/bounds_animator.cc',
@@ -329,49 +372,6 @@
         '../ui/views/touchui/touch_selection_controller.h',
         '../ui/views/touchui/touch_selection_controller_impl.cc',
         '../ui/views/touchui/touch_selection_controller_impl.h',
-        '../ui/views/widget/aero_tooltip_manager.cc',
-        '../ui/views/widget/aero_tooltip_manager.h',
-        '../ui/views/widget/child_window_message_processor.cc',
-        '../ui/views/widget/child_window_message_processor.h',
-        '../ui/views/widget/default_theme_provider.cc',
-        '../ui/views/widget/default_theme_provider.h',
-        '../ui/views/widget/drop_helper.cc',
-        '../ui/views/widget/drop_helper.h',
-        '../ui/views/widget/drop_target_gtk.cc',
-        '../ui/views/widget/drop_target_gtk.h',
-        '../ui/views/widget/drop_target_win.cc',
-        '../ui/views/widget/drop_target_win.h',
-        '../ui/views/widget/gtk_views_fixed.cc',
-        '../ui/views/widget/gtk_views_fixed.h',
-        '../ui/views/widget/gtk_views_window.cc',
-        '../ui/views/widget/gtk_views_window.h',
-        '../ui/views/widget/root_view.cc',
-        '../ui/views/widget/root_view.h',
-        '../ui/views/widget/tooltip_manager_gtk.cc',
-        '../ui/views/widget/tooltip_manager_gtk.h',
-        '../ui/views/widget/tooltip_manager_views.cc',
-        '../ui/views/widget/tooltip_manager_views.h',
-        '../ui/views/widget/tooltip_manager_win.cc',
-        '../ui/views/widget/tooltip_manager_win.h',
-        '../ui/views/widget/tooltip_manager.cc',
-        '../ui/views/widget/tooltip_manager.h',
-        '../ui/views/widget/monitor_win.cc',
-        '../ui/views/widget/monitor_win.h',
-        '../ui/views/widget/native_widget.h',
-        '../ui/views/widget/native_widget_aura.cc',
-        '../ui/views/widget/native_widget_aura.h',
-        '../ui/views/widget/native_widget_delegate.h',
-        '../ui/views/widget/native_widget_private.h',
-        '../ui/views/widget/native_widget_gtk.cc',
-        '../ui/views/widget/native_widget_gtk.h',
-        '../ui/views/widget/native_widget_win.cc',
-        '../ui/views/widget/native_widget_win.h',
-        '../ui/views/widget/widget.cc',
-        '../ui/views/widget/widget.h',
-        '../ui/views/widget/widget_delegate.cc',
-        '../ui/views/widget/widget_delegate.h',
-        '../ui/views/widget/window_manager.cc',
-        '../ui/views/widget/window_manager.h',
         '../ui/views/window/client_view.cc',
         '../ui/views/window/client_view.h',
         '../ui/views/window/custom_frame_view.cc',
@@ -419,6 +419,10 @@
             'controls/tree/tree_view.cc',
             'controls/tree/tree_view.h',
             'drag_utils_win.cc',
+            'widget/aero_tooltip_manager.cc',
+            'widget/aero_tooltip_manager.h',
+            'widget/child_window_message_processor.cc',
+            'widget/child_window_message_processor.h',
           ],
         },
         ],
@@ -429,25 +433,25 @@
             '../build/linux/system.gyp:xext',
           ],
           'sources!': [
-            '../ui/views/accessibility/native_view_accessibility_win.cc',
             '../ui/views/events/event_win.cc',
-            '../ui/views/widget/aero_tooltip_manager.cc',
-            '../ui/views/widget/child_window_message_processor.cc',
-            '../ui/views/widget/child_window_message_processor.h',
-            '../ui/views/widget/native_widget_win.cc',
+            'accessibility/native_view_accessibility_win.cc',
             'controls/scrollbar/bitmap_scroll_bar.cc',
             'controls/native_control.cc',
             'controls/table/group_table_view.cc',
             'controls/table/table_view.cc',
             'controls/tree/tree_view.cc',
+            'widget/aero_tooltip_manager.cc',
+            'widget/child_window_message_processor.cc',
+            'widget/child_window_message_processor.h',
+            'widget/native_widget_win.cc',
           ],
         }],
         ['touchui==1', {
           'defines': ['TOUCH_UI=1'],
           'sources/': [
             ['exclude', '../ui/views/focus/accelerator_handler_gtk.cc'],
-            ['exclude', '../ui/views/widget/tooltip_manager_gtk.cc'],
             ['exclude', 'controls/menu/native_menu_gtk.cc'],
+            ['exclude', 'widget/tooltip_manager_gtk.cc'],
           ],
         }],
         ['touchui==0', {
@@ -458,9 +462,9 @@
         }],
         ['touchui==0 and use_aura==0', {
           'sources!': [
-            '../ui/views/widget/tooltip_manager_views.cc',
             'controls/menu/native_menu_views.cc',
             'controls/menu/native_menu_views.h',
+            'widget/tooltip_manager_views.cc',
           ],
         }],
         ['use_ibus==1', {
@@ -535,13 +539,6 @@
         '../ui/views/test/test_views_delegate.h',
         '../ui/views/test/views_test_base.cc',
         '../ui/views/test/views_test_base.h',
-        '../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',
-        '../ui/views/widget/native_widget_test_utils_win.cc',
-        '../ui/views/widget/native_widget_unittest.cc',
-        '../ui/views/widget/native_widget_win_unittest.cc',
-        '../ui/views/widget/widget_unittest.cc',
         'accessible_pane_view_unittest.cc',
         'controls/label_unittest.cc',
         'controls/progress_bar_unittest.cc',
@@ -555,6 +552,13 @@
         'controls/scrollbar/scrollbar_unittest.cc',
         'run_all_unittests.cc',
         'view_unittest.cc',
+        'widget/native_widget_test_utils.h',
+        'widget/native_widget_test_utils_aura.cc',
+        'widget/native_widget_test_utils_gtk.cc',
+        'widget/native_widget_test_utils_win.cc',
+        'widget/native_widget_unittest.cc',
+        'widget/native_widget_win_unittest.cc',
+        'widget/widget_unittest.cc',
 
         '<(SHARED_INTERMEDIATE_DIR)/ui/gfx/gfx_resources.rc',
         '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc',
@@ -602,10 +606,10 @@
           ],
           'sources/': [
             ['exclude', '../ui/views/focus/focus_manager_unittest.cc'], # TODO(beng):
-            ['exclude', '../ui/views/widget/native_widget_win_unittest.cc'],
             ['exclude', 'controls/combobox/native_combobox_views_unittest.cc'],
             ['exclude', 'controls/table/table_view_unittest.cc'],
             ['exclude', 'controls/tabbed_pane/tabbed_pane_unittest.cc'],
+            ['exclude', 'widget/native_widget_win_unittest.cc'],
           ],
         }, {
           'sources/': [