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

Unified Diff: ash/shell.cc

Issue 23882007: Explicit initialization of aura::Env for browser shell. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix chrome_frame_net_tests Created 7 years, 3 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 | ash/test/ash_test_helper.cc » ('j') | chrome/browser/chrome_browser_main.cc » ('J')
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 3606c5d78155195cbeab2317cb4a14424ffb210e..a520b03bbd5aa0bbdf85091b961e5a50e6071bab 100644
--- a/ash/shell.cc
+++ b/ash/shell.cc
@@ -472,7 +472,7 @@ void Shell::Init() {
// Env creates the compositor. Historically it seems to have been implicitly
// initialized first by the ActivationController, but now that FocusController
// no longer does this we need to do it explicitly.
- aura::Env::GetInstance();
+ aura::Env::CreateInstance();
views::corewm::FocusController* focus_controller =
new views::corewm::FocusController(new wm::AshFocusRules);
focus_client_.reset(focus_controller);
« no previous file with comments | « no previous file | ash/test/ash_test_helper.cc » ('j') | chrome/browser/chrome_browser_main.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698