chrome/browser/chromeos/policy/recommendation_restorer.h - 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/policy/recommendation_restorer.h

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/login/ui/webui_login_display.cc ('k') | chrome/browser/chromeos/policy/recommendation_restorer.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/policy/recommendation_restorer.h

diff --git a/chrome/browser/chromeos/policy/recommendation_restorer.h b/chrome/browser/chromeos/policy/recommendation_restorer.h

index 4e96c60b852b8b7f679a2b1b2b5a7abf84d2502e..6879d899489244986d158b7999ad178f3e2a6e97 100644

--- a/chrome/browser/chromeos/policy/recommendation_restorer.h

+++ b/chrome/browser/chromeos/policy/recommendation_restorer.h

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

#include "components/keyed_service/core/keyed_service.h"

#include "content/public/browser/notification_observer.h"

#include "content/public/browser/notification_registrar.h"

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

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

class Profile;

@@ -28,7 +28,7 @@ namespace policy {

// becomes idle for one minute.

class RecommendationRestorer : public KeyedService,

public content::NotificationObserver,

- public wm::UserActivityObserver {

+ public ui::UserActivityObserver {

public:

explicit RecommendationRestorer(Profile* profile);

virtual ~RecommendationRestorer();

@@ -41,7 +41,7 @@ class RecommendationRestorer : public KeyedService,

const content::NotificationSource& source,

const content::NotificationDetails& details) override;

- // wm::UserActivityObserver:

+ // ui::UserActivityObserver:

virtual void OnUserActivity(const ui::Event* event) override;

// If a recommended value and a user setting exist for |pref_name|, clears the