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

The other layout files will be moved later.

BUG=None
TEST=trybots

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

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

chrome/browser/chromeos/login/eula_view.cc

@@ -40,7 +40,7 @@
 #include "views/controls/label.h"
 #include "views/controls/throbber.h"
 #include "views/grid_layout.h"
-#include "views/layout_manager.h"
+#include "views/layout/layout_manager.h"
 #include "views/standard_layout.h"
 #include "views/widget/widget_gtk.h"
 #include "views/window/dialog_delegate.h"

chrome/browser/chromeos/views/domui_menu_widget.cc

@@ -22,7 +22,7 @@
 #include "third_party/cros/chromeos_wm_ipc_enums.h"
 #include "third_party/skia/include/effects/SkGradientShader.h"
 #include "views/border.h"
-#include "views/layout_manager.h"
+#include "views/layout/layout_manager.h"
 #include "views/widget/root_view.h"
 
 namespace {

chrome/browser/ui/views/frame/browser_view_layout.h

-// 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 @@
 #define CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_LAYOUT_H_
 #pragma once
 
-#include "views/layout_manager.h"
+#include "views/layout/layout_manager.h"
 
 class BaseTabStrip;
 class BookmarkBarView;

chrome/browser/ui/views/instant_confirm_view.cc

@@ -16,7 +16,6 @@
 #include "ui/base/l10n/l10n_util.h"
 #include "views/controls/label.h"
 #include "views/grid_layout.h"
-#include "views/layout_manager.h"
 #include "views/standard_layout.h"
 #include "views/window/window.h"
 

views/grid_layout.h

@@ -9,7 +9,7 @@
 #include <string>
 #include <vector>
 
-#include "views/layout_manager.h"
+#include "views/layout/layout_manager.h"
 #include "views/view.h"
 
 namespace gfx {

views/layout/box_layout.h

@@ -7,7 +7,7 @@
 #pragma once
 
 #include "base/basictypes.h"
-#include "views/layout_manager.h"
+#include "views/layout/layout_manager.h"
 
 namespace views {
 

views/layout/fill_layout.h

@@ -6,7 +6,7 @@
 #define VIEWS_LAYOUT_FILL_LAYOUT_H_
 #pragma once
 
-#include "views/layout_manager.h"
+#include "views/layout/layout_manager.h"
 #include "views/view.h"
 
 namespace views {

views/layout_manager.cc → views/layout/layout_manager.cc

-// Copyright (c) 2006-2008 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/layout_manager.h"
-
-#include "views/view.h"
+#include "views/layout/layout_manager.h"
 
 namespace views {
 
+LayoutManager::~LayoutManager() {
+}
+
+void LayoutManager::Installed(View* host) {
+}
+
+void LayoutManager::Uninstalled(View* host) {
+}
+
 int LayoutManager::GetPreferredHeightForWidth(View* host, int width) {
   return GetPreferredSize(host).height();
 }
 
+void LayoutManager::ViewAdded(View* host, View* view) {
+}
+
+void LayoutManager::ViewRemoved(View* host, View* view) {
+}
+
 }  // namespace views

views/layout_manager.h → views/layout/layout_manager.h

-// Copyright (c) 2006-2008 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,8 +14,6 @@ class Size;
 
 namespace views {
 
-class View;
-
 /////////////////////////////////////////////////////////////////////////////
 //
 // LayoutManager interface
@@ -26,15 +24,15 @@ class View;
 /////////////////////////////////////////////////////////////////////////////
 class LayoutManager {
  public:
-  virtual ~LayoutManager() {}
+  virtual ~LayoutManager();
 
   // Notification that this LayoutManager has been installed on a particular
   // host.
-  virtual void Installed(View* host) {}
+  virtual void Installed(View* host);
 
   // Notification that this LayoutManager has been uninstalled on a particular
   // host.
-  virtual void Uninstalled(View* host) {}
+  virtual void Uninstalled(View* host);
 
   // Lay out the children of |host| according to implementation-specific
   // heuristics. The graphics used during painting is provided to allow for
@@ -50,10 +48,10 @@ class LayoutManager {
   virtual int GetPreferredHeightForWidth(View* host, int width);
 
   // Notification that a view has been added.
-  virtual void ViewAdded(View* host, View* view) {}
+  virtual void ViewAdded(View* host, View* view);
 
   // Notification that a view has been removed.
-  virtual void ViewRemoved(View* host, View* view) {}
+  virtual void ViewRemoved(View* host, View* view);
 };
 
 }  // namespace views

views/view.cc

-// 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.
 
@@ -18,7 +18,7 @@
 #include "third_party/skia/include/core/SkShader.h"
 #include "ui/base/dragdrop/drag_drop_types.h"
 #include "views/background.h"
-#include "views/layout_manager.h"
+#include "views/layout/layout_manager.h"
 #include "views/views_delegate.h"
 #include "views/widget/root_view.h"
 #include "views/widget/tooltip_manager.h"

views/views.gyp

@@ -279,12 +279,12 @@
         'focus/view_storage.h',
         'grid_layout.cc',
         'grid_layout.h',
-        'layout_manager.cc',
-        'layout_manager.h',
         'layout/box_layout.cc',
         'layout/box_layout.h',
         'layout/fill_layout.cc',
         'layout/fill_layout.h',
+        'layout/layout_manager.cc',
+        'layout/layout_manager.h',
         'mouse_watcher.cc',
         'mouse_watcher.h',
         'painter.cc',

views/widget/widget_win.h

-// 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.
 
@@ -19,7 +19,7 @@
 #include "base/win/scoped_comptr.h"
 #include "ui/base/win/window_impl.h"
 #include "views/focus/focus_manager.h"
-#include "views/layout_manager.h"
+#include "views/layout/layout_manager.h"
 #include "views/widget/widget.h"
 
 namespace ui {