Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(276)

Unified Diff: trunk/src/ui/aura/window_tree_host.h

Issue 77203002: Revert 236048 "Rename RootWindowHost* to WindowTreeHost*" (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « trunk/src/ui/aura/test/test_screen.cc ('k') | trunk/src/ui/aura/window_tree_host.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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
« no previous file with comments | « trunk/src/ui/aura/test/test_screen.cc ('k') | trunk/src/ui/aura/window_tree_host.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698