From c9301e3d185f0cb73842f0e766643bd1e0c4523b Mon Sep 17 00:00:00 2001 From: "yusukes@google.com" Date: Wed, 23 May 2012 08:34:58 +0000 Subject: Install AshFocusManagerFactory before creating launcher, tray, wall paper and their views::FocusManagers. Otherwise, Ash shortcut keys cannot be used when either launcher or status area is focused. BUG=120953,123856 TEST=crosbug.com/120953#c17 TBR=ben@chromium.org Review URL: https://chromiumcodereview.appspot.com/10388229 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@138450 0039d316-1c4b-4281-b951-d872f2087c98 --- ash/shell.cc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'ash') diff --git a/ash/shell.cc b/ash/shell.cc index 4731c74..d1b532a 100644 --- a/ash/shell.cc +++ b/ash/shell.cc @@ -651,6 +651,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) @@ -760,8 +764,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) { -- cgit v1.1