run aura_demo as a mojo app

mojo/examples/aura_demo/demo_screen.h

Index: mojo/examples/aura_demo/demo_screen.h
diff --git a/ui/gfx/screen_win.h b/mojo/examples/aura_demo/demo_screen.h
similarity index 51%
copy from ui/gfx/screen_win.h
copy to mojo/examples/aura_demo/demo_screen.h
index 7b1ea4c7bcc6021ae0f00e9a29b529cc4545ed03..43db5f4197077924274d5be65adf3d4ac680c99d 100644
--- a/ui/gfx/screen_win.h
+++ b/mojo/examples/aura_demo/demo_screen.h
@@ -1,23 +1,30 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright (c) 2014 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_GFX_SCREEN_WIN_H_
-#define UI_GFX_SCREEN_WIN_H_
+#ifndef MOJO_EXAMPLES_AURA_DEMO_DEMO_SCREEN_H_
+#define MOJO_EXAMPLES_AURA_DEMO_DEMO_SCREEN_H_
 
 #include "base/compiler_specific.h"
-#include "ui/gfx/gfx_export.h"
+#include "ui/gfx/display.h"
 #include "ui/gfx/screen.h"
 
 namespace gfx {
+class Rect;
+class Transform;
+}
 
-class GFX_EXPORT ScreenWin : public gfx::Screen {
+namespace mojo {
+namespace examples {
+
+// A minimal, testing Aura implementation of gfx::Screen.
+class DemoScreen : public gfx::Screen {
  public:
-  ScreenWin();
-  virtual ~ScreenWin();
+  static DemoScreen* Create();
+  virtual ~DemoScreen();
 
  protected:
-  // Overridden from gfx::Screen:
+  // gfx::Screen overrides:
   virtual bool IsDIPEnabled() OVERRIDE;
   virtual gfx::Point GetCursorScreenPoint() OVERRIDE;
   virtual gfx::NativeWindow GetWindowUnderCursor() OVERRIDE;
@@ -26,25 +33,24 @@ class GFX_EXPORT ScreenWin : public gfx::Screen {
   virtual int GetNumDisplays() const OVERRIDE;
   virtual std::vector<gfx::Display> GetAllDisplays() const OVERRIDE;
   virtual gfx::Display GetDisplayNearestWindow(
-      gfx::NativeView window) const OVERRIDE;
+      gfx::NativeView view) const OVERRIDE;
   virtual gfx::Display GetDisplayNearestPoint(
       const gfx::Point& point) const OVERRIDE;
   virtual gfx::Display GetDisplayMatching(
       const gfx::Rect& match_rect) const OVERRIDE;
   virtual gfx::Display GetPrimaryDisplay() const OVERRIDE;
-  virtual void AddObserver(DisplayObserver* observer) OVERRIDE;
-  virtual void RemoveObserver(DisplayObserver* observer) OVERRIDE;
+  virtual void AddObserver(gfx::DisplayObserver* observer) OVERRIDE;
+  virtual void RemoveObserver(gfx::DisplayObserver* observer) OVERRIDE;
 
-  // Returns the HWND associated with the NativeView.
-  virtual HWND GetHWNDFromNativeView(NativeView window) const;
+ private:
+  explicit DemoScreen(const gfx::Rect& screen_bounds);
 
-  // Returns the NativeView associated with the HWND.
-  virtual NativeWindow GetNativeWindowFromHWND(HWND hwnd) const;
+  gfx::Display display_;
 
- private:
-  DISALLOW_COPY_AND_ASSIGN(ScreenWin);
+  DISALLOW_COPY_AND_ASSIGN(DemoScreen);
 };
 
-}  // namespace gfx
+}  // namespace examples
+}  // namespace mojo
 
-#endif  // UI_GFX_SCREEN_WIN_H_
+#endif  // MOJO_EXAMPLES_AURA_DEMO_DEMO_SCREEN_H_