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 1d94c131b1c7081d203eac1dd195f3578979d624..cdd1d273e2cac4122e53b2b8101a094eccfccad5 100644 |
--- a/ash/display/display_change_observer_chromeos.cc |
+++ b/ash/display/display_change_observer_chromeos.cc |
@@ -26,6 +26,7 @@ |
#include "ui/events/device_data_manager.h" |
#include "ui/events/touchscreen_device.h" |
#include "ui/gfx/display.h" |
+#include "ui/wm/core/user_activity_detector.h" |
namespace ash { |
@@ -246,6 +247,13 @@ void DisplayChangeObserver::OnDisplayModeChanged( |
&displays, ui::DeviceDataManager::GetInstance()->touchscreen_devices()); |
// DisplayManager can be null during the boot. |
Shell::GetInstance()->display_manager()->OnNativeDisplaysChanged(displays); |
+ |
+ // For the purposes of user activity detection, ignore synthetic mouse events |
+ // that are triggered by screen resizes: http://crbug.com/360634 |
+ ::wm::UserActivityDetector* user_activity_detector = |
+ Shell::GetInstance()->user_activity_detector(); |
+ if (user_activity_detector) |
+ user_activity_detector->OnDisplayPowerChanging(); |
} |
void DisplayChangeObserver::OnAppTerminating() { |