diff options
| author | jcampan@chromium.org <jcampan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-30 18:48:00 +0000 |
|---|---|---|
| committer | jcampan@chromium.org <jcampan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-30 18:48:00 +0000 |
| commit | 82166b65c8cdd7cb855c2d018be8c6c815324af6 (patch) | |
| tree | f96034ed91ce66d6a3ba2afa07cdd4be1e55b264 /views/view_unittest.cc | |
| parent | 7811b768ff61d58153a198a273cdb39581a77542 (diff) | |
| download | chromium_src-82166b65c8cdd7cb855c2d018be8c6c815324af6.zip chromium_src-82166b65c8cdd7cb855c2d018be8c6c815324af6.tar.gz chromium_src-82166b65c8cdd7cb855c2d018be8c6c815324af6.tar.bz2 | |
This CL removes the last (major) Windows specific part out of the focus manager.
It was previously landed and reverted because it broke the reliability tests.
http://codereview.chromium.org/125148
The breakage was caused by constrained windows not getting a hold of the FocusManager when in unparented tabs.
The fix is to ensure unparented tab still have a way to access their FocusManager for proper closure.
Files changed from the previous patch that need reviewing:
native_tab_contents_container_win.cc
tab_contents_view_win.h
tab_contents_view_win.cc
BUG=None
TEST=Run all tests (unit, ui, interactive). Extensively test the focus in Chrome.
Review URL: http://codereview.chromium.org/146093
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@19617 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 6484653..829c682 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), false); + window.Init(NULL, gfx::Rect(50, 50, 650, 650)); 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), true); + window->Init(NULL, gfx::Rect(0, 0, 100, 100)); 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), true); + window.Init(NULL, gfx::Rect(0, 0, 100, 100)); 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::GetFocusManager(window.GetNativeView()); + views::FocusManager::GetFocusManagerForNativeView(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::GetFocusManager(native_window_); + focus_manager_ = FocusManager::GetFocusManagerForNativeView(native_window_); client_view_ = static_cast<views::DialogClientView*>(window->GetClientView()); ok_button_ = client_view_->ok_button(); |