Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / ash / display / mirror_window_controller.h

diff --git a/src/ash/display/mirror_window_controller.h b/src/ash/display/mirror_window_controller.h
index c70e9d8..beb703a 100644 (file)
--- a/src/ash/display/mirror_window_controller.h
+++ b/src/ash/display/mirror_window_controller.h
@@ -9,15 +9,11 @@
 #include "base/compiler_specific.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
-#include "ui/aura/window_tree_host.h"
 #include "ui/aura/window_tree_host_observer.h"
-#include "ui/gfx/display.h"
 #include "ui/gfx/native_widget_types.h"
-#include "ui/gfx/point.h"
 #include "ui/gfx/size.h"
 
 namespace aura {
-class RootWindowTransformer;
 class Window;
 }
 
@@ -26,13 +22,14 @@ class Reflector;
 }
 
 namespace ash {
+class AshWindowTreeHost;
+class DisplayInfo;
+class RootWindowTransformer;
+
 namespace test{
 class MirrorWindowTestApi;
 }
 
-namespace internal {
-class DisplayInfo;
-
 // An object that copies the content of the primary root window to a
 // mirror window. This also draws a mouse cursor as the mouse cursor
 // is typically drawn by the window system.
@@ -55,23 +52,24 @@ class ASH_EXPORT MirrorWindowController : public aura::WindowTreeHostObserver {
   // aura::WindowTreeHostObserver overrides:
   virtual void OnHostResized(const aura::WindowTreeHost* host) OVERRIDE;
 
-  aura::WindowTreeHost* host() const { return host_.get(); }
+  // Return the root window used to mirror the content. NULL if the
+  // display is not mirrored by the compositor path.
+  aura::Window* GetWindow();
 
  private:
   friend class test::MirrorWindowTestApi;
 
   // Creates a RootWindowTransformer for current display
   // configuration.
-  scoped_ptr<aura::RootWindowTransformer> CreateRootWindowTransformer() const;
+  scoped_ptr<RootWindowTransformer> CreateRootWindowTransformer() const;
 
-  scoped_ptr<aura::WindowTreeHost> host_;
+  scoped_ptr<AshWindowTreeHost> ash_host_;
   gfx::Size mirror_window_host_size_;
   scoped_refptr<ui::Reflector> reflector_;
 
   DISALLOW_COPY_AND_ASSIGN(MirrorWindowController);
 };
 
-}  // namespace internal
 }  // namespace ash
 
 #endif  // ASH_DISPLAY_MIRROR_WINDOW_CONTROLLER_H_