Revert of chromeos: Makes mushrome use simplified display management

ash/display/mirror_window_controller.cc

 // Copyright (c) 2013 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/mirror_window_controller.h"
 
 #include <utility>
 
 #if defined(USE_X11)
 #include <X11/extensions/XInput2.h>
@@ skipping 155 matching lines @@
       transformer.reset(CreateRootWindowTransformerForUnifiedDesktop(
           primary.bounds(), display));
     } else {
       NOTREACHED();
     }
 
     if (mirroring_host_info_map_.find(display_info.id()) ==
         mirroring_host_info_map_.end()) {
       AshWindowTreeHostInitParams init_params;
       init_params.initial_bounds = display_info.bounds_in_native();
-      init_params.display_id = display_info.id();
-      init_params.device_scale_factor = display_info.device_scale_factor();
-      init_params.ui_scale_factor = display_info.configured_ui_scale();
       MirroringHostInfo* host_info = new MirroringHostInfo;
       host_info->ash_host = AshWindowTreeHost::Create(init_params);
       mirroring_host_info_map_[display_info.id()] = host_info;
 
       aura::WindowTreeHost* host = host_info->ash_host->AsWindowTreeHost();
-      // TODO: Config::MUS should not install an InputMethod.
-      // http://crbug.com/706913
-      if (!host->has_input_method()) {
-        host->SetSharedInputMethod(
-            Shell::Get()->window_tree_host_manager()->input_method());
-      }
+      host->SetSharedInputMethod(
+          Shell::Get()->window_tree_host_manager()->input_method());
       host->window()->SetName(
           base::StringPrintf("MirrorRootWindow-%d", mirror_host_count++));
       host->compositor()->SetBackgroundColor(SK_ColorBLACK);
       // No need to remove the observer because the WindowTreeHostManager
       // outlives the host.
       host->AddObserver(Shell::Get()->window_tree_host_manager());
       host->AddObserver(this);
       // TODO(oshima): TouchHUD is using idkey.
       InitRootWindowSettings(host->window())->display_id = display_info.id();
       host->InitHost();
@@ skipping 22 matching lines @@
 
       aura::Window* mirror_window = host_info->mirror_window =
           new aura::Window(nullptr);
       mirror_window->Init(ui::LAYER_SOLID_COLOR);
       host->window()->AddChild(mirror_window);
       host_info->ash_host->SetRootWindowTransformer(std::move(transformer));
       mirror_window->SetBounds(host->window()->bounds());
       mirror_window->Show();
       if (reflector_) {
         reflector_->AddMirroringLayer(mirror_window->layer());
-      } else if (aura::Env::GetInstance()->context_factory_private()) {
+      } else {
         reflector_ =
             aura::Env::GetInstance()
                 ->context_factory_private()
                 ->CreateReflector(
                     Shell::GetPrimaryRootWindow()->GetHost()->compositor(),
                     mirror_window->layer());
-      } else {
-        // TODO: Config::MUS needs to support reflector.
-        // http://crbug.com/601869.
-        NOTIMPLEMENTED();
       }
     } else {
       AshWindowTreeHost* ash_host =
           mirroring_host_info_map_[display_info.id()]->ash_host.get();
       aura::WindowTreeHost* host = ash_host->AsWindowTreeHost();
       GetRootWindowSettings(host->window())->display_id = display_info.id();
       ash_host->SetRootWindowTransformer(std::move(transformer));
       host->SetBoundsInPixels(display_info.bounds_in_native());
     }
   }
@@ skipping 45 matching lines @@
   }
 }
 
 void MirrorWindowController::OnHostResized(const aura::WindowTreeHost* host) {
   for (auto& pair : mirroring_host_info_map_) {
     MirroringHostInfo* info = pair.second;
     if (info->ash_host->AsWindowTreeHost() == host) {
       if (info->mirror_window_host_size == host->GetBoundsInPixels().size())
         return;
       info->mirror_window_host_size = host->GetBoundsInPixels().size();
-      // TODO: |reflector_| should always be non-null here, but isn't in MUS
-      // yet because of http://crbug.com/601869.
-      if (reflector_)
-        reflector_->OnMirroringCompositorResized();
+      reflector_->OnMirroringCompositorResized();
       // No need to update the transformer as new transformer is already set
       // in UpdateWindow.
       Shell::Get()
           ->window_tree_host_manager()
           ->cursor_window_controller()
           ->UpdateLocation();
       return;
     }
   }
 }
@@ skipping 47 matching lines @@
   aura::client::SetScreenPositionClient(host->window(), nullptr);
 
   NoneCaptureClient* capture_client = static_cast<NoneCaptureClient*>(
       aura::client::GetCaptureClient(host->window()));
   aura::client::SetCaptureClient(host->window(), nullptr);
   delete capture_client;
 
   host->RemoveObserver(Shell::Get()->window_tree_host_manager());
   host->RemoveObserver(this);
   host_info->ash_host->PrepareForShutdown();
-  // TODO: |reflector_| should always be non-null here, but isn't in MUS yet
-  // because of http://crbug.com/601869.
-  if (reflector_)
-    reflector_->RemoveMirroringLayer(host_info->mirror_window->layer());
+  reflector_->RemoveMirroringLayer(host_info->mirror_window->layer());
 
   // EventProcessor may be accessed after this call if the mirroring window
   // was deleted as a result of input event (e.g. shortcut), so don't delete
   // now.
   if (delay_host_deletion)
     base::ThreadTaskRunnerHandle::Get()->DeleteSoon(FROM_HERE, host_info);
   else
     delete host_info;
 }
 
 }  // namespace ash