diff options
Diffstat (limited to 'ash/shell.cc')
| -rw-r--r-- | ash/shell.cc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/ash/shell.cc b/ash/shell.cc index 663d7e1..6d11117 100644 --- a/ash/shell.cc +++ b/ash/shell.cc @@ -7,6 +7,7 @@ #include <algorithm> #include <string> +#include "ash/accelerators/focus_manager_factory.h" #include "ash/ash_switches.h" #include "ash/desktop_background/desktop_background_controller.h" #include "ash/desktop_background/desktop_background_resources.h" @@ -77,6 +78,7 @@ #include "ui/gfx/screen.h" #include "ui/gfx/size.h" #include "ui/ui_controls/ui_controls.h" +#include "ui/views/focus/focus_manager_factory.h" #include "ui/views/widget/native_widget_aura.h" #include "ui/views/widget/widget.h" @@ -546,6 +548,8 @@ Shell::Shell(ShellDelegate* delegate) } Shell::~Shell() { + views::FocusManagerFactory::Install(NULL); + RemoveRootWindowEventFilter(key_rewriter_filter_.get()); RemoveRootWindowEventFilter(partial_screenshot_filter_.get()); RemoveRootWindowEventFilter(input_method_filter_.get()); @@ -752,6 +756,8 @@ void Shell::Init() { window_cycle_controller_.reset(new WindowCycleController); monitor_controller_.reset(new internal::MonitorController); screen_dimmer_.reset(new internal::ScreenDimmer); + + views::FocusManagerFactory::Install(new AshFocusManagerFactory); } aura::Window* Shell::GetContainer(int container_id) { |