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/focus/focus_manager_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/focus/focus_manager_win.cc')
-rw-r--r-- | views/focus/focus_manager_win.cc | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/views/focus/focus_manager_win.cc b/views/focus/focus_manager_win.cc new file mode 100644 index 0000000..a073a4c --- /dev/null +++ b/views/focus/focus_manager_win.cc @@ -0,0 +1,34 @@ +// Copyright (c) 2006-2009 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#include "views/focus/focus_manager.h" + +#include "views/view.h" +#include "views/widget/widget_win.h" + +namespace views { + +void FocusManager::ClearNativeFocus() { + // Keep the top root window focused so we get keyboard events. + ::SetFocus(widget_->GetNativeView()); +} + +void FocusManager::FocusNativeView(gfx::NativeView native_view) { + // Only reset focus if hwnd is not already focused. + if (native_view && ::GetFocus() != native_view) + ::SetFocus(native_view); +} + +// static +FocusManager* FocusManager::GetFocusManagerForNativeView( + gfx::NativeView native_view) { + HWND root = ::GetAncestor(native_view, GA_ROOT); + if (!root) + return NULL; + WidgetWin* widget = WidgetWin::GetWidget(root); + return widget ? widget->GetFocusManager() : NULL; +} + +} // namespace views + |