Notify primary display reassignment

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 327 matching lines @@
     const DisplayLayout layout = GetCurrentDisplayLayout();
     UpdateDisplayBoundsForLayoutById(
         layout, primary,
         ScreenUtil::GetSecondaryDisplay().id());
 
     // Primary's bounds stay the same. Just notify bounds change
     // on the secondary.
     screen_ash_->NotifyMetricsChanged(
         ScreenUtil::GetSecondaryDisplay(),
         gfx::DisplayObserver::DISPLAY_METRIC_BOUNDS |
-            gfx::DisplayObserver::DISPLAY_METRIC_WORK_AREA);
+        gfx::DisplayObserver::DISPLAY_METRIC_WORK_AREA);
     if (delegate_)
       delegate_->PostDisplayConfigurationChange();
   }
 }
 
 const gfx::Display& DisplayManager::GetDisplayForId(int64 id) const {
   gfx::Display* display =
       const_cast<DisplayManager*>(this)->FindDisplayForId(id);
   return display ? *display : GetInvalidDisplay();
 }
@@ skipping 472 matching lines @@
       ++curr_iter;
     } else {
       // more displays in new list between ids, which means it is added.
       added_display_indices.push_back(new_displays.size());
       InsertAndUpdateDisplayInfo(*new_info_iter);
       new_displays.push_back(
           CreateDisplayFromDisplayInfoById(new_info_iter->id()));
       ++new_info_iter;
     }
   }
+  gfx::Display old_primary;
+  if (delegate_)
+    old_primary = screen_ash_->GetPrimaryDisplay();
 
   // Clear focus if the display has been removed, but don't clear focus if
   // the destkop has been moved from one display to another
   // (mirror -> docked, docked -> single internal).
   bool clear_focus =
       !removed_displays.empty() &&
       !(removed_displays.size() == 1 && added_display_indices.size() == 1);
   if (delegate_)
     delegate_->PreDisplayConfigurationChange(clear_focus);
 
@@ skipping 45 matching lines @@
   // Close the mirroring window here to avoid creating two compositor on
   // one display.
   if (!has_mirroring_display && delegate_)
     delegate_->CloseMirroringDisplay();
 
   for (std::vector<size_t>::iterator iter = added_display_indices.begin();
        iter != added_display_indices.end(); ++iter) {
     screen_ash_->NotifyDisplayAdded(displays_[*iter]);
   }
 
+  bool notify_primary_change =
+      delegate_ ? old_primary.id() != screen_->GetPrimaryDisplay().id() : false;
+
   for (std::map<size_t, uint32_t>::iterator iter = display_changes.begin();
        iter != display_changes.end();
        ++iter) {
-    screen_ash_->NotifyMetricsChanged(displays_[iter->first], iter->second);
+    uint32_t metrics = iter->second;
+    const gfx::Display& updated_display = displays_[iter->first];
+
+    if (notify_primary_change &&
+        updated_display.id() == screen_->GetPrimaryDisplay().id()) {
+      metrics |= gfx::DisplayObserver::DISPLAY_METRIC_PRIMARY;
+      notify_primary_change = false;
+    }
+    screen_ash_->NotifyMetricsChanged(updated_display, metrics);
   }
+
+  if (notify_primary_change) {
+    // This happens when a primary display has moved to anther display without
+    // bounds change.
+    const gfx::Display& primary = screen_->GetPrimaryDisplay();
+    if (primary.id() != old_primary.id()) {
+      uint32_t metrics = gfx::DisplayObserver::DISPLAY_METRIC_PRIMARY;
+      if (primary.size() != old_primary.size()) {
+        metrics |= (gfx::DisplayObserver::DISPLAY_METRIC_BOUNDS |
+                    gfx::DisplayObserver::DISPLAY_METRIC_WORK_AREA);
+      }
+      if (primary.device_scale_factor() != old_primary.device_scale_factor())
+        metrics |= gfx::DisplayObserver::DISPLAY_METRIC_DEVICE_SCALE_FACTOR;
+
+      screen_ash_->NotifyMetricsChanged(primary, metrics);
+    }
+  }
+
   if (delegate_)
     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
@@ skipping 319 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