Index: ash/shell.cc |
diff --git a/ash/shell.cc b/ash/shell.cc |
index 4ad77696896717100f50d1051250c02260ddc7eb..9e1044560e99746b772cc8a013b37aee5aa9f4cf 100644 |
--- a/ash/shell.cc |
+++ b/ash/shell.cc |
@@ -652,6 +652,10 @@ aura::RootWindow* Shell::GetRootWindow() { |
} |
void Shell::Init() { |
+ // Install the custom factory first so that views::FocusManagers for Tray, |
+ // Launcher, and WallPaper could be created by the factory. |
+ views::FocusManagerFactory::Install(new AshFocusManagerFactory); |
+ |
aura::RootWindow* root_window = GetRootWindow(); |
root_filter_ = new aura::shared::RootWindowEventFilter(root_window); |
#if !defined(OS_MACOSX) |
@@ -762,8 +766,6 @@ 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) { |