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

8 files changed, 15 insertions, 15 deletions

diff --git a/ui/views/window/client_view.cc b/ui/views/window/client_view.cc
index 60992ec..0beaa89 100644
--- a/ui/views/window/client_view.cc
+++ b/ui/views/window/client_view.cc
@@ -7,8 +7,8 @@
 #include "base/logging.h"
 #include "ui/base/accessibility/accessible_view_state.h"
 #include "ui/base/hit_test.h"
-#include "ui/views/widget/widget.h"
-#include "ui/views/widget/widget_delegate.h"
+#include "views/widget/widget.h"
+#include "views/widget/widget_delegate.h"
 
 namespace views {
 
diff --git a/ui/views/window/custom_frame_view.cc b/ui/views/window/custom_frame_view.cc
index 9019919..6f9cf62 100644
--- a/ui/views/window/custom_frame_view.cc
+++ b/ui/views/window/custom_frame_view.cc
@@ -15,15 +15,15 @@
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/font.h"
 #include "ui/gfx/path.h"
-#include "ui/views/widget/widget_delegate.h"
 #include "ui/views/window/client_view.h"
 #include "ui/views/window/window_resources.h"
 #include "ui/views/window/window_shape.h"
+#include "views/widget/widget_delegate.h"
 
 #if defined(USE_AURA)
-#include "ui/views/widget/native_widget_aura.h"
+#include "views/widget/native_widget_aura.h"
 #elif defined(OS_WIN)
-#include "ui/views/widget/native_widget_win.h"
+#include "views/widget/native_widget_win.h"
 #endif
 
 namespace views {
diff --git a/ui/views/window/custom_frame_view.h b/ui/views/window/custom_frame_view.h
index 2d2d3d4..d53eb21 100644
--- a/ui/views/window/custom_frame_view.h
+++ b/ui/views/window/custom_frame_view.h
@@ -6,9 +6,9 @@
 #define UI_VIEWS_WINDOW_CUSTOM_FRAME_VIEW_H_
 #pragma once
 
-#include "ui/views/widget/widget.h"
 #include "ui/views/window/non_client_view.h"
 #include "views/controls/button/image_button.h"
+#include "views/widget/widget.h"
 
 namespace gfx {
 class Canvas;
diff --git a/ui/views/window/dialog_client_view.cc b/ui/views/window/dialog_client_view.cc
index edd3da3..610ae8d 100644
--- a/ui/views/window/dialog_client_view.cc
+++ b/ui/views/window/dialog_client_view.cc
@@ -25,10 +25,10 @@
 #include "ui/gfx/canvas_skia.h"
 #include "ui/gfx/font.h"
 #include "ui/views/layout/layout_constants.h"
-#include "ui/views/widget/root_view.h"
-#include "ui/views/widget/widget.h"
 #include "ui/views/window/dialog_delegate.h"
 #include "views/controls/button/text_button.h"
+#include "views/widget/root_view.h"
+#include "views/widget/widget.h"
 
 #if defined(OS_WIN)
 #include "ui/gfx/native_theme.h"
diff --git a/ui/views/window/dialog_delegate.cc b/ui/views/window/dialog_delegate.cc
index 3b97b8a..8da29bb 100644
--- a/ui/views/window/dialog_delegate.cc
+++ b/ui/views/window/dialog_delegate.cc
@@ -5,8 +5,8 @@
 #include "ui/views/window/dialog_delegate.h"
 
 #include "base/logging.h"
-#include "ui/views/widget/widget.h"
 #include "views/controls/button/text_button.h"
+#include "views/widget/widget.h"
 
 namespace views {
 
diff --git a/ui/views/window/dialog_delegate.h b/ui/views/window/dialog_delegate.h
index 88fdc31..530bbd9 100644
--- a/ui/views/window/dialog_delegate.h
+++ b/ui/views/window/dialog_delegate.h
@@ -9,8 +9,8 @@
 #include "base/string16.h"
 #include "ui/base/accessibility/accessibility_types.h"
 #include "ui/base/ui_base_types.h"
-#include "ui/views/widget/widget_delegate.h"
 #include "ui/views/window/dialog_client_view.h"
+#include "views/widget/widget_delegate.h"
 
 namespace views {
 
diff --git a/ui/views/window/native_frame_view.cc b/ui/views/window/native_frame_view.cc
index 1605e3d..1a794ee 100644
--- a/ui/views/window/native_frame_view.cc
+++ b/ui/views/window/native_frame_view.cc
@@ -4,11 +4,11 @@
 
 #include "ui/views/window/native_frame_view.h"
 
-#include "ui/views/widget/native_widget.h"
-#include "ui/views/widget/widget.h"
+#include "views/widget/native_widget.h"
+#include "views/widget/widget.h"
 
 #if defined(OS_WIN) && !defined(USE_AURA)
-#include "ui/views/widget/native_widget_win.h"
+#include "views/widget/native_widget_win.h"
 #endif
 
 namespace views {
diff --git a/ui/views/window/non_client_view.cc b/ui/views/window/non_client_view.cc
index 702042a..9e2be91 100644
--- a/ui/views/window/non_client_view.cc
+++ b/ui/views/window/non_client_view.cc
@@ -6,9 +6,9 @@
 
 #include "ui/base/accessibility/accessible_view_state.h"
 #include "ui/base/hit_test.h"
-#include "ui/views/widget/root_view.h"
-#include "ui/views/widget/widget.h"
 #include "ui/views/window/client_view.h"
+#include "views/widget/root_view.h"
+#include "views/widget/widget.h"
 
 namespace views {