From 0651394b24e570ad101b617e15c251535d791ae0 Mon Sep 17 00:00:00 2001 From: "ben@chromium.org" Date: Fri, 17 Oct 2008 03:26:16 +0000 Subject: Fix interactive UI tests. ViewEventTestBase's View was using a layout manager incompatible with a non-RootView, causing coordinates to get screwed up. TBR=sky Review URL: http://codereview.chromium.org/7471 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@3507 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/test/interactive_ui/view_event_test_base.cc | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'chrome/test') diff --git a/chrome/test/interactive_ui/view_event_test_base.cc b/chrome/test/interactive_ui/view_event_test_base.cc index bbd312a..f5bd7a9 100644 --- a/chrome/test/interactive_ui/view_event_test_base.cc +++ b/chrome/test/interactive_ui/view_event_test_base.cc @@ -23,6 +23,11 @@ class TestView : public views::View { return View::GetPreferredSize(); } + virtual void Layout() { + View* child_view = GetChildViewAt(0); + child_view->SetBounds(0, 0, width(), height()); + } + private: gfx::Size preferred_size_; @@ -63,7 +68,6 @@ views::View* ViewEventTestBase::GetContentsView() { // Wrap the real view (as returned by CreateContentsView) in a View so // that we can customize the preferred size. TestView* test_view = new TestView(); - test_view->SetLayoutManager(new views::FillLayout()); test_view->set_preferred_size(GetPreferredSize()); test_view->AddChildView(CreateContentsView()); content_view_ = test_view; -- cgit v1.1