| 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 4215ac89dba4af3c2a2601d9785e00cb3ca2899b..7c5780ec639259df80a29f85ee6698482fa9985f 100644
|
| --- a/ash/display/display_change_observer_chromeos.cc
|
| +++ b/ash/display/display_change_observer_chromeos.cc
|
| @@ -123,7 +123,7 @@ void DisplayChangeObserver::OnDisplayModeChanged(
|
| for (size_t i = 0; i < outputs.size(); ++i) {
|
| const OutputConfigurator::OutputSnapshot& output = outputs[i];
|
|
|
| - if (output.is_internal &&
|
| + if (output.type == chromeos::OUTPUT_TYPE_INTERNAL &&
|
| gfx::Display::InternalDisplayId() == gfx::Display::kInvalidDisplayID) {
|
| // Fall back to output index. crbug.com/180100
|
| gfx::Display::SetInternalDisplayId(
|
| @@ -146,10 +146,10 @@ void DisplayChangeObserver::OnDisplayModeChanged(
|
| output.x, output.y, mode_info->width, mode_info->height);
|
|
|
| std::vector<Resolution> resolutions;
|
| - if (!output.is_internal)
|
| + if (output.type != chromeos::OUTPUT_TYPE_INTERNAL)
|
| resolutions = GetResolutionList(output);
|
|
|
| - std::string name = output.is_internal ?
|
| + std::string name = output.type == chromeos::OUTPUT_TYPE_INTERNAL ?
|
| l10n_util::GetStringUTF8(IDS_ASH_INTERNAL_DISPLAY_NAME) :
|
| chromeos::GetDisplayName(output.output);
|
| if (name.empty())
|
|
|