ui/aura/demo/demo_main.cc - Issue 1293013002: aura: Require explicit ownership of the Env instance.

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 1293013002: aura: Require explicit ownership of the Env instance. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: . Created 5 years, 4 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

Index: ui/aura/demo/demo_main.cc

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

index 689f87dd2367d3011b05524f21fc683b4767dc07..2f2666c2d31913912208478242448fede18c56b4 100644

--- a/ui/aura/demo/demo_main.cc

+++ b/ui/aura/demo/demo_main.cc

@@ -144,8 +144,8 @@ int DemoMain() {

base::PowerMonitor power_monitor(make_scoped_ptr(

new base::PowerMonitorDeviceSource));

- aura::Env::CreateInstance(true);

- aura::Env::GetInstance()->set_context_factory(context_factory.get());

+ scoped_ptr<aura::Env> env = aura::Env::CreateInstance();

+ env->set_context_factory(context_factory.get());

scoped_ptr<aura::TestScreen> test_screen(

aura::TestScreen::Create(gfx::Size()));

gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_NATIVE, test_screen.get());

« no previous file with comments | « ui/aura/bench/bench_main.cc ('k') | ui/aura/env.h » ('j') | no next file with comments »