diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-14 00:29:54 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-14 00:29:54 +0000 |
| commit | 103b290595a05fc1bb8b239ed80bfdc701c39105 (patch) | |
| tree | ff2845f9b949f63ec710386187cc5642f1f544ec /views/widget | |
| parent | 36cb77af1fd4dd1b1daff4dfb989398a27d774a1 (diff) | |
| download | chromium_src-103b290595a05fc1bb8b239ed80bfdc701c39105.zip chromium_src-103b290595a05fc1bb8b239ed80bfdc701c39105.tar.gz chromium_src-103b290595a05fc1bb8b239ed80bfdc701c39105.tar.bz2 | |
views: Factor WidgetFocusManager out of FocusManager class.
This moves WidgetFocusManager into its source/header files avoiding the use of nested classes.
R=sky@chromium.org
Review URL: http://codereview.chromium.org/7885001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@101002 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/widget')
| -rw-r--r-- | views/widget/widget.cc | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/views/widget/widget.cc b/views/widget/widget.cc index 909fc50..de44fdb 100644 --- a/views/widget/widget.cc +++ b/views/widget/widget.cc @@ -12,26 +12,30 @@ #include "ui/gfx/compositor/compositor.h" #include "ui/gfx/compositor/layer.h" #include "views/controls/menu/menu_controller.h" +#include "views/focus/focus_manager.h" #include "views/focus/focus_manager_factory.h" #include "views/focus/view_storage.h" +#include "views/focus/widget_focus_manager.h" #include "views/ime/input_method.h" #include "views/views_delegate.h" #include "views/widget/default_theme_provider.h" -#include "views/widget/root_view.h" #include "views/widget/native_widget_private.h" +#include "views/widget/root_view.h" #include "views/widget/tooltip_manager.h" #include "views/widget/widget_delegate.h" #include "views/window/custom_frame_view.h" -namespace views { - namespace { + // Set to true if a pure Views implementation is preferred bool use_pure_views = false; // True to enable debug paint that indicates where to be painted. bool debug_paint = false; -} + +} // namespace + +namespace views { // This class is used to keep track of the event a Widget is processing, and // restore any previously active event afterwards. @@ -844,15 +848,13 @@ void Widget::OnNativeWidgetActivationChanged(bool active) { } void Widget::OnNativeFocus(gfx::NativeView focused_view) { - GetFocusManager()->GetWidgetFocusManager()->OnWidgetFocusEvent( - focused_view, - GetNativeView()); + WidgetFocusManager::GetInstance()->OnWidgetFocusEvent(focused_view, + GetNativeView()); } void Widget::OnNativeBlur(gfx::NativeView focused_view) { - GetFocusManager()->GetWidgetFocusManager()->OnWidgetFocusEvent( - GetNativeView(), - focused_view); + WidgetFocusManager::GetInstance()->OnWidgetFocusEvent(GetNativeView(), + focused_view); } void Widget::OnNativeWidgetVisibilityChanged(bool visible) { |