views: Move grid_layout files into layout directory. Final Part.

BUG=None
TEST=trybots

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

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

10 files changed, 17 insertions, 17 deletions

diff --git a/views/controls/message_box_view.cc b/views/controls/message_box_view.cc
index c0cd3f8..50ac7af 100644
--- a/views/controls/message_box_view.cc
+++ b/views/controls/message_box_view.cc
@@ -11,7 +11,7 @@
 #include "ui/base/clipboard/scoped_clipboard_writer.h"
 #include "ui/base/message_box_flags.h"
 #include "views/controls/button/checkbox.h"
-#include "views/grid_layout.h"
+#include "views/layout/grid_layout.h"
 #include "views/layout/layout_constants.h"
 #include "views/views_delegate.h"
 #include "views/window/client_view.h"
diff --git a/views/examples/examples_main.cc b/views/examples/examples_main.cc
index a49015e..375390b 100644
--- a/views/examples/examples_main.cc
+++ b/views/examples/examples_main.cc
@@ -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.
 
@@ -34,7 +34,7 @@
 #include "views/examples/throbber_example.h"
 #include "views/examples/widget_example.h"
 #include "views/focus/accelerator_handler.h"
-#include "views/grid_layout.h"
+#include "views/layout/grid_layout.h"
 #include "views/window/window.h"
 
 namespace examples {
diff --git a/views/examples/message_box_example.h b/views/examples/message_box_example.h
index 29eced8..51eb646 100644
--- a/views/examples/message_box_example.h
+++ b/views/examples/message_box_example.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 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.
 
@@ -12,7 +12,7 @@
 #include "views/controls/message_box_view.h"
 #include "views/controls/tabbed_pane/tabbed_pane.h"
 #include "views/examples/example_base.h"
-#include "views/grid_layout.h"
+#include "views/layout/grid_layout.h"
 
 namespace examples {
 
diff --git a/views/examples/single_split_view_example.cc b/views/examples/single_split_view_example.cc
index a9f6647..6d67147 100644
--- a/views/examples/single_split_view_example.cc
+++ b/views/examples/single_split_view_example.cc
@@ -4,7 +4,7 @@
 
 #include "views/examples/single_split_view_example.h"
 
-#include "views/grid_layout.h"
+#include "views/layout/grid_layout.h"
 
 namespace examples {
 
diff --git a/views/examples/tabbed_pane_example.cc b/views/examples/tabbed_pane_example.cc
index 94d77d2..15516a8 100644
--- a/views/examples/tabbed_pane_example.cc
+++ b/views/examples/tabbed_pane_example.cc
@@ -4,7 +4,7 @@
 
 #include "views/examples/tabbed_pane_example.h"
 
-#include "views/grid_layout.h"
+#include "views/layout/grid_layout.h"
 
 namespace examples {
 
diff --git a/views/examples/table2_example.cc b/views/examples/table2_example.cc
index 1d25430..0ae970e 100644
--- a/views/examples/table2_example.cc
+++ b/views/examples/table2_example.cc
@@ -8,7 +8,7 @@
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "views/controls/button/checkbox.h"
 #include "views/controls/table/table_view2.h"
-#include "views/grid_layout.h"
+#include "views/layout/grid_layout.h"
 
 namespace examples {
 
diff --git a/views/grid_layout.cc b/views/layout/grid_layout.cc
index 12f4d9a..e516779 100644
--- a/views/grid_layout.cc
+++ b/views/layout/grid_layout.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/grid_layout.h"
+#include "views/layout/grid_layout.h"
 
 #include <algorithm>
 
diff --git a/views/grid_layout.h b/views/layout/grid_layout.h
index da945b0..f2a0174 100644
--- a/views/grid_layout.h
+++ b/views/layout/grid_layout.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_GRID_LAYOUT_H_
-#define VIEWS_GRID_LAYOUT_H_
+#ifndef VIEWS_LAYOUT_GRID_LAYOUT_H_
+#define VIEWS_LAYOUT_GRID_LAYOUT_H_
 #pragma once
 
 #include <string>
@@ -368,4 +368,4 @@ class ColumnSet {
 
 }  // namespace views
 
-#endif  // VIEWS_GRID_LAYOUT_H_
+#endif  // VIEWS_LAYOUT_GRID_LAYOUT_H_
diff --git a/views/grid_layout_unittest.cc b/views/layout/grid_layout_unittest.cc
index a70ae5f..4cd2eae 100644
--- a/views/grid_layout_unittest.cc
+++ b/views/layout/grid_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/grid_layout.h"
+#include "views/layout/grid_layout.h"
 #include "views/view.h"
 
 using views::ColumnSet;
diff --git a/views/views.gyp b/views/views.gyp
index 3a1f92a..c4c5654 100644
--- a/views/views.gyp
+++ b/views/views.gyp
@@ -277,12 +277,12 @@
         'focus/focus_util_win.h',
         'focus/view_storage.cc',
         'focus/view_storage.h',
-        'grid_layout.cc',
-        'grid_layout.h',
         'layout/box_layout.cc',
         'layout/box_layout.h',
         'layout/fill_layout.cc',
         'layout/fill_layout.h',
+        'layout/grid_layout.cc',
+        'layout/grid_layout.h',
         'layout/layout_constants.h',
         'layout/layout_manager.cc',
         'layout/layout_manager.h',
@@ -462,7 +462,7 @@
         'controls/textfield/textfield_views_model_unittest.cc',
         'focus/accelerator_handler_gtk_unittest.cc',
         'focus/focus_manager_unittest.cc',
-        'grid_layout_unittest.cc',
+        'layout/grid_layout_unittest.cc',
         'layout/box_layout_unittest.cc',
         'test/views_test_base.h',
         'run_all_unittests.cc',