Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(414)

Unified Diff: ui/display/manager/display_manager.cc

Issue 2792733002: Display: dectect changes to mirror mode and send a notification. (Closed)
Patch Set: Fix test Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/display/manager/display_manager.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/display/manager/display_manager.cc
diff --git a/ui/display/manager/display_manager.cc b/ui/display/manager/display_manager.cc
index 43aaeeab90e0dfecf5406d3bb821aa1e90263629..2a6e59bb3a4fcec1ccbc7336557a036fd362d960 100644
--- a/ui/display/manager/display_manager.cc
+++ b/ui/display/manager/display_manager.cc
@@ -822,23 +822,32 @@ void DisplayManager::UpdateDisplaysWith(
NotifyMetricsChanged(updated_display, metrics);
}
+ uint32_t primary_metrics = 0;
+
if (notify_primary_change) {
// This happens when a primary display has moved to anther display without
// bounds change.
const Display& primary = screen_->GetPrimaryDisplay();
if (primary.id() != old_primary.id()) {
- uint32_t metrics = DisplayObserver::DISPLAY_METRIC_PRIMARY;
+ primary_metrics = DisplayObserver::DISPLAY_METRIC_PRIMARY;
if (primary.size() != old_primary.size()) {
- metrics |= (DisplayObserver::DISPLAY_METRIC_BOUNDS |
- DisplayObserver::DISPLAY_METRIC_WORK_AREA);
+ primary_metrics |= (DisplayObserver::DISPLAY_METRIC_BOUNDS |
+ DisplayObserver::DISPLAY_METRIC_WORK_AREA);
}
if (primary.device_scale_factor() != old_primary.device_scale_factor())
- metrics |= DisplayObserver::DISPLAY_METRIC_DEVICE_SCALE_FACTOR;
-
- NotifyMetricsChanged(primary, metrics);
+ primary_metrics |= DisplayObserver::DISPLAY_METRIC_DEVICE_SCALE_FACTOR;
}
}
+ bool mirror_mode = IsInMirrorMode();
+ if (mirror_mode != mirror_mode_for_metrics_) {
+ primary_metrics |= DisplayObserver::DISPLAY_METRIC_MIRROR_STATE;
+ mirror_mode_for_metrics_ = mirror_mode;
+ }
+
+ if (delegate_ && primary_metrics)
+ NotifyMetricsChanged(screen_->GetPrimaryDisplay(), primary_metrics);
+
bool must_clear_window = false;
#if defined(USE_X11) && defined(OS_CHROMEOS)
must_clear_window =
« no previous file with comments | « ui/display/manager/display_manager.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698