Let chromeos::User decide whether the current session can be locked

We have several different methods that try to determine whether the
current session can be locked. This redundancy is difficult to maintain
and has drifted out of sync in the past. The CL consolidates all checks
and makes the chromeos::User class the autoritative source for whether
the current session can be locked or not.

BUG=152928


Review URL: https://chromiumcodereview.appspot.com/11412100

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@169031 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 5 insertions, 0 deletions

diff --git a/ash/shell/shell_delegate_impl.cc b/ash/shell/shell_delegate_impl.cc
index 4f0f022..42311ca 100644
--- a/ash/shell/shell_delegate_impl.cc
+++ b/ash/shell/shell_delegate_impl.cc
@@ -46,6 +46,10 @@ bool ShellDelegateImpl::IsFirstRunAfterBoot() {
   return false;
 }
 
+bool ShellDelegateImpl::CanLockScreen() {
+  return true;
+}
+
 void ShellDelegateImpl::LockScreen() {
   ash::shell::CreateLockScreen();
   locked_ = true;
diff --git a/ash/shell/shell_delegate_impl.h b/ash/shell/shell_delegate_impl.h
index 6f55237..9e34aff 100644
--- a/ash/shell/shell_delegate_impl.h
+++ b/ash/shell/shell_delegate_impl.h
@@ -24,6 +24,7 @@ class ShellDelegateImpl : public ash::ShellDelegate {
   virtual bool IsUserLoggedIn() OVERRIDE;
   virtual bool IsSessionStarted() OVERRIDE;
   virtual bool IsFirstRunAfterBoot() OVERRIDE;
+  virtual bool CanLockScreen() OVERRIDE;
   virtual void LockScreen() OVERRIDE;
   virtual void UnlockScreen() OVERRIDE;
   virtual bool IsScreenLocked() const OVERRIDE;