diff options
| author | nsylvain@chromium.org <nsylvain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-22 15:27:45 +0000 |
|---|---|---|
| committer | nsylvain@chromium.org <nsylvain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-22 15:27:45 +0000 |
| commit | c39e715f96f482ebf4b2a00405bb3ccb5b8e8826 (patch) | |
| tree | 7075abb007b554979d25fb7218283f048e1b792e /views/view_win.cc | |
| parent | 211386d58b7fb341e2a895e5776e8380184d58c4 (diff) | |
| download | chromium_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/view_win.cc')
| -rw-r--r-- | views/view_win.cc | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/views/view_win.cc b/views/view_win.cc index bf265f9..c61363d 100644 --- a/views/view_win.cc +++ b/views/view_win.cc @@ -17,6 +17,18 @@ namespace views { +FocusManager* View::GetFocusManager() { + Widget* widget = GetWidget(); + if (!widget) + return NULL; + + HWND hwnd = widget->GetNativeView(); + if (!hwnd) + return NULL; + + return FocusManager::GetFocusManager(hwnd); +} + void View::DoDrag(const MouseEvent& e, int press_x, int press_y) { int drag_operations = GetDragOperations(press_x, press_y); if (drag_operations == DragDropTypes::DRAG_NONE) @@ -43,7 +55,7 @@ void View::Focus() { // messages. FocusManager* focus_manager = GetFocusManager(); if (focus_manager) - focus_manager->FocusNativeView(GetRootView()->GetWidget()->GetNativeView()); + focus_manager->FocusHWND(GetRootView()->GetWidget()->GetNativeView()); } int View::GetHorizontalDragThreshold() { |