summaryrefslogtreecommitdiffstats
path: root/views/controls/native_control_win.cc
diff options
context:
space:
mode:
authorjcampan@chromium.org <jcampan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-19 22:57:54 +0000
committerjcampan@chromium.org <jcampan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-19 22:57:54 +0000
commita109d02492863aeb537dea09bfb445eb6f5d94c5 (patch)
treebd3d2e9a783179eb2582f0055192b97e8d248547 /views/controls/native_control_win.cc
parent3c30f4c1e5f2bdb4f5d198c4a9ea18cc8045ddea (diff)
downloadchromium_src-a109d02492863aeb537dea09bfb445eb6f5d94c5.zip
chromium_src-a109d02492863aeb537dea09bfb445eb6f5d94c5.tar.gz
chromium_src-a109d02492863aeb537dea09bfb445eb6f5d94c5.tar.bz2
Removed the last Windows specific part out of the focus manager. HWNDs are not subclassed anymore.The FocusManager is now created and owned by top-level WidgetWins.BUG=NoneTEST=Run the unit tests, UI tests, interactive UI tests. Fully test the focus behavior in the browser: activate/deactivate the browser windows, make sure focus is remembered. Switch tabs, make sure focus is remembered for each tab. make sure accelerators work as expected. Test focus traversal in a web page, in the option dialog.
Review URL: http://codereview.chromium.org/125148 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@18872 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, 1 insertions, 2 deletions
diff --git a/views/controls/native_control_win.cc b/views/controls/native_control_win.cc
index b6111fd..32c7261 100644
--- a/views/controls/native_control_win.cc
+++ b/views/controls/native_control_win.cc
@@ -196,8 +196,7 @@ LRESULT NativeControlWin::NativeControlWndProc(HWND window,
return 0;
} else if (message == WM_SETFOCUS) {
// Let the focus manager know that the focus changed.
- FocusManager* focus_manager =
- FocusManager::GetFocusManager(native_control->native_view());
+ FocusManager* focus_manager = native_control->GetFocusManager();
if (focus_manager) {
focus_manager->SetFocusedView(native_control->focus_view());
} else {