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

Unified Diff: ui/aura/root_window.cc

Issue 126513004: Rename RootWindowHost to WindowTreeHost (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 6 years, 11 months 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 | « ui/aura/root_window.h ('k') | ui/aura/root_window_host_mac.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/aura/root_window.cc
diff --git a/ui/aura/root_window.cc b/ui/aura/root_window.cc
index 5601b8949606b9c27b8d4f6b011d891aa93257bb..01f62c704cf36a9ef2dad63ddffb65fd21fa39ed 100644
--- a/ui/aura/root_window.cc
+++ b/ui/aura/root_window.cc
@@ -70,10 +70,10 @@ void SetLastMouseLocation(const Window* root_window,
}
}
-RootWindowHost* CreateHost(RootWindow* root_window,
+WindowTreeHost* CreateHost(RootWindow* root_window,
const RootWindow::CreateParams& params) {
- RootWindowHost* host = params.host ?
- params.host : RootWindowHost::Create(params.initial_bounds);
+ WindowTreeHost* host = params.host ?
+ params.host : WindowTreeHost::Create(params.initial_bounds);
host->set_delegate(root_window);
return host;
}
@@ -190,7 +190,7 @@ void RootWindow::RepostEvent(const ui::LocatedEvent& event) {
}
}
-RootWindowHostDelegate* RootWindow::AsRootWindowHostDelegate() {
+WindowTreeHostDelegate* RootWindow::AsWindowTreeHostDelegate() {
return this;
}
@@ -348,9 +348,9 @@ void RootWindow::OnKeyboardMappingChanged() {
OnKeyboardMappingChanged(this));
}
-void RootWindow::OnRootWindowHostCloseRequested() {
+void RootWindow::OnWindowTreeHostCloseRequested() {
FOR_EACH_OBSERVER(RootWindowObserver, observers_,
- OnRootWindowHostCloseRequested(this));
+ OnWindowTreeHostCloseRequested(this));
}
void RootWindow::AddRootWindowObserver(RootWindowObserver* observer) {
@@ -671,7 +671,7 @@ void RootWindow::OnLayerAnimationAborted(
}
////////////////////////////////////////////////////////////////////////////////
-// RootWindow, RootWindowHostDelegate implementation:
+// RootWindow, WindowTreeHostDelegate implementation:
bool RootWindow::OnHostKeyEvent(ui::KeyEvent* event) {
DispatchDetails details = OnEventFromSource(event);
@@ -728,7 +728,7 @@ void RootWindow::OnHostMoved(const gfx::Point& origin) {
"origin", origin.ToString());
FOR_EACH_OBSERVER(RootWindowObserver, observers_,
- OnRootWindowHostMoved(this, origin));
+ OnWindowTreeHostMoved(this, origin));
}
void RootWindow::OnHostResized(const gfx::Size& size) {
@@ -739,7 +739,7 @@ void RootWindow::OnHostResized(const gfx::Size& size) {
if (details.dispatcher_destroyed)
return;
FOR_EACH_OBSERVER(RootWindowObserver, observers_,
- OnRootWindowHostResized(this));
+ OnWindowTreeHostResized(this));
}
RootWindow* RootWindow::AsRootWindow() {
« no previous file with comments | « ui/aura/root_window.h ('k') | ui/aura/root_window_host_mac.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698