Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(7)

Unified Diff: ash/shell.cc

Issue 10388229: Install AshFocusManagerFactory before creating launcher, tray, wall paper and their views::FocusMan… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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) {
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698