ui/views/examples/examples_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/views/examples/examples_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/views/examples/examples_main.cc

diff --git a/ui/views/examples/examples_main.cc b/ui/views/examples/examples_main.cc

index 1802d0efee55621993dd6e606ce9298d9d4ef8aa..21508922381d3e2c849e41e4227c2a38fc22ce56 100644

--- a/ui/views/examples/examples_main.cc

+++ b/ui/views/examples/examples_main.cc

@@ -80,7 +80,7 @@ int main(int argc, char** argv) {

#endif

#if defined(USE_AURA)

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

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

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

#endif

ui::InitializeInputMethodForTesting();

@@ -109,7 +109,7 @@ int main(int argc, char** argv) {

ui::ShutdownInputMethod();

#if defined(USE_AURA)

- aura::Env::DeleteInstance();

+ env.reset();

#endif

return 0;

« no previous file with comments | « ui/aura/test/run_all_unittests.cc ('k') | ui/views/run_all_unittests.cc » ('j') | no next file with comments »