summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authorben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2008-10-17 03:26:16 +0000
committerben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2008-10-17 03:26:16 +0000
commit0651394b24e570ad101b617e15c251535d791ae0 (patch)
treebc0798fa7302630b2bebd48943efabf7f031d90e /chrome
parent2d1f9b78381767f11fb897b7c9d624eb81569040 (diff)
downloadchromium_src-0651394b24e570ad101b617e15c251535d791ae0.zip
chromium_src-0651394b24e570ad101b617e15c251535d791ae0.tar.gz
chromium_src-0651394b24e570ad101b617e15c251535d791ae0.tar.bz2
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
Diffstat (limited to 'chrome')
-rw-r--r--chrome/test/interactive_ui/view_event_test_base.cc6
1 files changed, 5 insertions, 1 deletions
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;