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

Index: chrome/browser/chromeos/idle_detector.h

diff --git a/chrome/browser/chromeos/idle_detector.h b/chrome/browser/chromeos/idle_detector.h

index e2b74d3149dd7092358dfab5fec4c0990c04744a..fd59efdd325713ecc68edb05d99c9a5fdc29738a 100644

--- a/chrome/browser/chromeos/idle_detector.h

+++ b/chrome/browser/chromeos/idle_detector.h

@@ -10,11 +10,11 @@

#include "base/compiler_specific.h"

#include "base/time/time.h"

#include "base/timer/timer.h"

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

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

namespace chromeos {

-class IdleDetector : public wm::UserActivityObserver {

+class IdleDetector : public ui::UserActivityObserver {

public:

explicit IdleDetector(const base::Closure& on_idle_callback);

virtual ~IdleDetector();

@@ -22,7 +22,7 @@ class IdleDetector : public wm::UserActivityObserver {

void Start(const base::TimeDelta& timeout);

private:

- // wm::UserActivityObserver overrides:

+ // ui::UserActivityObserver overrides:

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

// Resets |timer_| to fire when we reach our idle timeout.