Make aura_demo work on Mac

ui/aura/root_window_host_mac.h

-// Copyright 2013 The Chromium Authors. All rights reserved.
+// 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_ROOT_WINDOW_HOST_OZONE_H_
-#define UI_AURA_ROOT_WINDOW_HOST_OZONE_H_
+#ifndef UI_AURA_ROOT_WINDOW_HOST_MAC_H_
+#define UI_AURA_ROOT_WINDOW_HOST_MAC_H_
 
 #include <vector>
 
-#include "base/memory/scoped_ptr.h"
-#include "base/message_loop/message_loop.h"
+#include "base/mac/scoped_nsobject.h"
+#include "ui/aura/aura_export.h"
 #include "ui/aura/window_tree_host.h"
 #include "ui/gfx/insets.h"
 #include "ui/gfx/rect.h"
 
+namespace ui {
+class MouseEvent;
+}
+
 namespace aura {
 
-class RootWindowHostOzone : public RootWindowHost,
-                            public base::MessageLoop::Dispatcher {
+namespace internal {
+class TouchEventCalibrate;
+}
+
+class AURA_EXPORT RootWindowHostMac : public RootWindowHost {
  public:
-  explicit RootWindowHostOzone(const gfx::Rect& bounds);
-  virtual ~RootWindowHostOzone();
-
- private:
-  // Overridden from Dispatcher overrides:
-  virtual bool Dispatch(const base::NativeEvent& event) OVERRIDE;
+  explicit RootWindowHostMac(const gfx::Rect& bounds);
+  virtual ~RootWindowHostMac();
 
   // RootWindowHost Overrides.
   virtual RootWindow* GetRootWindow() OVERRIDE;
   virtual gfx::AcceleratedWidget GetAcceleratedWidget() OVERRIDE;
   virtual void Show() OVERRIDE;
   virtual void Hide() OVERRIDE;
   virtual void ToggleFullScreen() OVERRIDE;
   virtual gfx::Rect GetBounds() const OVERRIDE;
   virtual void SetBounds(const gfx::Rect& bounds) OVERRIDE;
   virtual gfx::Insets GetInsets() const OVERRIDE;
-  virtual void SetInsets(const gfx::Insets& bounds) OVERRIDE;
+  virtual void SetInsets(const gfx::Insets& insets) OVERRIDE;
   virtual gfx::Point GetLocationOnNativeScreen() const OVERRIDE;
   virtual void SetCapture() OVERRIDE;
   virtual void ReleaseCapture() OVERRIDE;
   virtual void SetCursor(gfx::NativeCursor cursor_type) OVERRIDE;
   virtual bool QueryMouseLocation(gfx::Point* location_return) OVERRIDE;
   virtual bool ConfineCursorToRootWindow() OVERRIDE;
   virtual void UnConfineCursor() OVERRIDE;
   virtual void OnCursorVisibilityChanged(bool show) OVERRIDE;
   virtual void MoveCursorTo(const gfx::Point& location) OVERRIDE;
   virtual void PostNativeEvent(const base::NativeEvent& event) OVERRIDE;
   virtual void OnDeviceScaleFactorChanged(float device_scale_factor) OVERRIDE;
   virtual void PrepareForShutdown() OVERRIDE;
 
-  gfx::AcceleratedWidget widget_;
-  gfx::Rect bounds_;
+ private:
+  base::scoped_nsobject<NSWindow> window_;
 
-  DISALLOW_COPY_AND_ASSIGN(RootWindowHostOzone);
+  DISALLOW_COPY_AND_ASSIGN(RootWindowHostMac);
 };
 
 }  // namespace aura
 
-#endif  // UI_AURA_ROOT_WINDOW_HOST_OZONE_H_
+#endif  // UI_AURA_ROOT_WINDOW_HOST_MAC_H_