diff options
| author | nsylvain@chromium.org <nsylvain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-22 15:27:45 +0000 |
|---|---|---|
| committer | nsylvain@chromium.org <nsylvain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-22 15:27:45 +0000 |
| commit | c39e715f96f482ebf4b2a00405bb3ccb5b8e8826 (patch) | |
| tree | 7075abb007b554979d25fb7218283f048e1b792e /views/focus/focus_manager_unittest.cc | |
| parent | 211386d58b7fb341e2a895e5776e8380184d58c4 (diff) | |
| download | chromium_src-c39e715f96f482ebf4b2a00405bb3ccb5b8e8826.zip chromium_src-c39e715f96f482ebf4b2a00405bb3ccb5b8e8826.tar.gz chromium_src-c39e715f96f482ebf4b2a00405bb3ccb5b8e8826.tar.bz2 | |
Revert :
Changed by: jcampan@chromium.org
Changed at: Fri 19 Jun 2009 21:22:47
Branch: src
Revision: 18889
Comments:
Relanding focus manager refactoring with build fix, see:http://codereview.chromium.org/125148BUG=NoneTEST=NoneTBR=ben
Review URL: http://codereview.chromium.org/141013
Because it creates hundreds of new reliability crashes.
TBR:jcampan
Review URL: http://codereview.chromium.org/140064
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@18904 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/focus/focus_manager_unittest.cc')
| -rw-r--r-- | views/focus/focus_manager_unittest.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/views/focus/focus_manager_unittest.cc b/views/focus/focus_manager_unittest.cc index 7fff0bd..cc56271 100644 --- a/views/focus/focus_manager_unittest.cc +++ b/views/focus/focus_manager_unittest.cc @@ -119,7 +119,7 @@ class BorderView : public NativeControl { parent_container, NULL, NULL, NULL); // Create the view container which is a child of the TabControl. widget_ = new WidgetWin(); - widget_->Init(tab_control, gfx::Rect()); + widget_->Init(tab_control, gfx::Rect(), false); widget_->SetContentsView(child_); widget_->SetFocusTraversableParentView(this); ResizeContents(tab_control); @@ -210,8 +210,7 @@ class FocusManagerTest : public testing::Test, public WindowDelegate { } FocusManager* GetFocusManager() { - return FocusManager::GetFocusManagerForNativeView( - window_->GetNativeWindow()); + return FocusManager::GetFocusManager(window_->GetNativeWindow()); } // WindowDelegate Implementation. |