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..6e643634e41e3ba3cbac5e67f20023d3d08c9be0 100644
--- a/ui/aura/env.h
+++ b/ui/aura/env.h
@@ -28,10 +28,8 @@ class InputStateLookup;
 class RootWindow;
 class Window;
 
-#if !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(USE_X11)
 // Creates a platform-specific native event dispatcher.
 base::MessageLoop::Dispatcher* CreateDispatcher();
-#endif
 
 // A singleton object that tracks general state within Aura.
 // TODO(beng): manage RootWindows.
@@ -68,10 +66,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)
   base::MessageLoop::Dispatcher* GetDispatcher();
-#endif
 
   // Invoked by RootWindow when its host is activated.
   void RootWindowActivated(RootWindow* root_window);
@@ -96,9 +91,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)
   scoped_ptr<base::MessageLoop::Dispatcher> dispatcher_;
-#endif
 
   static Env* instance_;
   int mouse_button_flags_;