Index: trunk/src/ui/aura/window_tree_host.h |
=================================================================== |
--- trunk/src/ui/aura/window_tree_host.h (revision 236091) |
+++ trunk/src/ui/aura/window_tree_host.h (working copy) |
@@ -27,18 +27,18 @@ |
namespace aura { |
class RootWindow; |
-class WindowTreeHostDelegate; |
+class RootWindowHostDelegate; |
class RootWindowTransformer; |
-// WindowTreeHost bridges between a native window and the embedded RootWindow. |
+// RootWindowHost bridges between a native window and the embedded RootWindow. |
// It provides the accelerated widget and maps events from the native os to |
// aura. |
-class AURA_EXPORT WindowTreeHost { |
+class AURA_EXPORT RootWindowHost { |
public: |
- virtual ~WindowTreeHost(); |
+ virtual ~RootWindowHost(); |
- // Creates a new WindowTreeHost. The caller owns the returned value. |
- static WindowTreeHost* Create(const gfx::Rect& bounds); |
+ // Creates a new RootWindowHost. The caller owns the returned value. |
+ static RootWindowHost* Create(const gfx::Rect& bounds); |
void InitHost(); |
@@ -63,7 +63,7 @@ |
// (gfx::Screen only reports on the virtual desktop exposed by Aura.) |
static gfx::Size GetNativeScreenSize(); |
- void set_delegate(WindowTreeHostDelegate* delegate) { |
+ void set_delegate(RootWindowHostDelegate* delegate) { |
delegate_ = delegate; |
} |
@@ -87,16 +87,16 @@ |
// Returns the accelerated widget. |
virtual gfx::AcceleratedWidget GetAcceleratedWidget() = 0; |
- // Shows the WindowTreeHost. |
+ // Shows the RootWindowHost. |
virtual void Show() = 0; |
- // Hides the WindowTreeHost. |
+ // Hides the RootWindowHost. |
virtual void Hide() = 0; |
// Toggles the host's full screen state. |
virtual void ToggleFullScreen() = 0; |
- // Gets/Sets the size of the WindowTreeHost. |
+ // Gets/Sets the size of the RootWindowHost. |
virtual gfx::Rect GetBounds() const = 0; |
virtual void SetBounds(const gfx::Rect& bounds) = 0; |
@@ -148,7 +148,7 @@ |
protected: |
friend class TestScreen; // TODO(beng): see if we can remove/consolidate. |
- WindowTreeHost(); |
+ RootWindowHost(); |
void CreateCompositor(gfx::AcceleratedWidget accelerated_widget); |
@@ -157,14 +157,14 @@ |
void NotifyHostResized(const gfx::Size& new_size); |
- WindowTreeHostDelegate* delegate_; |
+ RootWindowHostDelegate* delegate_; |
private: |
scoped_ptr<ui::Compositor> compositor_; |
scoped_ptr<RootWindowTransformer> transformer_; |
- DISALLOW_COPY_AND_ASSIGN(WindowTreeHost); |
+ DISALLOW_COPY_AND_ASSIGN(RootWindowHost); |
}; |
} // namespace aura |