| Index: ui/display/manager/chromeos/display_change_observer.cc
|
| diff --git a/ui/display/manager/chromeos/display_change_observer.cc b/ui/display/manager/chromeos/display_change_observer.cc
|
| index 150db3892bbbf6c3e0349c5cfe5acfb2dd5aa596..f9e058a7a93fa45c7f44d1977457e044b713bd00 100644
|
| --- a/ui/display/manager/chromeos/display_change_observer.cc
|
| +++ b/ui/display/manager/chromeos/display_change_observer.cc
|
| @@ -288,7 +288,16 @@ void DisplayChangeObserver::OnDisplayModeChangeFailed(
|
| }
|
|
|
| void DisplayChangeObserver::OnTouchscreenDeviceConfigurationChanged() {
|
| - OnDisplayModeChanged(display_configurator_->cached_displays());
|
| + // If there are no cached display snapshots, either there are no attached
|
| + // displays or the cached snapshots have been invalidated. For the first case
|
| + // there aren't any touchscreens to associate. For the second case, the
|
| + // displays and touch input-devices will get associated when display
|
| + // configuration finishes.
|
| + const auto& cached_displays = display_configurator_->cached_displays();
|
| + if (!cached_displays.empty())
|
| + OnDisplayModeChanged(cached_displays);
|
| + else
|
| + VLOG(1) << "Not updating touchscreen associations";
|
| }
|
|
|
| // static
|
|
|