mus: Forward user activity from window server to detector.

ui/base/user_activity/user_activity_detector.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/base/user_activity/user_activity_detector.h"
 
 #include "base/format_macros.h"
 #include "base/logging.h"
 #include "base/strings/stringprintf.h"
 #include "build/build_config.h"
@@ skipping 35 matching lines @@
 // will be reported as user activity and turn the screen back on; too high
 // and we'll ignore legitimate activity.
 const int UserActivityDetector::kDisplayPowerChangeIgnoreMouseMs = 1000;
 
 UserActivityDetector::UserActivityDetector() {
   CHECK(!g_instance);
   g_instance = this;
 
   ui::PlatformEventSource* platform_event_source =
       ui::PlatformEventSource::GetInstance();
-  // TODO(sad): Need a PES for mus.
   if (platform_event_source)
     platform_event_source->AddPlatformEventObserver(this);
 }
 
 UserActivityDetector::~UserActivityDetector() {
   ui::PlatformEventSource* platform_event_source =
       ui::PlatformEventSource::GetInstance();
   if (platform_event_source)
     platform_event_source->RemovePlatformEventObserver(this);
   g_instance = nullptr;
@@ skipping 15 matching lines @@
 
 void UserActivityDetector::RemoveObserver(UserActivityObserver* observer) {
   observers_.RemoveObserver(observer);
 }
 
 void UserActivityDetector::OnDisplayPowerChanging() {
   honor_mouse_events_time_ = GetCurrentTime() +
       base::TimeDelta::FromMilliseconds(kDisplayPowerChangeIgnoreMouseMs);
 }
 
+void UserActivityDetector::HandleExternalUserActivity() {
+  HandleActivity(nullptr);
+}
+
 void UserActivityDetector::DidProcessEvent(
     const PlatformEvent& platform_event) {
   std::unique_ptr<ui::Event> event(ui::EventFromNative(platform_event));
   ProcessReceivedEvent(event.get());
 }
 
 base::TimeTicks UserActivityDetector::GetCurrentTime() const {
   return !now_for_test_.is_null() ? now_for_test_ : base::TimeTicks::Now();
 }
 
 void UserActivityDetector::ProcessReceivedEvent(const ui::Event* event) {
   if (!event)
     return;
 
   if (event->IsMouseEvent() || event->IsMouseWheelEvent()) {
     if (event->flags() & ui::EF_IS_SYNTHESIZED)
       return;
     if (!honor_mouse_events_time_.is_null()
         && GetCurrentTime() < honor_mouse_events_time_)
       return;
   }
 
   HandleActivity(event);
 }
 
 void UserActivityDetector::HandleActivity(const ui::Event* event) {
   base::TimeTicks now = GetCurrentTime();
   last_activity_time_ = now;
-  last_activity_name_ = event->name();
+  last_activity_name_ = event ? event->name() : "";

[sadrul, 2017/01/18 22:10:58]

s/""/std::string()/

[Daniel Erat, 2017/01/19 01:56:24]

Done.

   if (last_observer_notification_time_.is_null() ||
       (now - last_observer_notification_time_).InMillisecondsF() >=
       kNotifyIntervalMs) {
-    if (VLOG_IS_ON(1))
+    if (VLOG_IS_ON(1) && event)
       VLOG(1) << "Reporting user activity: " << GetEventDebugString(event);
     for (UserActivityObserver& observer : observers_)
       observer.OnUserActivity(event);
     last_observer_notification_time_ = now;
   }
 }
 
 }  // namespace ui