views: Move box_layout.[cc,h] into the new layout directory.

The other layout files under views directory will be moved later.

BUG=None
TEST=trybots

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

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

7 files changed, 15 insertions, 15 deletions

diff --git a/chrome/browser/ui/views/collected_cookies_win.cc b/chrome/browser/ui/views/collected_cookies_win.cc
index 975a829..f3c5427 100644
--- a/chrome/browser/ui/views/collected_cookies_win.cc
+++ b/chrome/browser/ui/views/collected_cookies_win.cc
@@ -15,11 +15,11 @@
 #include "grit/theme_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
-#include "views/box_layout.h"
 #include "views/controls/button/native_button.h"
 #include "views/controls/image_view.h"
 #include "views/controls/label.h"
 #include "views/controls/separator.h"
+#include "views/layout/box_layout.h"
 #include "views/standard_layout.h"
 #include "views/widget/root_view.h"
 #include "views/widget/widget_win.h"
diff --git a/chrome/browser/ui/views/options/managed_prefs_banner_view.cc b/chrome/browser/ui/views/options/managed_prefs_banner_view.cc
index 2cc086c..84bfc46 100644
--- a/chrome/browser/ui/views/options/managed_prefs_banner_view.cc
+++ b/chrome/browser/ui/views/options/managed_prefs_banner_view.cc
@@ -8,9 +8,9 @@
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "ui/base/resource/resource_bundle.h"
-#include "views/box_layout.h"
 #include "views/controls/image_view.h"
 #include "views/controls/label.h"
+#include "views/layout/box_layout.h"
 #include "views/standard_layout.h"
 
 // Spacing between the banner frame and its contents.
diff --git a/views/examples/widget_example.h b/views/examples/widget_example.h
index 8932847..be4aad6 100644
--- a/views/examples/widget_example.h
+++ b/views/examples/widget_example.h
@@ -1,4 +1,4 @@
-// Copyright (c) 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,9 +7,9 @@
 #pragma once
 
 #include "views/background.h"
-#include "views/box_layout.h"
 #include "views/controls/button/text_button.h"
 #include "views/examples/example_base.h"
+#include "views/layout/box_layout.h"
 #include "views/view.h"
 #include "views/widget/root_view.h"
 #include "views/widget/widget.h"
diff --git a/views/box_layout.cc b/views/layout/box_layout.cc
index adb192f..5025d7e 100644
--- a/views/box_layout.cc
+++ b/views/layout/box_layout.cc
@@ -1,8 +1,8 @@
-// Copyright (c) 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.
 
-#include "views/box_layout.h"
+#include "views/layout/box_layout.h"
 
 namespace views {
 
diff --git a/views/box_layout.h b/views/layout/box_layout.h
index 2e86d9b..f7c2b1d 100644
--- a/views/box_layout.h
+++ b/views/layout/box_layout.h
@@ -1,9 +1,9 @@
-// Copyright (c) 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.
 
-#ifndef VIEWS_BOX_LAYOUT_H_
-#define VIEWS_BOX_LAYOUT_H_
+#ifndef VIEWS_LAYOUT_BOX_LAYOUT_H_
+#define VIEWS_LAYOUT_BOX_LAYOUT_H_
 #pragma once
 
 #include "base/basictypes.h"
@@ -52,4 +52,4 @@ class BoxLayout : public LayoutManager {
 
 } // namespace views
 
-#endif // VIEWS_BOX_LAYOUT_H_
+#endif // VIEWS_LAYOUT_BOX_LAYOUT_H_
diff --git a/views/box_layout_unittest.cc b/views/layout/box_layout_unittest.cc
index d16d782..12ea2b5 100644
--- a/views/box_layout_unittest.cc
+++ b/views/layout/box_layout_unittest.cc
@@ -1,9 +1,9 @@
-// Copyright (c) 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.
 
 #include "testing/gtest/include/gtest/gtest.h"
-#include "views/box_layout.h"
+#include "views/layout/box_layout.h"
 #include "views/view.h"
 
 class StaticSizedView : public views::View {
diff --git a/views/views.gyp b/views/views.gyp
index 2cbdbf6..2c9cb29 100644
--- a/views/views.gyp
+++ b/views/views.gyp
@@ -82,8 +82,6 @@
         'background.h',
         'border.cc',
         'border.h',
-        'box_layout.h',
-        'box_layout.cc',
         'controls/button/button.cc',
         'controls/button/button.h',
         'controls/button/button_dropdown.cc',
@@ -285,6 +283,8 @@
         'grid_layout.h',
         'layout_manager.cc',
         'layout_manager.h',
+        'layout/box_layout.cc',
+        'layout/box_layout.h',
         'mouse_watcher.cc',
         'mouse_watcher.h',
         'painter.cc',
@@ -452,7 +452,6 @@
       ],
       'sources': [
         'animation/bounds_animator_unittest.cc',
-        'box_layout_unittest.cc',
         'controls/label_unittest.cc',
         'controls/progress_bar_unittest.cc',
         'controls/single_split_view_unittest.cc',
@@ -463,6 +462,7 @@
         'focus/accelerator_handler_gtk_unittest.cc',
         'focus/focus_manager_unittest.cc',
         'grid_layout_unittest.cc',
+        'layout/box_layout_unittest.cc',
         'test/views_test_base.h',
         'run_all_unittests.cc',
         'test/test_views_delegate.h',