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

Unified Diff: ui/aura/env.h

Issue 262883011: Makes PlatformEventSource creation in Env conditional (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 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 | « ui/aura/demo/demo_main.cc ('k') | ui/aura/env.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/aura/env.h
diff --git a/ui/aura/env.h b/ui/aura/env.h
index 1d6c19de3fb07a4a15b1cab5fd84e714daa09438..159ac480d096a7c788b14e9167536d38b82a3260 100644
--- a/ui/aura/env.h
+++ b/ui/aura/env.h
@@ -32,7 +32,11 @@ class AURA_EXPORT Env : public ui::EventTarget {
Env();
virtual ~Env();
- static void CreateInstance();
+ // Creates the single Env instance (if it hasn't been created yet). If
+ // |create_event_source| is true a PlatformEventSource is created.
+ // TODO(sky): nuke |create_event_source|. Only necessary while mojo's
+ // nativeviewportservice lives in the same process as the viewmanager.
+ static void CreateInstance(bool create_event_source);
static Env* GetInstance();
static void DeleteInstance();
@@ -63,7 +67,8 @@ class AURA_EXPORT Env : public ui::EventTarget {
friend class Window;
friend class WindowTreeHost;
- void Init();
+ // See description of CreateInstance() for deatils of |create_event_source|.
+ void Init(bool create_event_source);
// Called by the Window when it is initialized. Notifies observers.
void NotifyWindowInitialized(Window* window);
« no previous file with comments | « ui/aura/demo/demo_main.cc ('k') | ui/aura/env.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698