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

Unified Diff: ui/aura/env.cc

Issue 2916823002: Move Mus into chrome's process when running with --mus.
Patch Set: Addressing most feedback, making this work on device. Created 3 years, 6 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/env.cc
diff --git a/ui/aura/env.cc b/ui/aura/env.cc
index 0f412fb66ebad12b2c97023f4a5fd08c138670d8..67bc1d7bd33511896e5e3cecbdfcf9103459d317 100644
--- a/ui/aura/env.cc
+++ b/ui/aura/env.cc
@@ -61,6 +61,7 @@ Env::~Env() {
// static
std::unique_ptr<Env> Env::CreateInstance(Mode mode) {
+ LOG(ERROR) << "Env::CreateInstance";
DCHECK(!lazy_tls_ptr.Pointer()->Get());
std::unique_ptr<Env> env(new Env(mode));
env->Init();
@@ -70,8 +71,13 @@ std::unique_ptr<Env> Env::CreateInstance(Mode mode) {
// static
Env* Env::GetInstance() {
Env* env = lazy_tls_ptr.Pointer()->Get();
- DCHECK(env) << "Env::CreateInstance must be called before getting the "
- "instance of Env.";
+// DCHECK(env) << "~~Env::CreateInstance must be called before getting the "
+// "instance of Env.";
+ if (!env) {
+ LOG(ERROR) << "~~Env::CreateInstance must be called before getting the "
+ "instance of Env.";
+ base::debug::StackTrace().Print();
+ }
return env;
}

Powered by Google App Engine
This is Rietveld 408576698