summaryrefslogtreecommitdiffstats
path: root/chrome/browser/views/first_run_bubble.cc
diff options
context:
space:
mode:
authorjcampan@chromium.org <jcampan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-19 23:08:41 +0000
committerjcampan@chromium.org <jcampan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-19 23:08:41 +0000
commit42c35a5997f5b11522ee308c19d334146ac6895a (patch)
treecb46a30551e8eb5112a6c6ba4d9a9284e2dedcfe /chrome/browser/views/first_run_bubble.cc
parenta109d02492863aeb537dea09bfb445eb6f5d94c5 (diff)
downloadchromium_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 'chrome/browser/views/first_run_bubble.cc')
-rw-r--r--chrome/browser/views/first_run_bubble.cc8
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;
}