diff options
| author | beng@google.com <beng@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-07-30 05:49:24 +0000 |
|---|---|---|
| committer | beng@google.com <beng@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-07-30 05:49:24 +0000 |
| commit | 492399e06e64635ca8e3191f0653a8b081863b33 (patch) | |
| tree | 48176591790aed9ffc8ffcc732b0e0fc1f013d17 /chrome/views | |
| parent | a8da3a55ce6358c92cc976f105567f67789a2510 (diff) | |
| download | chromium_src-492399e06e64635ca8e3191f0653a8b081863b33.zip chromium_src-492399e06e64635ca8e3191f0653a8b081863b33.tar.gz chromium_src-492399e06e64635ca8e3191f0653a8b081863b33.tar.bz2 | |
build bustage
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@106 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/views')
| -rw-r--r-- | chrome/views/focus_manager_unittest.cc | 3 | ||||
| -rw-r--r-- | chrome/views/view_unittest.cc | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/chrome/views/focus_manager_unittest.cc b/chrome/views/focus_manager_unittest.cc index 4a7240a..ce26b04 100644 --- a/chrome/views/focus_manager_unittest.cc +++ b/chrome/views/focus_manager_unittest.cc @@ -264,7 +264,8 @@ void TestViewWindow::Init() { contents_->SetBackground( ChromeViews::Background::CreateSolidBackground(255, 255, 255)); - HWNDViewContainer::Init(NULL, bounds, contents_, true); + HWNDViewContainer::Init(NULL, bounds, true); + SetContentsView(contents_); ChromeViews::CheckBox* cb = new ChromeViews::CheckBox(L"This is a checkbox"); diff --git a/chrome/views/view_unittest.cc b/chrome/views/view_unittest.cc index 3dfd986..9ecc585 100644 --- a/chrome/views/view_unittest.cc +++ b/chrome/views/view_unittest.cc @@ -312,7 +312,7 @@ TEST_F(ViewTest, MouseEvent) { ChromeViews::HWNDViewContainer window; window.set_delete_on_destroy(false); window.set_window_style(WS_OVERLAPPEDWINDOW); - window.Init(NULL, gfx::Rect(50, 50, 650, 650), NULL, false); + window.Init(NULL, gfx::Rect(50, 50, 650, 650), false); RootView* root = window.GetRootView(); root->AddChildView(v1); |