Explicit initialization of aura::Env for browser shell.

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"
 #include "ui/aura/aura_export.h"
 #include "ui/events/event_handler.h"
 #include "ui/events/event_target.h"
 #include "ui/gfx/point.h"
 
 #if defined(USE_X11)
 #include "ui/aura/device_list_updater_aurax11.h"
 #endif
 
 namespace aura {
 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
 
 // A singleton object that tracks general state within Aura.
 // TODO(beng): manage RootWindows.
 class AURA_EXPORT Env : public ui::EventTarget {
  public:
   Env();
   virtual ~Env();
 
+  static void CreateInstance();
   static Env* GetInstance();
   static void DeleteInstance();
 
   void AddObserver(EnvObserver* observer);
   void RemoveObserver(EnvObserver* observer);
 
   bool is_mouse_button_down() const { return mouse_button_flags_ != 0; }
   void set_mouse_button_flags(int mouse_button_flags) {
     mouse_button_flags_ = mouse_button_flags;
   }
 
   // Gets/sets the last mouse location seen in a mouse event in the screen
   // coordinates.
   const gfx::Point& last_mouse_location() const { return last_mouse_location_; }
   void set_last_mouse_location(const gfx::Point& last_mouse_location) {
     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)
   base::MessageLoop::Dispatcher* GetDispatcher();
+#endif
 
   // Invoked by RootWindow when its host is activated.
   void RootWindowActivated(RootWindow* root_window);
 
  private:
   friend class Window;
   friend class RootWindow;
 
   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;
 
   ObserverList<EnvObserver> observers_;
-#if !defined(USE_X11)
+#if !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(USE_X11)
   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
 
   DISALLOW_COPY_AND_ASSIGN(Env);
 };
 
 }  // namespace aura
 
 #endif  // UI_AURA_ENV_H_