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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ui/aura/demo/demo_main.cc

Issue 23882007: Explicit initialization of aura::Env for browser shell. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Using stricter ifdefs 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
« ash/shell.cc ('K') | « ui/aura/bench/bench_main.cc ('k') | ui/aura/env.h » ('j') | ui/views/widget/desktop_aura/desktop_native_widget_aura.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/aura/demo/demo_main.cc
diff --git a/ui/aura/demo/demo_main.cc b/ui/aura/demo/demo_main.cc
index fb236844dc46343703ce39fd5ba366a382d59af8..ba0b005942699824fd1025d771d9cabcdb401744 100644
--- a/ui/aura/demo/demo_main.cc
+++ b/ui/aura/demo/demo_main.cc
@@ -115,7 +115,7 @@ int DemoMain() {
bool allow_test_contexts = false;
ui::Compositor::InitializeContextFactoryForTests(allow_test_contexts);
- aura::Env::GetInstance();
+ aura::Env::CreateInstance();
scoped_ptr<aura::TestScreen> test_screen(aura::TestScreen::Create());
gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_NATIVE, test_screen.get());
scoped_ptr<aura::RootWindow> root_window(
« ash/shell.cc ('K') | « ui/aura/bench/bench_main.cc ('k') | ui/aura/env.h » ('j') | ui/views/widget/desktop_aura/desktop_native_widget_aura.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698