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

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

Issue 2932563002: Implement cursor changing on Mushrome (Closed)
Patch Set: Remove last NOTIMPLEMENTED for this patch Created 3 years, 6 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
Index: ui/display/manager/display_manager.cc
diff --git a/ui/display/manager/display_manager.cc b/ui/display/manager/display_manager.cc
index 1873139ddc04c10b522f04b5da90583fe854eee5..1c29a1d25f9317709788f49290e2ef8bd48ab002 100644
--- a/ui/display/manager/display_manager.cc
+++ b/ui/display/manager/display_manager.cc
@@ -696,13 +696,13 @@ void DisplayManager::UpdateDisplaysWith(
if (multi_display_mode_ != MIRRORING)
multi_display_mode_ = current_default_multi_display_mode_;
- CreateSoftwareMirroringDisplayInfo(&new_display_info_list);
-
// Close the mirroring window if any here to avoid creating two compositor on
// one display.
if (delegate_)
delegate_->CloseMirroringDisplayIfNotNecessary();
+ CreateSoftwareMirroringDisplayInfo(&new_display_info_list);
+
Displays new_displays;
Displays removed_displays;
std::map<size_t, uint32_t> display_changes;
« ash/wm/mushrome_ash_native_cursor_manager.cc ('K') | « ash/wm/mushrome_ash_native_cursor_manager.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698