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

Unified Diff: trunk/src/ui/aura/root_window.cc

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/root_window.h ('k') | trunk/src/ui/aura/root_window_host_ozone.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: trunk/src/ui/aura/root_window.cc
===================================================================
--- trunk/src/ui/aura/root_window.cc (revision 236091)
+++ trunk/src/ui/aura/root_window.cc (working copy)
@@ -69,10 +69,10 @@
}
}
-WindowTreeHost* CreateHost(RootWindow* root_window,
+RootWindowHost* CreateHost(RootWindow* root_window,
const RootWindow::CreateParams& params) {
- WindowTreeHost* host = params.host ?
- params.host : WindowTreeHost::Create(params.initial_bounds);
+ RootWindowHost* host = params.host ?
+ params.host : RootWindowHost::Create(params.initial_bounds);
host->set_delegate(root_window);
return host;
}
@@ -169,7 +169,7 @@
}
}
-WindowTreeHostDelegate* RootWindow::AsWindowTreeHostDelegate() {
+RootWindowHostDelegate* RootWindow::AsRootWindowHostDelegate() {
return this;
}
@@ -321,9 +321,9 @@
OnKeyboardMappingChanged(this));
}
-void RootWindow::OnWindowTreeHostCloseRequested() {
+void RootWindow::OnRootWindowHostCloseRequested() {
FOR_EACH_OBSERVER(RootWindowObserver, observers_,
- OnWindowTreeHostCloseRequested(this));
+ OnRootWindowHostCloseRequested(this));
}
void RootWindow::AddRootWindowObserver(RootWindowObserver* observer) {
@@ -589,7 +589,7 @@
}
////////////////////////////////////////////////////////////////////////////////
-// RootWindow, WindowTreeHostDelegate implementation:
+// RootWindow, RootWindowHostDelegate implementation:
bool RootWindow::OnHostKeyEvent(ui::KeyEvent* event) {
DispatchDetails details = DispatchHeldEvents();
@@ -696,7 +696,7 @@
"origin", origin.ToString());
FOR_EACH_OBSERVER(RootWindowObserver, observers_,
- OnWindowTreeHostMoved(this, origin));
+ OnRootWindowHostMoved(this, origin));
}
void RootWindow::OnHostResized(const gfx::Size& size) {
@@ -708,7 +708,7 @@
return;
FOR_EACH_OBSERVER(RootWindowObserver, observers_,
- OnWindowTreeHostResized(this));
+ OnRootWindowHostResized(this));
}
RootWindow* RootWindow::AsRootWindow() {
« no previous file with comments | « trunk/src/ui/aura/root_window.h ('k') | trunk/src/ui/aura/root_window_host_ozone.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698