views: Move fill_layout.[cc,h] into layout directory.

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

BUG=None
TEST=trybots

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

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

12 files changed, 25 insertions, 29 deletions

diff --git a/views/controls/listbox/listbox.cc b/views/controls/listbox/listbox.cc
index dad2826..e34dd6c 100644
--- a/views/controls/listbox/listbox.cc
+++ b/views/controls/listbox/listbox.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.
 
@@ -6,7 +6,7 @@
 
 #include "views/controls/listbox/native_listbox_wrapper.h"
 #include "views/controls/native/native_view_host.h"
-#include "views/fill_layout.h"
+#include "views/layout/fill_layout.h"
 
 namespace views {
 
diff --git a/views/controls/tabbed_pane/native_tabbed_pane_gtk.cc b/views/controls/tabbed_pane/native_tabbed_pane_gtk.cc
index 39bb401..5aa88df 100644
--- a/views/controls/tabbed_pane/native_tabbed_pane_gtk.cc
+++ b/views/controls/tabbed_pane/native_tabbed_pane_gtk.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.
 
@@ -14,7 +14,7 @@
 #include "gfx/skia_utils_gtk.h"
 #include "views/background.h"
 #include "views/controls/tabbed_pane/tabbed_pane.h"
-#include "views/fill_layout.h"
+#include "views/layout/fill_layout.h"
 #include "views/widget/root_view.h"
 #include "views/widget/widget_gtk.h"
 
diff --git a/views/controls/tabbed_pane/native_tabbed_pane_win.cc b/views/controls/tabbed_pane/native_tabbed_pane_win.cc
index cc81ba6..6a370dc 100644
--- a/views/controls/tabbed_pane/native_tabbed_pane_win.cc
+++ b/views/controls/tabbed_pane/native_tabbed_pane_win.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.
 
@@ -14,7 +14,7 @@
 #include "ui/base/l10n/l10n_util_win.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "views/controls/tabbed_pane/tabbed_pane.h"
-#include "views/fill_layout.h"
+#include "views/layout/fill_layout.h"
 #include "views/widget/root_view.h"
 #include "views/widget/widget_win.h"
 
diff --git a/views/examples/button_example.h b/views/examples/button_example.h
index ca66508..9a2e2a2 100644
--- a/views/examples/button_example.h
+++ b/views/examples/button_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.
 
@@ -9,7 +9,7 @@
 #include "base/string_util.h"
 #include "views/controls/button/text_button.h"
 #include "views/examples/example_base.h"
-#include "views/fill_layout.h"
+#include "views/layout/fill_layout.h"
 #include "views/view.h"
 
 namespace examples {
@@ -50,4 +50,3 @@ class ButtonExample : public ExampleBase, public views::ButtonListener {
 }  // namespace examples
 
 #endif  // VIEWS_EXAMPLES_BUTTON_EXAMPLE_H_
-
diff --git a/views/examples/combobox_example.h b/views/examples/combobox_example.h
index 127c507..6bac840 100644
--- a/views/examples/combobox_example.h
+++ b/views/examples/combobox_example.h
@@ -9,7 +9,7 @@
 #include "base/compiler_specific.h"
 #include "views/controls/combobox/combobox.h"
 #include "views/examples/example_base.h"
-#include "views/fill_layout.h"
+#include "views/layout/fill_layout.h"
 
 namespace examples {
 
diff --git a/views/examples/menu_example.h b/views/examples/menu_example.h
index 680e2bb..8a6b749 100644
--- a/views/examples/menu_example.h
+++ b/views/examples/menu_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.
 
@@ -15,7 +15,7 @@
 #include "views/controls/menu/view_menu_delegate.h"
 #include "views/controls/button/text_button.h"
 #include "views/examples/example_base.h"
-#include "views/fill_layout.h"
+#include "views/layout/fill_layout.h"
 
 namespace examples {
 
diff --git a/views/examples/table_example.h b/views/examples/table_example.h
index fdce299..a9e6ebc 100644
--- a/views/examples/table_example.h
+++ b/views/examples/table_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.
 
@@ -14,7 +14,7 @@
 #include "views/controls/table/table_view.h"
 #include "views/controls/table/table_view_observer.h"
 #include "views/examples/example_base.h"
-#include "views/fill_layout.h"
+#include "views/layout/fill_layout.h"
 
 using ui::TableModel;
 using ui::TableModelObserver; // TODO(beng): remove these
diff --git a/views/examples/throbber_example.cc b/views/examples/throbber_example.cc
index d03a9d9..9def3ce 100644
--- a/views/examples/throbber_example.cc
+++ b/views/examples/throbber_example.cc
@@ -1,11 +1,11 @@
-// 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/examples/throbber_example.h"
 
 #include "views/controls/throbber.h"
-#include "views/fill_layout.h"
+#include "views/layout/fill_layout.h"
 #include "views/view.h"
 
 namespace {
diff --git a/views/fill_layout.cc b/views/layout/fill_layout.cc
index 7bd1430a..cc636ad 100644
--- a/views/fill_layout.cc
+++ b/views/layout/fill_layout.cc
@@ -1,16 +1,13 @@
-// 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.
 
-#include "views/fill_layout.h"
+#include "views/layout/fill_layout.h"
 
 #include "base/logging.h"
 
 namespace views {
 
-///////////////////////////////////////////////////////////////////////////////
-// FillLayout
-
 FillLayout::FillLayout() {
 }
 
diff --git a/views/fill_layout.h b/views/layout/fill_layout.h
index bede6ad..90b3f11 100644
--- a/views/fill_layout.h
+++ b/views/layout/fill_layout.h
@@ -1,9 +1,9 @@
-// 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.
 
-#ifndef VIEWS_FILL_LAYOUT_H_
-#define VIEWS_FILL_LAYOUT_H_
+#ifndef VIEWS_LAYOUT_FILL_LAYOUT_H_
+#define VIEWS_LAYOUT_FILL_LAYOUT_H_
 #pragma once
 
 #include "views/layout_manager.h"
@@ -33,4 +33,4 @@ class FillLayout : public LayoutManager {
 
 }  // namespace views
 
-#endif  // VIEWS_FILL_LAYOUT_H_
+#endif  // VIEWS_LAYOUT_FILL_LAYOUT_H_
diff --git a/views/views.gyp b/views/views.gyp
index cc17b09..474d928 100644
--- a/views/views.gyp
+++ b/views/views.gyp
@@ -261,8 +261,6 @@
         'event_gtk.cc',
         'event_win.cc',
         'event_x.cc',
-        'fill_layout.cc',
-        'fill_layout.h',
         'focus/accelerator_handler.h',
         'focus/accelerator_handler_gtk.cc',
         'focus/accelerator_handler_touch.cc',
@@ -285,6 +283,8 @@
         'layout_manager.h',
         'layout/box_layout.cc',
         'layout/box_layout.h',
+        'layout/fill_layout.cc',
+        'layout/fill_layout.h',
         'mouse_watcher.cc',
         'mouse_watcher.h',
         'painter.cc',
diff --git a/views/widget/root_view.cc b/views/widget/root_view.cc
index 1f419eb..ba60fbc 100644
--- a/views/widget/root_view.cc
+++ b/views/widget/root_view.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.
 
@@ -11,8 +11,8 @@
 #include "gfx/canvas_skia.h"
 #include "ui/base/dragdrop/drag_drop_types.h"
 #include "ui/base/keycodes/keyboard_codes.h"
-#include "views/fill_layout.h"
 #include "views/focus/view_storage.h"
+#include "views/layout/fill_layout.h"
 #include "views/widget/widget.h"
 #include "views/window/window.h"