summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--chrome/browser/chromeos/login/eula_view.cc2
-rw-r--r--chrome/browser/chromeos/views/domui_menu_widget.cc2
-rw-r--r--chrome/browser/ui/views/frame/browser_view_layout.h4
-rw-r--r--chrome/browser/ui/views/instant_confirm_view.cc1
-rw-r--r--views/grid_layout.h2
-rw-r--r--views/layout/box_layout.h2
-rw-r--r--views/layout/fill_layout.h2
-rw-r--r--views/layout/layout_manager.cc28
-rw-r--r--views/layout/layout_manager.h (renamed from views/layout_manager.h)14
-rw-r--r--views/layout_manager.cc15
-rw-r--r--views/view.cc4
-rw-r--r--views/views.gyp4
-rw-r--r--views/widget/widget_win.h4
13 files changed, 47 insertions, 37 deletions
diff --git a/chrome/browser/chromeos/login/eula_view.cc b/chrome/browser/chromeos/login/eula_view.cc
index afc3e31..4b7ed86 100644
--- a/chrome/browser/chromeos/login/eula_view.cc
+++ b/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"
diff --git a/chrome/browser/chromeos/views/domui_menu_widget.cc b/chrome/browser/chromeos/views/domui_menu_widget.cc
index f8e51d9..f9366bc 100644
--- a/chrome/browser/chromeos/views/domui_menu_widget.cc
+++ b/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 {
diff --git a/chrome/browser/ui/views/frame/browser_view_layout.h b/chrome/browser/ui/views/frame/browser_view_layout.h
index 1b680a1..2fdec85 100644
--- a/chrome/browser/ui/views/frame/browser_view_layout.h
+++ b/chrome/browser/ui/views/frame/browser_view_layout.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.
@@ -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;
diff --git a/chrome/browser/ui/views/instant_confirm_view.cc b/chrome/browser/ui/views/instant_confirm_view.cc
index adb96cd..b51ed70 100644
--- a/chrome/browser/ui/views/instant_confirm_view.cc
+++ b/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"
diff --git a/views/grid_layout.h b/views/grid_layout.h
index bfbfa64..da945b0 100644
--- a/views/grid_layout.h
+++ b/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 {
diff --git a/views/layout/box_layout.h b/views/layout/box_layout.h
index f7c2b1d..fde203c 100644
--- a/views/layout/box_layout.h
+++ b/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 {
diff --git a/views/layout/fill_layout.h b/views/layout/fill_layout.h
index 90b3f11..b8974d9 100644
--- a/views/layout/fill_layout.h
+++ b/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 {
diff --git a/views/layout/layout_manager.cc b/views/layout/layout_manager.cc
new file mode 100644
index 0000000..adaad9f
--- /dev/null
+++ b/views/layout/layout_manager.cc
@@ -0,0 +1,28 @@
+// 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/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
diff --git a/views/layout_manager.h b/views/layout/layout_manager.h
index c7e2190..328238a 100644
--- a/views/layout_manager.h
+++ b/views/layout/layout_manager.h
@@ -1,4 +1,4 @@
-// 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
diff --git a/views/layout_manager.cc b/views/layout_manager.cc
deleted file mode 100644
index 800dbc2..0000000
--- a/views/layout_manager.cc
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright (c) 2006-2008 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"
-
-namespace views {
-
-int LayoutManager::GetPreferredHeightForWidth(View* host, int width) {
- return GetPreferredSize(host).height();
-}
-
-} // namespace views
diff --git a/views/view.cc b/views/view.cc
index 9e801ee..87e1eba 100644
--- a/views/view.cc
+++ b/views/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.
@@ -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"
diff --git a/views/views.gyp b/views/views.gyp
index 474d928..8543987 100644
--- a/views/views.gyp
+++ b/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',
diff --git a/views/widget/widget_win.h b/views/widget/widget_win.h
index 6c45ae0..8c1f285 100644
--- a/views/widget/widget_win.h
+++ b/views/widget/widget_win.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.
@@ -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 {
generated by cgit v1.1 at 2025-01-29 21:18:08 +0000