summaryrefslogtreecommitdiffstats
path: root/ash/shell.h
diff options
context:
space:
mode:
authorben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-01-08 16:41:23 +0000
committerben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-01-08 16:41:23 +0000
commit641dcfd54a64f53c356f10373d7ee70d3342cae8 (patch)
tree98a90fe540025e96a5e155567d3da1dfab34361a /ash/shell.h
parent6a617b58c1229bb0dce0727dc8a97f20df973baf (diff)
downloadchromium_src-641dcfd54a64f53c356f10373d7ee70d3342cae8.zip
chromium_src-641dcfd54a64f53c356f10373d7ee70d3342cae8.tar.gz
chromium_src-641dcfd54a64f53c356f10373d7ee70d3342cae8.tar.bz2
Rename RootWindowHost to WindowTreeHost
TBR=sky@chromium.org http://crbug.com/308843 Review URL: https://codereview.chromium.org/126513004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@243578 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/shell.h')
-rw-r--r--ash/shell.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/ash/shell.h b/ash/shell.h
index 0b77ad8..e5dd42a 100644
--- a/ash/shell.h
+++ b/ash/shell.h
@@ -92,7 +92,7 @@ class NestedDispatcherController;
class NewWindowDelegate;
class PartialMagnificationController;
class PowerButtonController;
-class RootWindowHostFactory;
+class WindowTreeHostFactory;
class ScreenAsh;
class SessionStateDelegate;
class Shelf;
@@ -499,7 +499,7 @@ class ASH_EXPORT Shell
return resolution_notification_controller_.get();
}
- RootWindowHostFactory* root_window_host_factory() {
+ WindowTreeHostFactory* root_window_host_factory() {
return root_window_host_factory_.get();
}
@@ -643,7 +643,7 @@ class ASH_EXPORT Shell
scoped_ptr<internal::EventClientImpl> event_client_;
scoped_ptr<internal::EventTransformationHandler>
event_transformation_handler_;
- scoped_ptr<RootWindowHostFactory> root_window_host_factory_;
+ scoped_ptr<WindowTreeHostFactory> root_window_host_factory_;
// An event filter that rewrites or drops an event.
scoped_ptr<internal::EventRewriterEventFilter> event_rewriter_filter_;