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

Unified Diff: ash/display/display_manager.h

Issue 2254603002: Temporary fix to return only the active displays. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 4 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 | « no previous file | ash/display/display_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/display/display_manager.h
diff --git a/ash/display/display_manager.h b/ash/display/display_manager.h
index e6a1b912dda5981f812afe14cc815b30dd2ef5cd..bffb3abde1142442a1972f0b47b39cb048b1c859 100644
--- a/ash/display/display_manager.h
+++ b/ash/display/display_manager.h
@@ -237,6 +237,15 @@ class ASH_EXPORT DisplayManager
// when displays are mirrored.
size_t GetNumDisplays() const;
+ // Returns only the currently active displays. This list does not include the
+ // displays that will be removed if |UpdateDisplaysWith| is currently
+ // executing.
+ // See https://crbug.com/632755
+ const display::DisplayList& active_only_display_list() const {
+ return is_updating_display_list_ ? active_only_display_list_
+ : active_display_list();
+ }
+
const display::DisplayList& active_display_list() const {
return active_display_list_;
}
@@ -412,6 +421,15 @@ class ASH_EXPORT DisplayManager
// List of current active displays.
display::DisplayList active_display_list_;
+ // This list does not include the displays that will be removed if
+ // |UpdateDisplaysWith| is under execution.
+ // See https://crbug.com/632755
+ display::DisplayList active_only_display_list_;
+
+ // True if active_display_list is being modified and has displays that are not
+ // presently active.
+ // See https://crbug.com/632755
+ bool is_updating_display_list_;
oshima 2016/08/17 01:21:08 nit: = false;
int num_connected_displays_;
« no previous file with comments | « no previous file | ash/display/display_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698