Revert of chromeos: Makes mushrome use simplified display management

ash/display/window_tree_host_manager.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/display/window_tree_host_manager.h"
 
 #include <algorithm>
 #include <cmath>
 #include <map>
 #include <memory>
@@ skipping 506 matching lines @@
   // that it is on has changed. This occurs when swapping the primary display.
   if (target_location_in_native !=
           cursor_location_in_native_coords_for_restore_ ||
       target_display_id != cursor_display_id_for_restore_) {
     dst_root_window->MoveCursorTo(target_location_in_root);
   } else if (target_location_in_screen !=
              cursor_location_in_screen_coords_for_restore_) {
     // The cursor's native position did not change but its screen position did
     // change. This occurs when the scale factor or the rotation of the display
     // that the cursor is on changes.
-    // TODO: conditional should not be necessary. http://crbug.com/631103.
-    if (Shell::Get()->cursor_manager())
-      Shell::Get()->cursor_manager()->SetDisplay(target_display);
+    Shell::Get()->cursor_manager()->SetDisplay(target_display);
 
     // Update the cursor's root location. This ends up dispatching a synthetic
     // mouse move. The synthetic mouse move updates the composited cursor's
     // location and hover effects. Synthetic mouse moves do not affect the
     // cursor's visibility.
     dst_root_window->GetHost()->dispatcher()->OnCursorMovedToRootLocation(
         target_location_in_root);
   }
 #else
   dst_root_window->MoveCursorTo(target_location_in_root);
@@ skipping 268 matching lines @@
 AshWindowTreeHost* WindowTreeHostManager::AddWindowTreeHostForDisplay(
     const display::Display& display,
     const AshWindowTreeHostInitParams& init_params) {
   static int host_count = 0;
   const display::ManagedDisplayInfo& display_info =
       GetDisplayManager()->GetDisplayInfo(display.id());
   AshWindowTreeHostInitParams params_with_bounds(init_params);
   params_with_bounds.initial_bounds = display_info.bounds_in_native();
   params_with_bounds.offscreen =
       display.id() == display::DisplayManager::kUnifiedDisplayId;
-  params_with_bounds.display_id = display.id();
-  params_with_bounds.device_scale_factor = display.device_scale_factor();
-  params_with_bounds.ui_scale_factor = display_info.configured_ui_scale();
   // The AshWindowTreeHost ends up owned by the RootWindowControllers created
   // by this class.
   AshWindowTreeHost* ash_host =
       AshWindowTreeHost::Create(params_with_bounds).release();
   aura::WindowTreeHost* host = ash_host->AsWindowTreeHost();
-  // TODO: Config::MUS should not install an InputMethod.
-  // http://crbug.com/706913
-  if (!host->has_input_method()) {
-    if (!input_method_) {  // Singleton input method instance for Ash.
-      input_method_ = ui::CreateInputMethod(this, host->GetAcceleratedWidget());
-      // Makes sure the input method is focused by default when created, because
-      // Ash uses singleton InputMethod and it won't call OnFocus/OnBlur when
-      // the active window changed.
-      input_method_->OnFocus();
-      input_method_event_handler_.reset(
-          new InputMethodEventHandler(input_method_.get()));
-    }
-    host->SetSharedInputMethod(input_method_.get());
-    ash_host->set_input_method_handler(input_method_event_handler_.get());
+  if (!input_method_) {  // Singleton input method instance for Ash.
+    input_method_ = ui::CreateInputMethod(this, host->GetAcceleratedWidget());
+    // Makes sure the input method is focused by default when created, because
+    // Ash uses singleton InputMethod and it won't call OnFocus/OnBlur when the
+    // active window changed.
+    input_method_->OnFocus();
+    input_method_event_handler_.reset(
+        new InputMethodEventHandler(input_method_.get()));
   }
+  host->SetSharedInputMethod(input_method_.get());
+  ash_host->set_input_method_handler(input_method_event_handler_.get());
 
   host->window()->SetName(base::StringPrintf(
       "%sRootWindow-%d", params_with_bounds.offscreen ? "Offscreen" : "",
       host_count++));
   host->window()->SetTitle(base::UTF8ToUTF16(display_info.name()));
   host->compositor()->SetBackgroundColor(SK_ColorBLACK);
   // No need to remove our observer observer because the WindowTreeHostManager
   // outlives the host.
   host->AddObserver(this);
   InitRootWindowSettings(host->window())->display_id = display.id();
   host->InitHost();
   host->window()->Show();
 
   window_tree_hosts_[display.id()] = ash_host;
   SetDisplayPropertiesOnHost(ash_host, display);
 
   if (switches::ConstrainPointerToRoot())
     ash_host->ConfineCursorToRootWindow();
   return ash_host;
 }
 
 }  // namespace ash