| 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 75488fcb5ef3965b5bf2fa66c977a0e61aca2ac5..b6d53bebaf300001691bfd319ea097a74ebbb63b 100644
|
| --- a/chrome/browser/ui/webui/options/chromeos/display_options_handler.cc
|
| +++ b/chrome/browser/ui/webui/options/chromeos/display_options_handler.cc
|
| @@ -339,14 +339,14 @@ void DisplayOptionsHandler::SendAllDisplayInfo() {
|
| js_display->Set("availableColorProfiles", available_color_profiles);
|
|
|
| if (display_manager->GetNumDisplays() > 1) {
|
| - const ash::DisplayPlacement* placement =
|
| + const ash::DisplayPlacement placement =
|
| display_manager->GetCurrentDisplayLayout().FindPlacementById(
|
| display.id());
|
| - if (placement) {
|
| + if (placement.display_id != gfx::Display::kInvalidDisplayID) {
|
| js_display->SetString(
|
| - "parentId", base::Int64ToString(placement->parent_display_id));
|
| - js_display->SetInteger("layoutType", placement->position);
|
| - js_display->SetInteger("offset", placement->offset);
|
| + "parentId", base::Int64ToString(placement.parent_display_id));
|
| + js_display->SetInteger("layoutType", placement.position);
|
| + js_display->SetInteger("offset", placement.offset);
|
| }
|
| }
|
|
|
|
|