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

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

Issue 2314203002: Move DisplayList to display; add ScreenBase. (Closed)
Patch Set: Update unit test namespace. Created 4 years, 3 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_layout.h ('k') | ui/display/manager/display_layout_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/display/manager/display_layout.cc
diff --git a/ui/display/manager/display_layout.cc b/ui/display/manager/display_layout.cc
index ce3676c227ebd4809f716ae6dbe60fd10f8fbd35..d9edfb7fd0907a5ddca70db1d867237058288f6b 100644
--- a/ui/display/manager/display_layout.cc
+++ b/ui/display/manager/display_layout.cc
@@ -36,7 +36,7 @@ bool IsIdInList(int64_t id, const DisplayIdList& list) {
return iter != list.end();
}
-Display* FindDisplayById(DisplayList* display_list, int64_t id) {
+Display* FindDisplayById(Displays* display_list, int64_t id) {
auto iter =
std::find_if(display_list->begin(), display_list->end(),
[id](const Display& display) { return display.id() == id; });
@@ -182,7 +182,7 @@ DisplayLayout::DisplayLayout()
DisplayLayout::~DisplayLayout() {}
-void DisplayLayout::ApplyToDisplayList(DisplayList* display_list,
+void DisplayLayout::ApplyToDisplayList(Displays* display_list,
std::vector<int64_t>* updated_ids,
int minimum_offset_overlap) const {
// Layout from primary, then dependent displays.
@@ -310,7 +310,7 @@ DisplayPlacement DisplayLayout::FindPlacementById(int64_t display_id) const {
// static
bool DisplayLayout::ApplyDisplayPlacement(const DisplayPlacement& placement,
- DisplayList* display_list,
+ Displays* display_list,
int minimum_offset_overlap) {
const Display& parent_display =
*FindDisplayById(display_list, placement.parent_display_id);
« no previous file with comments | « ui/display/manager/display_layout.h ('k') | ui/display/manager/display_layout_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698