Revert 236048 "Rename RootWindowHost* to WindowTreeHost*"

trunk/src/ash/shell.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef ASH_SHELL_H_
 #define ASH_SHELL_H_
 
 #include <utility>
 #include <vector>
 
@@ skipping 78 matching lines @@
 class LauncherItemDelegate;
 class LauncherItemDelegateManager;
 class LockStateController;
 class MagnificationController;
 class MediaDelegate;
 class MruWindowTracker;
 class NestedDispatcherController;
 class NewWindowDelegate;
 class PartialMagnificationController;
 class PowerButtonController;
-class WindowTreeHostFactory;
+class RootWindowHostFactory;
 class ScreenAsh;
 class SessionStateDelegate;
 class ShelfModel;
 class ShellDelegate;
 class ShellObserver;
 class StickyKeys;
 class SystemTray;
 class SystemTrayDelegate;
 class SystemTrayNotifier;
 class UserActivityDetector;
@@ skipping 382 matching lines @@
   internal::DisplayErrorObserver* display_error_observer() {
     return display_error_observer_.get();
   }
 #endif  // defined(OS_CHROMEOS) && defined(USE_X11)
 
   internal::ResolutionNotificationController*
       resolution_notification_controller() {
     return resolution_notification_controller_.get();
   }
 
-  WindowTreeHostFactory* root_window_host_factory() {
+  RootWindowHostFactory* root_window_host_factory() {
     return root_window_host_factory_.get();
   }
 
   ShelfModel* shelf_model() {
     return shelf_model_.get();
   }
 
   WindowPositioner* window_positioner() {
     return window_positioner_.get();
   }
@@ skipping 116 matching lines @@
   scoped_ptr<AutoclickController> autoclick_controller_;
   scoped_ptr<aura::client::FocusClient> focus_client_;
   scoped_ptr<aura::client::UserActionClient> user_action_client_;
   aura::client::ActivationClient* activation_client_;
   scoped_ptr<internal::MouseCursorEventFilter> mouse_cursor_filter_;
   scoped_ptr<internal::ScreenPositionController> screen_position_controller_;
   scoped_ptr<internal::SystemModalContainerEventFilter> modality_filter_;
   scoped_ptr<internal::EventClientImpl> event_client_;
   scoped_ptr<internal::EventTransformationHandler>
       event_transformation_handler_;
-  scoped_ptr<WindowTreeHostFactory> root_window_host_factory_;
+  scoped_ptr<RootWindowHostFactory> root_window_host_factory_;
 
   // An event filter that rewrites or drops an event.
   scoped_ptr<internal::EventRewriterEventFilter> event_rewriter_filter_;
 
   // An event filter that pre-handles key events while the partial
   // screenshot UI or the keyboard overlay is active.
   scoped_ptr<internal::OverlayEventFilter> overlay_filter_;
 
   // An event filter for logging keyboard-related metrics.
   scoped_ptr<internal::KeyboardUMAEventFilter> keyboard_metrics_filter_;
@@ skipping 45 matching lines @@
   bool simulate_modal_window_open_for_testing_;
 
   bool is_touch_hud_projection_enabled_;
 
   DISALLOW_COPY_AND_ASSIGN(Shell);
 };
 
 }  // namespace ash
 
 #endif  // ASH_SHELL_H_