summaryrefslogtreecommitdiffstats
path: root/views/controls/native_control_win.cc
diff options
context:
space:
mode:
authornsylvain@chromium.org <nsylvain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-22 15:27:45 +0000
committernsylvain@chromium.org <nsylvain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-22 15:27:45 +0000
commitc39e715f96f482ebf4b2a00405bb3ccb5b8e8826 (patch)
tree7075abb007b554979d25fb7218283f048e1b792e /views/controls/native_control_win.cc
parent211386d58b7fb341e2a895e5776e8380184d58c4 (diff)
downloadchromium_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 'views/controls/native_control_win.cc')
-rw-r--r--views/controls/native_control_win.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/views/controls/native_control_win.cc b/views/controls/native_control_win.cc
index 32c7261..b6111fd 100644
--- a/views/controls/native_control_win.cc
+++ b/views/controls/native_control_win.cc
@@ -196,7 +196,8 @@ LRESULT NativeControlWin::NativeControlWndProc(HWND window,
return 0;
} else if (message == WM_SETFOCUS) {
// Let the focus manager know that the focus changed.
- FocusManager* focus_manager = native_control->GetFocusManager();
+ FocusManager* focus_manager =
+ FocusManager::GetFocusManager(native_control->native_view());
if (focus_manager) {
focus_manager->SetFocusedView(native_control->focus_view());
} else {