Enable display rotation, magnifier in unified desktop mode

ash/display/display_controller.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/display_controller.h"
 
 #include <algorithm>
 #include <cmath>
 #include <map>
 
 #include "ash/ash_switches.h"
 #include "ash/display/cursor_window_controller.h"
 #include "ash/display/display_layout_store.h"
 #include "ash/display/display_manager.h"
 #include "ash/display/mirror_window_controller.h"
 #include "ash/display/root_window_transformers.h"
 #include "ash/host/ash_window_tree_host.h"
 #include "ash/host/ash_window_tree_host_init_params.h"
 #include "ash/host/root_window_transformer.h"
+#include "ash/magnifier/magnification_controller.h"
+#include "ash/magnifier/partial_magnification_controller.h"
 #include "ash/root_window_controller.h"
 #include "ash/root_window_settings.h"
 #include "ash/screen_util.h"
 #include "ash/shell.h"
 #include "ash/shell_delegate.h"
 #include "ash/wm/coordinate_conversion.h"
 #include "base/command_line.h"
 #include "base/stl_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 330 matching lines @@
 }
 
 aura::Window* DisplayController::GetRootWindowForDisplayId(int64 id) {
   AshWindowTreeHost* host = GetAshWindowTreeHostForDisplayId(id);
   CHECK(host);
   return GetWindow(host);
 }
 
 AshWindowTreeHost* DisplayController::GetAshWindowTreeHostForDisplayId(
     int64 id) {
-  CHECK_EQ(1u, window_tree_hosts_.count(id));
+  CHECK_EQ(1u, window_tree_hosts_.count(id)) << "id = " << id;
   return window_tree_hosts_[id];
 }
 
 void DisplayController::CloseChildWindows() {
   for (WindowTreeHostMap::const_iterator it = window_tree_hosts_.begin();
        it != window_tree_hosts_.end();
        ++it) {
     aura::Window* root_window = GetWindow(it->second);
     RootWindowController* controller = GetRootWindowController(root_window);
     if (controller) {
@@ skipping 252 matching lines @@
 void DisplayController::OnDisplayAdded(const gfx::Display& display) {
 #if defined(OS_CHROMEOS)
   if (GetDisplayManager()->default_multi_display_mode() ==
       DisplayManager::UNIFIED) {
     if (primary_display_id == gfx::Display::kInvalidDisplayID)
       primary_display_id = display.id();
     AshWindowTreeHost* ash_host =
         AddWindowTreeHostForDisplay(display, AshWindowTreeHostInitParams());
     RootWindowController::CreateForSecondaryDisplay(ash_host);
 
+    // Magnifier controllers keep pointers to the current root window.
+    // Update them here to avoid accessing them later.
+    Shell::GetInstance()->magnification_controller()->SwitchTargetRootWindow(
+        ash_host->AsWindowTreeHost()->window(), false);
+    Shell::GetInstance()
+        ->partial_magnification_controller()
+        ->SwitchTargetRootWindow(ash_host->AsWindowTreeHost()->window());
+
     if (primary_tree_host_for_replace_) {
       AshWindowTreeHost* to_delete = primary_tree_host_for_replace_;
       primary_tree_host_for_replace_ = nullptr;
       DeleteHost(to_delete);
 #ifndef NDEBUG
       auto iter = std::find_if(
           window_tree_hosts_.begin(), window_tree_hosts_.end(),
           [to_delete](const std::pair<int64, AshWindowTreeHost*>& pair) {
             return pair.second == to_delete;
           });
@@ skipping 220 matching lines @@
   Shell::GetInstance()->display_configurator_animation()
       ->StartFadeInAnimation();
 #endif
 }
 
 void DisplayController::SetMirrorModeAfterAnimation(bool mirror) {
   GetDisplayManager()->SetMirrorMode(mirror);
 }
 
 }  // namespace ash