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

Index: chrome/browser/chromeos/dbus/chrome_display_power_service_provider_delegate.cc

diff --git a/chrome/browser/chromeos/dbus/chrome_display_power_service_provider_delegate.cc b/chrome/browser/chromeos/dbus/chrome_display_power_service_provider_delegate.cc

index 8382874f6763ebde6af45c4085b08238007ec0b1..9fc1718809e6b5ab4207787c3367ea960c9da52c 100644

--- a/chrome/browser/chromeos/dbus/chrome_display_power_service_provider_delegate.cc

+++ b/chrome/browser/chromeos/dbus/chrome_display_power_service_provider_delegate.cc

@@ -5,8 +5,8 @@

#include "chrome/browser/chromeos/dbus/chrome_display_power_service_provider_delegate.h"

#include "ash/shell.h"

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

#include "ui/display/chromeos/display_configurator.h"

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

namespace chromeos {

@@ -24,7 +24,7 @@ void ChromeDisplayPowerServiceProviderDelegate::SetDisplayPower(

// we suspend may trigger a mouse move, which would then be incorrectly

// reported as user activity. Let the UserActivityDetector

// know so that it can ignore such events.

- wm::UserActivityDetector::Get()->OnDisplayPowerChanging();

+ ui::UserActivityDetector::Get()->OnDisplayPowerChanging();

ash::Shell::GetInstance()->display_configurator()->SetDisplayPower(

power_state, ui::DisplayConfigurator::kSetDisplayPowerNoFlags);