summaryrefslogtreecommitdiffstats
path: root/ui/views/layout
diff options
context:
space:
mode:
authortfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-30 23:35:20 +0000
committertfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-30 23:35:20 +0000
commit5025f86107dafec51f98c62dbdc996fbb703a361 (patch)
treea871aad5635c650c243b44b59d1802f79f590458 /ui/views/layout
parent5c9a1adb03e4e0059e25366a908f30dd28786790 (diff)
downloadchromium_src-5025f86107dafec51f98c62dbdc996fbb703a361.zip
chromium_src-5025f86107dafec51f98c62dbdc996fbb703a361.tar.gz
chromium_src-5025f86107dafec51f98c62dbdc996fbb703a361.tar.bz2
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
Diffstat (limited to 'ui/views/layout')
-rw-r--r--ui/views/layout/box_layout.cc2
-rw-r--r--ui/views/layout/box_layout_unittest.cc2
-rw-r--r--ui/views/layout/fill_layout.h2
-rw-r--r--ui/views/layout/grid_layout.cc2
-rw-r--r--ui/views/layout/grid_layout.h2
-rw-r--r--ui/views/layout/grid_layout_unittest.cc2
-rw-r--r--ui/views/layout/layout_manager.cc2
7 files changed, 7 insertions, 7 deletions
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 {