chrome/browser/chromeos/app_mode/kiosk_mode_idle_app_name_notification.cc - Issue 833893003: Move UserActivityDetector to ui/base/user_activity/.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/chromeos/app_mode/kiosk_mode_idle_app_name_notification.cc

Issue 833893003: Move UserActivityDetector to ui/base/user_activity/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: don't build test on android Created 5 years, 11 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/chromeos/app_mode/kiosk_mode_idle_app_name_notification.h ('k') | chrome/browser/chromeos/dbus/chrome_display_power_service_provider_delegate.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/app_mode/kiosk_mode_idle_app_name_notification.cc

diff --git a/chrome/browser/chromeos/app_mode/kiosk_mode_idle_app_name_notification.cc b/chrome/browser/chromeos/app_mode/kiosk_mode_idle_app_name_notification.cc

index 7d9fe0f11873e76a6f450af6a62b531b8ca3c073..857d48a28e4a3a9a77b8b6b3c098a653b0fc5708 100644

--- a/chrome/browser/chromeos/app_mode/kiosk_mode_idle_app_name_notification.cc

+++ b/chrome/browser/chromeos/app_mode/kiosk_mode_idle_app_name_notification.cc

@@ -14,7 +14,7 @@

#include "chromeos/dbus/dbus_thread_manager.h"

#include "components/user_manager/user_manager.h"

#include "extensions/browser/extension_system.h"

-#include "ui/wm/core/user_activity_detector.h"

+#include "ui/base/user_activity/user_activity_detector.h"

namespace chromeos {

@@ -56,8 +56,8 @@ KioskModeIdleAppNameNotification::KioskModeIdleAppNameNotification()

}

KioskModeIdleAppNameNotification::~KioskModeIdleAppNameNotification() {

- wm::UserActivityDetector* user_activity_detector =

- wm::UserActivityDetector::Get();

+ ui::UserActivityDetector* user_activity_detector =

+ ui::UserActivityDetector::Get();

if (user_activity_detector && user_activity_detector->HasObserver(this)) {

user_activity_detector->RemoveObserver(this);

// At this time the DBusThreadManager might already be gone.

@@ -98,8 +98,8 @@ void KioskModeIdleAppNameNotification::SuspendDone(

}

void KioskModeIdleAppNameNotification::Start() {

- if (!wm::UserActivityDetector::Get()->HasObserver(this)) {

- wm::UserActivityDetector::Get()->AddObserver(this);

+ if (!ui::UserActivityDetector::Get()->HasObserver(this)) {

+ ui::UserActivityDetector::Get()->AddObserver(this);

chromeos::DBusThreadManager::Get()->GetPowerManagerClient()->AddObserver(

this);

}