diff options
| author | jcampan@chromium.org <jcampan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-19 23:08:41 +0000 |
|---|---|---|
| committer | jcampan@chromium.org <jcampan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-19 23:08:41 +0000 |
| commit | 42c35a5997f5b11522ee308c19d334146ac6895a (patch) | |
| tree | cb46a30551e8eb5112a6c6ba4d9a9284e2dedcfe /views/view_unittest.cc | |
| parent | a109d02492863aeb537dea09bfb445eb6f5d94c5 (diff) | |
| download | chromium_src-42c35a5997f5b11522ee308c19d334146ac6895a.zip chromium_src-42c35a5997f5b11522ee308c19d334146ac6895a.tar.gz chromium_src-42c35a5997f5b11522ee308c19d334146ac6895a.tar.bz2 | |
Reverting 18872.
Broke the Windows build.
BUG=None
TEST=None
TBR=ben
Review URL: http://codereview.chromium.org/140023
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@18873 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/view_unittest.cc')
| -rw-r--r-- | views/view_unittest.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/views/view_unittest.cc b/views/view_unittest.cc index 829c682..6484653 100644 --- a/views/view_unittest.cc +++ b/views/view_unittest.cc @@ -306,7 +306,7 @@ TEST_F(ViewTest, MouseEvent) { views::WidgetWin window; window.set_delete_on_destroy(false); window.set_window_style(WS_OVERLAPPEDWINDOW); - window.Init(NULL, gfx::Rect(50, 50, 650, 650)); + window.Init(NULL, gfx::Rect(50, 50, 650, 650), false); RootView* root = window.GetRootView(); root->AddChildView(v1); @@ -647,7 +647,7 @@ TEST_F(ViewTest, TextfieldCutCopyPaste) { Clipboard clipboard; WidgetWin* window = new WidgetWin; - window->Init(NULL, gfx::Rect(0, 0, 100, 100)); + window->Init(NULL, gfx::Rect(0, 0, 100, 100), true); RootView* root_view = window->GetRootView(); Textfield* normal = new Textfield(); @@ -769,7 +769,7 @@ TEST_F(ViewTest, ActivateAccelerator) { // Create a window and add the view as its child. WidgetWin window; - window.Init(NULL, gfx::Rect(0, 0, 100, 100)); + window.Init(NULL, gfx::Rect(0, 0, 100, 100), true); window.set_delete_on_destroy(false); window.set_window_style(WS_OVERLAPPEDWINDOW); RootView* root = window.GetRootView(); @@ -777,7 +777,7 @@ TEST_F(ViewTest, ActivateAccelerator) { // Get the focus manager. views::FocusManager* focus_manager = - views::FocusManager::GetFocusManagerForNativeView(window.GetNativeView()); + views::FocusManager::GetFocusManager(window.GetNativeView()); ASSERT_TRUE(focus_manager); // Hit the return key and see if it takes effect. @@ -1032,7 +1032,7 @@ class DefaultButtonTest : public ViewTest { dialog_view_); window->Show(); native_window_ = window->GetNativeWindow(); - focus_manager_ = FocusManager::GetFocusManagerForNativeView(native_window_); + focus_manager_ = FocusManager::GetFocusManager(native_window_); client_view_ = static_cast<views::DialogClientView*>(window->GetClientView()); ok_button_ = client_view_->ok_button(); |