summaryrefslogtreecommitdiffstats
path: root/views/focus/focus_manager_win.cc
diff options
context:
space:
mode:
authorjcampan@chromium.org <jcampan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-02-24 01:34:35 +0000
committerjcampan@chromium.org <jcampan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-02-24 01:34:35 +0000
commit9649be09ca7396037a689efc706ad4fafa29b04b (patch)
treeef1cce9c266571c0c85c3c156a67013791a76d36 /views/focus/focus_manager_win.cc
parentf125a763fcd2ad2fb91a97032c6a4eb96d0d845c (diff)
downloadchromium_src-9649be09ca7396037a689efc706ad4fafa29b04b.zip
chromium_src-9649be09ca7396037a689efc706ad4fafa29b04b.tar.gz
chromium_src-9649be09ca7396037a689efc706ad4fafa29b04b.tar.bz2
Landing Marshall Greenblatt change.
See review at: http://codereview.chromium.org/609010/show BUG=None TEST=None Review URL: http://codereview.chromium.org/657019 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@39827 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/focus/focus_manager_win.cc')
-rw-r--r--views/focus/focus_manager_win.cc5
1 files changed, 1 insertions, 4 deletions
diff --git a/views/focus/focus_manager_win.cc b/views/focus/focus_manager_win.cc
index a073a4c..fbccf7b 100644
--- a/views/focus/focus_manager_win.cc
+++ b/views/focus/focus_manager_win.cc
@@ -23,10 +23,7 @@ void FocusManager::FocusNativeView(gfx::NativeView native_view) {
// static
FocusManager* FocusManager::GetFocusManagerForNativeView(
gfx::NativeView native_view) {
- HWND root = ::GetAncestor(native_view, GA_ROOT);
- if (!root)
- return NULL;
- WidgetWin* widget = WidgetWin::GetWidget(root);
+ WidgetWin* widget = WidgetWin::GetRootWidget(native_view);
return widget ? widget->GetFocusManager() : NULL;
}