Make aura_demo work on Mac

ui/aura/env.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef UI_AURA_ENV_H_
 #define UI_AURA_ENV_H_
 
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/observer_list.h"
@@ skipping 10 matching lines @@
 
 namespace test {
 class EnvTestHelper;
 }
 
 class EnvObserver;
 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
 
 // A singleton object that tracks general state within Aura.
 // TODO(beng): manage RootWindows.
 class AURA_EXPORT Env : public ui::EventTarget {
  public:
   Env();
   virtual ~Env();
@@ skipping 19 matching lines @@
     last_mouse_location_ = last_mouse_location;
   }
 
   // Whether any touch device is currently down.
   bool is_touch_down() const { return is_touch_down_; }
   void set_touch_down(bool value) { is_touch_down_ = value; }
 
   // 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
 
   // Invoked by RootWindow when its host is activated.
   void RootWindowActivated(RootWindow* root_window);
 
  private:
   friend class test::EnvTestHelper;
   friend class Window;
   friend class RootWindowHost;
 
   void Init();
 
   // Called by the Window when it is initialized. Notifies observers.
   void NotifyWindowInitialized(Window* window);
 
   // Called by the RootWindow when it is initialized. Notifies observers.
   void NotifyRootWindowInitialized(RootWindow* root_window);
 
   // Overridden from ui::EventTarget:
   virtual bool CanAcceptEvent(const ui::Event& event) OVERRIDE;
   virtual ui::EventTarget* GetParentTarget() OVERRIDE;
   virtual scoped_ptr<ui::EventTargetIterator> GetChildIterator() const OVERRIDE;
   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
 
   static Env* instance_;
   int mouse_button_flags_;
   // Location of last mouse event, in screen coordinates.
   gfx::Point last_mouse_location_;
   bool is_touch_down_;
 
 #if defined(USE_X11)
   DeviceListUpdaterAuraX11 device_list_updater_aurax11_;
 #endif
 
   scoped_ptr<InputStateLookup> input_state_lookup_;
 
   DISALLOW_COPY_AND_ASSIGN(Env);
 };
 
 }  // namespace aura
 
 #endif  // UI_AURA_ENV_H_