diff options
| author | jcampan@chromium.org <jcampan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-30 18:48:00 +0000 |
|---|---|---|
| committer | jcampan@chromium.org <jcampan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-30 18:48:00 +0000 |
| commit | 82166b65c8cdd7cb855c2d018be8c6c815324af6 (patch) | |
| tree | f96034ed91ce66d6a3ba2afa07cdd4be1e55b264 /views/view_win.cc | |
| parent | 7811b768ff61d58153a198a273cdb39581a77542 (diff) | |
| download | chromium_src-82166b65c8cdd7cb855c2d018be8c6c815324af6.zip chromium_src-82166b65c8cdd7cb855c2d018be8c6c815324af6.tar.gz chromium_src-82166b65c8cdd7cb855c2d018be8c6c815324af6.tar.bz2 | |
This CL removes the last (major) Windows specific part out of the focus manager.
It was previously landed and reverted because it broke the reliability tests.
http://codereview.chromium.org/125148
The breakage was caused by constrained windows not getting a hold of the FocusManager when in unparented tabs.
The fix is to ensure unparented tab still have a way to access their FocusManager for proper closure.
Files changed from the previous patch that need reviewing:
native_tab_contents_container_win.cc
tab_contents_view_win.h
tab_contents_view_win.cc
BUG=None
TEST=Run all tests (unit, ui, interactive). Extensively test the focus in Chrome.
Review URL: http://codereview.chromium.org/146093
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@19617 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/view_win.cc')
| -rw-r--r-- | views/view_win.cc | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/views/view_win.cc b/views/view_win.cc index c61363d..bf265f9 100644 --- a/views/view_win.cc +++ b/views/view_win.cc @@ -17,18 +17,6 @@ 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) @@ -55,7 +43,7 @@ void View::Focus() { // messages. FocusManager* focus_manager = GetFocusManager(); if (focus_manager) - focus_manager->FocusHWND(GetRootView()->GetWidget()->GetNativeView()); + focus_manager->FocusNativeView(GetRootView()->GetWidget()->GetNativeView()); } int View::GetHorizontalDragThreshold() { |