| Index: ash/common/system/chromeos/palette/palette_tray.cc
|
| diff --git a/ash/common/system/chromeos/palette/palette_tray.cc b/ash/common/system/chromeos/palette/palette_tray.cc
|
| index 274ec6698a9eab84726dce0ee5bf6b90e3c7ff58..78146b08305b9128b7de261e64e48347d936f234 100644
|
| --- a/ash/common/system/chromeos/palette/palette_tray.cc
|
| +++ b/ash/common/system/chromeos/palette/palette_tray.cc
|
| @@ -301,6 +301,10 @@ void PaletteTray::OnTouchscreenDeviceConfigurationChanged() {
|
| }
|
|
|
| void PaletteTray::OnStylusStateChanged(ui::StylusState stylus_state) {
|
| + // Device may have a stylus but it has been forcibly disabled.
|
| + if (!palette_utils::HasStylusInput())
|
| + return;
|
| +
|
| PaletteDelegate* palette_delegate = WmShell::Get()->palette_delegate();
|
|
|
| // Don't do anything if the palette should not be shown or if the user has
|
|
|