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

Unified Diff: ui/aura/env.h

Issue 23882007: Explicit initialization of aura::Env for browser shell. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased no-op Created 7 years, 2 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 c52b892d573587226fec4cd678616c09030df500..337e94fd642f6827d0001309904ba1498d00d0e4 100644
--- a/ui/aura/env.h
+++ b/ui/aura/env.h
@@ -22,7 +22,7 @@ class EnvObserver;
class RootWindow;
class Window;
-#if !defined(USE_X11)
+#if !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(USE_X11)
// Creates a platform-specific native event dispatcher.
base::MessageLoop::Dispatcher* CreateDispatcher();
#endif
@@ -34,6 +34,7 @@ class AURA_EXPORT Env : public ui::EventTarget {
Env();
virtual ~Env();
+ static void CreateInstance();
static Env* GetInstance();
static void DeleteInstance();
@@ -60,7 +61,10 @@ class AURA_EXPORT Env : public ui::EventTarget {
// Returns the native event dispatcher. The result should only be passed to
// base::RunLoop(dispatcher), or used to dispatch an event by
// |Dispatch(const NativeEvent&)| on it. It must never be stored.
+#if !defined(OS_MACOSX) && !defined(OS_ANDROID) && \
+ !defined(USE_GTK_MESSAGE_PUMP)
base::MessageLoop::Dispatcher* GetDispatcher();
+#endif
// Invoked by RootWindow when its host is activated.
void RootWindowActivated(RootWindow* root_window);
@@ -82,7 +86,7 @@ class AURA_EXPORT Env : public ui::EventTarget {
virtual ui::EventTarget* GetParentTarget() OVERRIDE;
ObserverList<EnvObserver> observers_;
-#if !defined(USE_X11)
+#if !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(USE_X11)
scoped_ptr<base::MessageLoop::Dispatcher> dispatcher_;
#endif
« 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