| Index: ash/shell.cc
|
| diff --git a/ash/shell.cc b/ash/shell.cc
|
| index c0a555f40681e5d46a5b04c2d86df0c626e18f93..9bc0e8fc123005183826374c80b14f18a616cd5e 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"
|
| @@ -76,6 +77,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"
|
|
|
| @@ -545,6 +547,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());
|
| @@ -744,6 +748,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) {
|
|
|