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

Unified Diff: content/browser/browser_main_loop.cc

Issue 1871253002: aura: Require explicit ownership of the Env instance. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: tot.merge Created 4 years, 8 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 | « content/browser/browser_main_loop.h ('k') | content/public/test/unittest_test_suite.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/browser_main_loop.cc
diff --git a/content/browser/browser_main_loop.cc b/content/browser/browser_main_loop.cc
index 2effbd75c8ca0bd35d80f9c7818a447a80a9d1a2..65e88aced2e3117ad82bb6682e2fccfdfa859280 100644
--- a/content/browser/browser_main_loop.cc
+++ b/content/browser/browser_main_loop.cc
@@ -982,7 +982,7 @@ void BrowserMainLoop::ShutdownThreadsAndCleanUp() {
}
#if defined(USE_AURA)
- aura::Env::DeleteInstance();
+ env_.reset();
#endif
system_stats_monitor_.reset();
@@ -1366,7 +1366,7 @@ bool BrowserMainLoop::InitializeToolkit() {
// Env creates the compositor. Aura widgets need the compositor to be created
// before they can be initialized by the browser.
- aura::Env::CreateInstance(true);
+ env_ = aura::Env::CreateInstance();
#endif // defined(USE_AURA)
if (parts_)
« no previous file with comments | « content/browser/browser_main_loop.h ('k') | content/public/test/unittest_test_suite.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698