diff options
| author | jcampan@chromium.org <jcampan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-19 23:08:41 +0000 |
|---|---|---|
| committer | jcampan@chromium.org <jcampan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-19 23:08:41 +0000 |
| commit | 42c35a5997f5b11522ee308c19d334146ac6895a (patch) | |
| tree | cb46a30551e8eb5112a6c6ba4d9a9284e2dedcfe /views/view_win.cc | |
| parent | a109d02492863aeb537dea09bfb445eb6f5d94c5 (diff) | |
| download | chromium_src-42c35a5997f5b11522ee308c19d334146ac6895a.zip chromium_src-42c35a5997f5b11522ee308c19d334146ac6895a.tar.gz chromium_src-42c35a5997f5b11522ee308c19d334146ac6895a.tar.bz2 | |
Reverting 18872.
Broke the Windows build.
BUG=None
TEST=None
TBR=ben
Review URL: http://codereview.chromium.org/140023
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@18873 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() { |