Make aura_demo work on Mac

ui/aura/env.h

Index: ui/aura/env.h
diff --git a/ui/aura/env.h b/ui/aura/env.h
index 4d3a477bdb74207d11a18d740a51cedd932a1970..77568264312d45036995e7fc1c8ec7e0f560c372 100644
--- a/ui/aura/env.h
+++ b/ui/aura/env.h
@@ -28,7 +28,7 @@ class InputStateLookup;
 class RootWindow;
 class Window;
 
-#if !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(USE_X11)
+#if defined(USE_AURA)

[sadrul, 2014/01/06 17:40:09]

Do you actually need this ifdef anymore? (also in env.cc)

[ccameron, 2014/01/06 19:05:15]

Good point -- no, it's not needed (I'd been thinking not to break the GTK build
yet, but the GTK build doesn't touch these files).

 // Creates a platform-specific native event dispatcher.
 base::MessageLoop::Dispatcher* CreateDispatcher();
 #endif
@@ -68,8 +68,7 @@ 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)
+#if defined(USE_AURA)
   base::MessageLoop::Dispatcher* GetDispatcher();
 #endif
 
@@ -96,7 +95,7 @@ class AURA_EXPORT Env : public ui::EventTarget {
   virtual ui::EventTargeter* GetEventTargeter() OVERRIDE;
 
   ObserverList<EnvObserver> observers_;
-#if !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(USE_X11)
+#if defined(USE_AURA)
   scoped_ptr<base::MessageLoop::Dispatcher> dispatcher_;
 #endif