Revert 236048 "Rename RootWindowHost* to WindowTreeHost*"

trunk/src/ash/shell.cc

 // 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.
 
 #include "ash/shell.h"
 
 #include <algorithm>
 #include <string>
 
 #include "ash/accelerators/accelerator_controller.h"
@@ skipping 743 matching lines @@
   AddPreTargetHandler(env_filter_.get());
 
   views::corewm::FocusController* focus_controller =
       new views::corewm::FocusController(new wm::AshFocusRules);
   focus_client_.reset(focus_controller);
   activation_client_ = focus_controller;
   activation_client_->AddObserver(this);
   focus_cycler_.reset(new internal::FocusCycler());
 
   screen_position_controller_.reset(new internal::ScreenPositionController);
-  root_window_host_factory_.reset(delegate_->CreateWindowTreeHostFactory());
+  root_window_host_factory_.reset(delegate_->CreateRootWindowHostFactory());
 
   display_controller_->Start();
   display_controller_->InitPrimaryDisplay();
   aura::Window* root_window = display_controller_->GetPrimaryRootWindow();
   target_root_window_ = root_window;
 
   resolution_notification_controller_.reset(
       new internal::ResolutionNotificationController);
 
   cursor_manager_.SetDisplay(DisplayController::GetPrimaryDisplay());
@@ skipping 227 matching lines @@
 ////////////////////////////////////////////////////////////////////////////////
 // Shell, aura::client::ActivationChangeObserver implementation:
 
 void Shell::OnWindowActivated(aura::Window* gained_active,
                               aura::Window* lost_active) {
   if (gained_active)
     target_root_window_ = gained_active->GetRootWindow();
 }
 
 }  // namespace ash