Move UserActivityDetector from ash/wm/ to ui/wm/core/.

ash/system/chromeos/power/user_activity_notifier.cc

 // Copyright 2013 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 "ash/system/chromeos/power/user_activity_notifier.h"
 
-#include "ash/shell.h"
-#include "ash/wm/user_activity_detector.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/power_manager_client.h"
 #include "ui/events/event.h"
 #include "ui/events/event_constants.h"
 #include "ui/events/keycodes/keyboard_codes_posix.h"
+#include "ui/wm/core/user_activity_detector.h"
 
 namespace ash {
 namespace internal {
 
 namespace {
 
 // Minimum number of seconds between notifications.
 const int kNotifyIntervalSec = 5;
 
 // Returns a UserActivityType describing |event|.
@@ skipping 13 matching lines @@
       return power_manager::USER_ACTIVITY_VOLUME_MUTE_KEY_PRESS;
     case ui::VKEY_VOLUME_UP:
       return power_manager::USER_ACTIVITY_VOLUME_UP_KEY_PRESS;
     default:
       return power_manager::USER_ACTIVITY_OTHER;
   }
 }
 
 }  // namespace
 
-UserActivityNotifier::UserActivityNotifier(UserActivityDetector* detector)
+UserActivityNotifier::UserActivityNotifier(::wm::UserActivityDetector* detector)
     : detector_(detector) {
   detector_->AddObserver(this);
 }
 
 UserActivityNotifier::~UserActivityNotifier() {
   detector_->RemoveObserver(this);
 }
 
 void UserActivityNotifier::OnUserActivity(const ui::Event* event) {
   base::TimeTicks now = base::TimeTicks::Now();
   // InSeconds() truncates rather than rounding, so it's fine for this
   // comparison.
   if (last_notify_time_.is_null() ||
       (now - last_notify_time_).InSeconds() >= kNotifyIntervalSec) {
     chromeos::DBusThreadManager::Get()->GetPowerManagerClient()->
         NotifyUserActivity(GetUserActivityTypeForEvent(event));
     last_notify_time_ = now;
   }
 }
 
 }  // namespace internal
 }  // namespace ash