Commit c9301e3d authored by yusukes@google.com's avatar yusukes@google.com

Install AshFocusManagerFactory before creating launcher, tray, wall paper and...

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
parent 99c6cbea
......@@ -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) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment