ui/aura/demo/demo_main.cc - Issue 23882007: Explicit initialization of aura::Env for browser shell.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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: 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:

Index: ui/aura/demo/demo_main.cc

diff --git a/ui/aura/demo/demo_main.cc b/ui/aura/demo/demo_main.cc

index dbf1c80b7a60860478a9b2f8133130c5e5d8524c..e56ab714677c794f139d34bd348169347e650655 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(