diff options
| author | yusukes@google.com <yusukes@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-23 08:34:58 +0000 |
|---|---|---|
| committer | yusukes@google.com <yusukes@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-23 08:34:58 +0000 |
| commit | c9301e3d185f0cb73842f0e766643bd1e0c4523b (patch) | |
| tree | 28c1b19a8821f435b1753ed09ca37a437efb2790 /ash | |
| parent | 99c6cbea09a92aab763dfbc6da520fe6bf25006e (diff) | |
| download | chromium_src-c9301e3d185f0cb73842f0e766643bd1e0c4523b.zip chromium_src-c9301e3d185f0cb73842f0e766643bd1e0c4523b.tar.gz chromium_src-c9301e3d185f0cb73842f0e766643bd1e0c4523b.tar.bz2 | |
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
Diffstat (limited to 'ash')
| -rw-r--r-- | ash/shell.cc | 6 |
1 files changed, 4 insertions, 2 deletions
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) { |