Update mirroring display even if the display configurations that are visible to ash/chrome hasn't c…

ash/display/display_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/display_manager.h"
 
 #include <algorithm>
 #include <cmath>
 #include <set>
 #include <string>
@@ skipping 792 matching lines @@
       !removed_displays.empty() &&
       !(removed_displays.size() == 1 && added_display_indices.size() == 1);
   if (delegate_)
     delegate_->PreDisplayConfigurationChange(clear_focus);
 
   // Do not update |displays_| if there's nothing to be updated. Without this,
   // it will not update the display layout, which causes the bug
   // http://crbug.com/155948.
   if (display_changes.empty() && added_display_indices.empty() &&
       removed_displays.empty()) {
-    // When changing from software mirroring mode to sinlge display mode, it
-    // is possible there is no need to update |displays_| and we early out
-    // here. But we still want to run the PostDisplayConfigurationChange()
-    // cause there are some clients need to act on this, e.g.
-    // TouchTransformerController needs to adjust the TouchTransformer when
-    // switching from dual displays to single display.
-    if (delegate_)
+    // When changing from software mirroring mode to sinlge display
+    // mode, it is possible there is no need to update |displays_| and
+    // we early out here. But we still need to update the mirroring
+    // window and call the PostDisplayConfigurationChange() cause
+    // there are some clients need to act on this,
+    // e.g. TouchTransformerController needs to adjust the
+    // TouchTransformer when/ switching from dual displays to single
+    // display.
+    if (delegate_) {
+      if (HasSoftwareMirroringDisplay())
+        CreateMirrorWindowAsyncIfAny();
+      else
+        delegate_->CloseMirroringDisplay();
       delegate_->PostDisplayConfigurationChange();
+    }
     return;
   }
 
   std::vector<size_t> updated_indices;
   if (UpdateNonPrimaryDisplayBoundsForLayout(&new_displays, &updated_indices)) {
     for (std::vector<size_t>::iterator it = updated_indices.begin();
          it != updated_indices.end(); ++it) {
       size_t updated_index = *it;
       if (std::find(added_display_indices.begin(),
                     added_display_indices.end(),
@@ skipping 73 matching lines @@
     delegate_->PostDisplayConfigurationChange();
 
 #if defined(USE_X11) && defined(OS_CHROMEOS)
   if (!display_changes.empty() && base::SysInfo::IsRunningOnChromeOS())
     ui::ClearX11DefaultRootWindow();
 #endif
 
   // Create the mirroring window asynchronously after all displays
   // are added so that it can mirror the display newly added. This can
   // happen when switching from dock mode to software mirror mode.
-  if (has_mirroring_display && delegate_)
-    CreateMirrorWindowAsyncIfAny();
+  CreateMirrorWindowAsyncIfAny();
 }
 
 const gfx::Display& DisplayManager::GetDisplayAt(size_t index) const {
   DCHECK_LT(index, displays_.size());
   return displays_[index];
 }
 
 const gfx::Display& DisplayManager::GetPrimaryDisplayCandidate() const {
   if (GetNumDisplays() != 2)
     return displays_[0];
@@ skipping 129 matching lines @@
     gfx::Display* display = FindDisplayForId(display_id);
     display->SetSize(display_info_[display_id].size_in_pixel());
     screen_ash_->NotifyMetricsChanged(
         *display, gfx::DisplayObserver::DISPLAY_METRIC_BOUNDS);
     return true;
   }
   return false;
 }
 
 void DisplayManager::CreateMirrorWindowAsyncIfAny() {
+  // Do not post a task if the software mirroring doesn't exist.
+  if (!HasSoftwareMirroringDisplay() || !delegate_)
+    return;
   base::MessageLoopForUI::current()->PostTask(
       FROM_HERE,
       base::Bind(&DisplayManager::CreateMirrorWindowIfAny,
                  weak_ptr_factory_.GetWeakPtr()));
 }
 
 void DisplayManager::CreateScreenForShutdown() const {
   bool native_is_ash =
       gfx::Screen::GetScreenByType(gfx::SCREEN_TYPE_NATIVE) ==
       screen_ash_.get();
@@ skipping 180 matching lines @@
       new_secondary_origin.Offset(-secondary_bounds.width(), offset);
       break;
   }
   gfx::Insets insets = secondary_display->GetWorkAreaInsets();
   secondary_display->set_bounds(
       gfx::Rect(new_secondary_origin, secondary_bounds.size()));
   secondary_display->UpdateWorkAreaFromInsets(insets);
 }
 
 }  // namespace ash