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

Unified Diff: ash/display/display_change_observer_chromeos.cc

Issue 1638413007: Use list instead of pair to represent the set of displays. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix build error Created 4 years, 11 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_layout.h » ('j') | ash/shelf/shelf_layout_manager.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/display/display_change_observer_chromeos.cc
diff --git a/ash/display/display_change_observer_chromeos.cc b/ash/display/display_change_observer_chromeos.cc
index 3f820a90ac23483f4c906d655a572b86bf7149ef..97a76e0bc979cdaeb3747aeda2a585483baf1809 100644
--- a/ash/display/display_change_observer_chromeos.cc
+++ b/ash/display/display_change_observer_chromeos.cc
@@ -156,10 +156,12 @@ ui::MultipleDisplayState DisplayChangeObserver::GetStateForDisplayIds(
UpdateInternalDisplayId(display_states);
if (display_states.size() != 2)
return ui::MULTIPLE_DISPLAY_STATE_DUAL_EXTENDED;
- DisplayIdPair pair = CreateDisplayIdPair(display_states[0]->display_id(),
+ DisplayIdList list = CreateDisplayIdList(display_states[0]->display_id(),
display_states[1]->display_id());
- DisplayLayout layout = Shell::GetInstance()->display_manager()->
- layout_store()->GetRegisteredDisplayLayout(pair);
+ DisplayLayout layout = Shell::GetInstance()
+ ->display_manager()
+ ->layout_store()
+ ->GetRegisteredDisplayLayout(list);
return layout.mirrored ? ui::MULTIPLE_DISPLAY_STATE_DUAL_MIRROR :
ui::MULTIPLE_DISPLAY_STATE_DUAL_EXTENDED;
}
« no previous file with comments | « no previous file | ash/display/display_layout.h » ('j') | ash/shelf/shelf_layout_manager.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698