chrome/browser/chromeos/app_mode/kiosk_mode_idle_app_name_notification.cc - Issue 240343004: chromeos: Update IdleActionImminent and SuspendDone handling

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 240343004: chromeos: Update IdleActionImminent and SuspendDone handling (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: merge Created 6 years, 8 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/extensions/extension_system_event_observer.h » ('j') | chromeos/dbus/fake_power_manager_client.h » ('J')
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 8bbf815889a7b80c25875e495606aa482451c5ea..089795edbfbf4403191b3a322fd489a8dafe126e 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

@@ -89,7 +89,7 @@ void KioskModeIdleAppNameNotification::OnUserActivity(const ui::Event* event) {

ResetTimer();

}

-void KioskModeIdleAppNameNotification::SystemResumed(

+void KioskModeIdleAppNameNotification::SuspendDone(

const base::TimeDelta& sleep_duration) {

// When we come back from a system resume we stop the timer and show the

// message.