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

Unified Diff: chrome/browser/ui/webui/options/chromeos/display_options_handler.cc

Issue 2573673003: Detect and fix overlapping displays (Closed)
Patch Set: Nits Created 3 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 | « chrome/browser/extensions/display_info_provider_chromeos.cc ('k') | ui/display/display_layout.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/webui/options/chromeos/display_options_handler.cc
diff --git a/chrome/browser/ui/webui/options/chromeos/display_options_handler.cc b/chrome/browser/ui/webui/options/chromeos/display_options_handler.cc
index bb94fc92e3d38026028175e44615fa523638c5bd..8122d4fcb23b10fe171c4248f24ddb33f4fd0f9c 100644
--- a/chrome/browser/ui/webui/options/chromeos/display_options_handler.cc
+++ b/chrome/browser/ui/webui/options/chromeos/display_options_handler.cc
@@ -358,8 +358,10 @@ void DisplayOptionsHandler::SendAllDisplayInfo() {
js_display->Set("availableColorProfiles", available_color_profiles);
if (display_manager->GetNumDisplays() > 1) {
+ // The settings UI must use the resolved display layout to show the
+ // actual applied layout.
const display::DisplayPlacement placement =
- display_manager->GetCurrentDisplayLayout().FindPlacementById(
+ display_manager->GetCurrentResolvedDisplayLayout().FindPlacementById(
display.id());
if (placement.display_id != display::kInvalidDisplayId) {
js_display->SetString(
« no previous file with comments | « chrome/browser/extensions/display_info_provider_chromeos.cc ('k') | ui/display/display_layout.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698