Allow switching between extended and unified

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"
 
 #if defined(USE_X11)
 #include <X11/Xlib.h>
 #include <X11/extensions/XInput2.h>
 
@@ skipping 102 matching lines @@
   // Releases a capture from the |window|.
   void ReleaseCapture(aura::Window* window) override {}
 
   // Returns the current capture window.
   aura::Window* GetCaptureWindow() override { return NULL; }
   aura::Window* GetGlobalCaptureWindow() override { return NULL; }
 
   DISALLOW_COPY_AND_ASSIGN(NoneCaptureClient);
 };
 
+DisplayManager::MultiDisplayMode GetCurrentMultiDisplayMode() {
+  DisplayManager* display_manager = Shell::GetInstance()->display_manager();
+  return display_manager->IsInUnifiedMode()
+             ? DisplayManager::UNIFIED
+             : (display_manager->IsInMirrorMode() ? DisplayManager::MIRRORING
+                                                  : DisplayManager::EXTENDED);
+}
+
 }  // namespace
 
 struct MirrorWindowController::MirroringHostInfo {
   MirroringHostInfo();
   ~MirroringHostInfo();
   scoped_ptr<AshWindowTreeHost> ash_host;
   gfx::Size mirror_window_host_size;
   aura::Window* mirror_window = nullptr;
 };
 
@@ skipping 13 matching lines @@
 }
 
 void MirrorWindowController::UpdateWindow(
     const std::vector<DisplayInfo>& display_info_list) {
   static int mirror_host_count = 0;
   DisplayManager* display_manager = Shell::GetInstance()->display_manager();
   const gfx::Display& primary = Shell::GetScreen()->GetPrimaryDisplay();
   const DisplayInfo& source_display_info =
       display_manager->GetDisplayInfo(primary.id());
 
+  multi_display_mode_ = GetCurrentMultiDisplayMode();
+
   gfx::Point mirroring_origin;
   for (const DisplayInfo& display_info : display_info_list) {
     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();
       MirroringHostInfo* host_info = new MirroringHostInfo;
       host_info->ash_host.reset(AshWindowTreeHost::Create(init_params));
       mirroring_host_info_map_[display_info.id()] = host_info;
 
@@ skipping 95 matching lines @@
   if (!mirroring_host_info_map_.size())
     return;
   DisplayManager* display_manager = Shell::GetInstance()->display_manager();
   std::vector<DisplayInfo> display_info_list;
   for (auto& pair : mirroring_host_info_map_)
     display_info_list.push_back(display_manager->GetDisplayInfo(pair.first));
   UpdateWindow(display_info_list);
 }
 
 void MirrorWindowController::CloseIfNotNecessary() {
-  DisplayManager* display_manager = Shell::GetInstance()->display_manager();
-
-  DisplayManager::MultiDisplayMode new_mode =
-      display_manager->IsInUnifiedMode()
-          ? DisplayManager::UNIFIED
-          : (display_manager->IsInMirrorMode() ? DisplayManager::MIRRORING
-                                               : DisplayManager::EXTENDED);
+  DisplayManager::MultiDisplayMode new_mode = GetCurrentMultiDisplayMode();
   if (multi_display_mode_ != new_mode)
     Close(true);
   multi_display_mode_ = new_mode;
 }
 
 void MirrorWindowController::Close(bool delay_host_deletion) {
   for (auto& info : mirroring_host_info_map_)
     CloseAndDeleteHost(info.second, delay_host_deletion);
 
   mirroring_host_info_map_.clear();
@@ skipping 100 matching lines @@
       display_manager->GetDisplayInfo(display_manager->mirroring_display_id());
   const DisplayInfo& source_display_info = display_manager->GetDisplayInfo(
       Shell::GetScreen()->GetPrimaryDisplay().id());
   DCHECK(display_manager->IsInMirrorMode());
   return scoped_ptr<RootWindowTransformer>(
       CreateRootWindowTransformerForMirroredDisplay(source_display_info,
                                                     mirror_display_info));
 }
 
 }  // namespace ash