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 /chrome/browser/views/first_run_bubble.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 'chrome/browser/views/first_run_bubble.cc')
| -rw-r--r-- | chrome/browser/views/first_run_bubble.cc | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/chrome/browser/views/first_run_bubble.cc b/chrome/browser/views/first_run_bubble.cc index b79c665..ba8edb2 100644 --- a/chrome/browser/views/first_run_bubble.cc +++ b/chrome/browser/views/first_run_bubble.cc @@ -343,7 +343,9 @@ void FirstRunBubble::InfoBubbleClosing(InfoBubble* info_bubble, if (!IsWindowEnabled(GetParent())) ::EnableWindow(GetParent(), true); enable_window_method_factory_.RevokeAll(); - GetFocusManager()->RemoveFocusChangeListener(view_); + views::FocusManager* focus_manager = + views::FocusManager::GetFocusManager(GetNativeView()); + focus_manager->RemoveFocusChangeListener(view_); } // static @@ -360,7 +362,9 @@ FirstRunBubble* FirstRunBubble::Show(Profile* profile, views::Window* parent, window->set_view(view); window->Init(parent, position_relative_to, view); window->ShowWindow(SW_SHOW); - window->GetFocusManager()->AddFocusChangeListener(view); + views::FocusManager* focus_manager = + views::FocusManager::GetFocusManager(window->GetNativeView()); + focus_manager->AddFocusChangeListener(view); view->BubbleShown(); return window; } |