trunk/src/chrome/browser/ui/ash/chrome_shell_delegate.h - Issue 14200038: Revert 194589 "Revert 194578 "Add ash SessionStateDelegate""

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: trunk/src/chrome/browser/ui/ash/chrome_shell_delegate.h

Issue 14200038: Revert 194589 "Revert 194578 "Add ash SessionStateDelegate"" (Closed) Base URL: svn://svn.chromium.org/chrome/

Patch Set: Created 7 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:

Index: trunk/src/chrome/browser/ui/ash/chrome_shell_delegate.h

===================================================================

--- trunk/src/chrome/browser/ui/ash/chrome_shell_delegate.h (revision 194599)

+++ trunk/src/chrome/browser/ui/ash/chrome_shell_delegate.h (working copy)

@@ -47,16 +47,9 @@

}

// ash::ShellDelegate overrides;

- virtual bool IsUserLoggedIn() const OVERRIDE;

- virtual bool IsSessionStarted() const OVERRIDE;

- virtual bool IsGuestSession() const OVERRIDE;

virtual bool IsFirstRunAfterBoot() const OVERRIDE;

virtual bool IsMultiProfilesEnabled() const OVERRIDE;

virtual bool IsRunningInForcedAppMode() const OVERRIDE;

- virtual bool CanLockScreen() const OVERRIDE;

- virtual void LockScreen() OVERRIDE;

- virtual void UnlockScreen() OVERRIDE;

- virtual bool IsScreenLocked() const OVERRIDE;

virtual void PreInit() OVERRIDE;

virtual void Shutdown() OVERRIDE;

virtual void Exit() OVERRIDE;

@@ -89,6 +82,7 @@

virtual ash::SystemTrayDelegate* CreateSystemTrayDelegate() OVERRIDE;

virtual ash::UserWallpaperDelegate* CreateUserWallpaperDelegate() OVERRIDE;

virtual ash::CapsLockDelegate* CreateCapsLockDelegate() OVERRIDE;

+ virtual ash::SessionStateDelegate* CreateSessionStateDelegate() OVERRIDE;

virtual aura::client::UserActionClient* CreateUserActionClient() OVERRIDE;

virtual void OpenFeedbackPage() OVERRIDE;

virtual void RecordUserMetricsAction(ash::UserMetricsAction action) OVERRIDE;

Property changes on: trunk/src/chrome/browser/ui/ash/chrome_shell_delegate.h

___________________________________________________________________

Added: svn:mergeinfo