summaryrefslogtreecommitdiffstats
path: root/views/focus
diff options
context:
space:
mode:
authorben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-03 04:41:34 +0000
committerben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-03 04:41:34 +0000
commit6dee7c46b6e47769b1f2b3e032b1dc5ccdd8863a (patch)
treee61a13869ded3789cfaa1d43f04f7aaa9b16abd4 /views/focus
parent0c3bf9563dcd51310abbf9856db4aba416a664bf (diff)
downloadchromium_src-6dee7c46b6e47769b1f2b3e032b1dc5ccdd8863a.zip
chromium_src-6dee7c46b6e47769b1f2b3e032b1dc5ccdd8863a.tar.gz
chromium_src-6dee7c46b6e47769b1f2b3e032b1dc5ccdd8863a.tar.bz2
Final conversion step. Convert FocusManager, WidgetWin, SpeechInputBubble, and remove old functions now no-one uses them.
Continuation of: Land the new functions added by 76483 - but do not use them anywhere outside of their tests. This will help me incrementally re-deploy these functions and identify what is causing the buildbot test redness. BUG=72040 TEST=none TBR=sky (all code originally reviewed here: http://codereview.chromium.org/6598069/ ) git-svn-id: svn://svn.chromium.org/chrome/trunk/src@76716 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/focus')
-rw-r--r--views/focus/focus_manager_win.cc6
1 files changed, 4 insertions, 2 deletions
diff --git a/views/focus/focus_manager_win.cc b/views/focus/focus_manager_win.cc
index faf3815..d6f1e02 100644
--- a/views/focus/focus_manager_win.cc
+++ b/views/focus/focus_manager_win.cc
@@ -23,8 +23,10 @@ void FocusManager::FocusNativeView(gfx::NativeView native_view) {
// static
FocusManager* FocusManager::GetFocusManagerForNativeView(
gfx::NativeView native_view) {
- WidgetWin* widget = WidgetWin::GetRootWidget(native_view);
- return widget ? widget->GetFocusManager() : NULL;
+ // TODO(beng): This method probably isn't necessary.
+ views::NativeWidget* native_widget =
+ views::NativeWidget::GetTopLevelNativeWidget(native_view);
+ return native_widget ? native_widget->GetWidget()->GetFocusManager() : NULL;
}
// static