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-30 18:48:00 +0000
committerjcampan@chromium.org <jcampan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-30 18:48:00 +0000
commit82166b65c8cdd7cb855c2d018be8c6c815324af6 (patch)
treef96034ed91ce66d6a3ba2afa07cdd4be1e55b264 /chrome/browser/views/first_run_bubble.cc
parent7811b768ff61d58153a198a273cdb39581a77542 (diff)
downloadchromium_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 'chrome/browser/views/first_run_bubble.cc')
-rw-r--r--chrome/browser/views/first_run_bubble.cc8
1 files changed, 2 insertions, 6 deletions
diff --git a/chrome/browser/views/first_run_bubble.cc b/chrome/browser/views/first_run_bubble.cc
index ba8edb2..b79c665 100644
--- a/chrome/browser/views/first_run_bubble.cc
+++ b/chrome/browser/views/first_run_bubble.cc
@@ -343,9 +343,7 @@ void FirstRunBubble::InfoBubbleClosing(InfoBubble* info_bubble,
if (!IsWindowEnabled(GetParent()))
::EnableWindow(GetParent(), true);
enable_window_method_factory_.RevokeAll();
- views::FocusManager* focus_manager =
- views::FocusManager::GetFocusManager(GetNativeView());
- focus_manager->RemoveFocusChangeListener(view_);
+ GetFocusManager()->RemoveFocusChangeListener(view_);
}
// static
@@ -362,9 +360,7 @@ FirstRunBubble* FirstRunBubble::Show(Profile* profile, views::Window* parent,
window->set_view(view);
window->Init(parent, position_relative_to, view);
window->ShowWindow(SW_SHOW);
- views::FocusManager* focus_manager =
- views::FocusManager::GetFocusManager(window->GetNativeView());
- focus_manager->AddFocusChangeListener(view);
+ window->GetFocusManager()->AddFocusChangeListener(view);
view->BubbleShown();
return window;
}