| Index: ui/display/manager/display_layout_store.cc
|
| diff --git a/ui/display/manager/display_layout_store.cc b/ui/display/manager/display_layout_store.cc
|
| index f064251944c5143311a9d33721b2272248061d40..7e94b343fee0a9e19f1ab5ab7ca9ec098f62cb45 100644
|
| --- a/ui/display/manager/display_layout_store.cc
|
| +++ b/ui/display/manager/display_layout_store.cc
|
| @@ -72,9 +72,17 @@ void DisplayLayoutStore::RegisterLayoutForDisplayIdList(
|
| layout->placement_list[0].parent_display_id = list[0];
|
| }
|
| }
|
| - DCHECK(DisplayLayout::Validate(list, *layout.get()))
|
| - << "ids=" << DisplayIdListToString(list)
|
| - << ", layout=" << layout->ToString();
|
| +
|
| + if (!DisplayLayout::Validate(list, *layout.get())) {
|
| + NOTREACHED() << "Attempting to register an invalid layout: ids="
|
| + << DisplayIdListToString(list)
|
| + << ", layout=" << layout->ToString();
|
| + // We never allow to register an invalid layout, instead, we revert back to
|
| + // a default layout.
|
| + CreateDefaultDisplayLayout(list);
|
| + return;
|
| + }
|
| +
|
| layouts_[list] = std::move(layout);
|
| }
|
|
|
|
|