Introdcue AshWindowTreeHost and move ash/chrome specific code in WTH to ash.

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 127 matching lines @@
 class ToplevelWindowEventHandler;
 class TouchObserverHUD;
 class UserActivityDetector;
 class UserWallpaperDelegate;
 class VideoActivityNotifier;
 class VideoDetector;
 class WebNotificationTray;
 class WindowCycleController;
 class WindowPositioner;
 class WindowSelectorController;
-class WindowTreeHostFactory;
 
 namespace shell {
 class WindowWatcher;
 }
 
 namespace test {
 class ShellTestApi;
 }
 
 // Shell is a singleton object that presents the Shell API and implements the
@@ skipping 349 matching lines @@
 
   ResolutionNotificationController* resolution_notification_controller() {
     return resolution_notification_controller_.get();
   }
 
   LogoutConfirmationController* logout_confirmation_controller() {
     return logout_confirmation_controller_.get();
   }
 #endif  // defined(OS_CHROMEOS)
 
-  WindowTreeHostFactory* window_tree_host_factory() {
-    return window_tree_host_factory_.get();
-  }
-
   ShelfModel* shelf_model() {
     return shelf_model_.get();
   }
 
   WindowPositioner* window_positioner() {
     return window_positioner_.get();
   }
 
   // Returns the launcher delegate, creating if necesary.
   ShelfDelegate* GetShelfDelegate();
@@ skipping 113 matching lines @@
   scoped_ptr<VideoDetector> video_detector_;
   scoped_ptr<WindowSelectorController> window_selector_controller_;
   scoped_ptr<FocusCycler> focus_cycler_;
   scoped_ptr<DisplayController> display_controller_;
   scoped_ptr<HighContrastController> high_contrast_controller_;
   scoped_ptr<MagnificationController> magnification_controller_;
   scoped_ptr<PartialMagnificationController> partial_magnification_controller_;
   scoped_ptr<AutoclickController> autoclick_controller_;
   scoped_ptr<aura::client::FocusClient> focus_client_;
   aura::client::ActivationClient* activation_client_;
+
   scoped_ptr<MouseCursorEventFilter> mouse_cursor_filter_;
   scoped_ptr<ScreenPositionController> screen_position_controller_;
   scoped_ptr<SystemModalContainerEventFilter> modality_filter_;
   scoped_ptr<EventClientImpl> event_client_;
   scoped_ptr<EventTransformationHandler> event_transformation_handler_;
-  scoped_ptr<WindowTreeHostFactory> window_tree_host_factory_;
 
   // An event filter that pre-handles key events while the partial
   // screenshot UI or the keyboard overlay is active.
   scoped_ptr<OverlayEventFilter> overlay_filter_;
 
   // An event filter for logging keyboard-related metrics.
   scoped_ptr<KeyboardUMAEventFilter> keyboard_metrics_filter_;
 
   // An event filter which handles moving and resizing windows.
   scoped_ptr<ToplevelWindowEventHandler> toplevel_window_event_handler_;
@@ skipping 68 matching lines @@
 
   // Injected content::GPUDataManager support.
   scoped_ptr<GPUSupport> gpu_support_;
 
   DISALLOW_COPY_AND_ASSIGN(Shell);
 };
 
 }  // namespace ash
 
 #endif  // ASH_SHELL_H_