Index: ash/display/mirror_window_controller.h |
diff --git a/ash/display/mirror_window_controller.h b/ash/display/mirror_window_controller.h |
index 89b2b61c036255024925bf88fda0dfa20fb79f18..beb703ad577e29b6d69bf5f5aa5100350660fce8 100644 |
--- a/ash/display/mirror_window_controller.h |
+++ b/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,7 +22,9 @@ class Reflector; |
} |
namespace ash { |
+class AshWindowTreeHost; |
class DisplayInfo; |
+class RootWindowTransformer; |
namespace test{ |
class MirrorWindowTestApi; |
@@ -54,16 +52,18 @@ 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_; |