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

Unified Diff: ui/aura/env.cc

Issue 2563783002: ui + mus: Split ContextFactory into ContextFactory(Client) and ContextFactoryPrivate (Closed)
Patch Set: Restore mash Created 4 years 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 | « ui/aura/env.h ('k') | ui/aura/mus/mus_context_factory.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/aura/env.cc
diff --git a/ui/aura/env.cc b/ui/aura/env.cc
index d4b5cdfe43d0d7914753efd2975cba71acaa66db..5e9411332e3aacd7299bd6c5c1a08fc6c58e8fce 100644
--- a/ui/aura/env.cc
+++ b/ui/aura/env.cc
@@ -156,7 +156,8 @@ Env::Env(Mode mode)
mouse_button_flags_(0),
is_touch_down_(false),
input_state_lookup_(InputStateLookup::Create()),
- context_factory_(NULL) {
+ context_factory_(nullptr),
+ context_factory_private_(nullptr) {
DCHECK(lazy_tls_ptr.Pointer()->Get() == NULL);
lazy_tls_ptr.Pointer()->Set(this);
}
« no previous file with comments | « ui/aura/env.h ('k') | ui/aura/mus/mus_context_factory.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698