Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(450)

Unified Diff: chrome/browser/chromeos/login/screen_locker.cc

Issue 8842002: Remove lock screen item from menu and disable screen lock on guest session. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years 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 | « no previous file | chrome/browser/ui/toolbar/wrench_menu_model_chromeos.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/login/screen_locker.cc
diff --git a/chrome/browser/chromeos/login/screen_locker.cc b/chrome/browser/chromeos/login/screen_locker.cc
index 6a86ae495bd83f2d1e11d3aa8a72a17ba9cddc3c..8b441299bd7ed13c4713bf9c85f7937e5940702d 100644
--- a/chrome/browser/chromeos/login/screen_locker.cc
+++ b/chrome/browser/chromeos/login/screen_locker.cc
@@ -351,6 +351,15 @@ void ScreenLocker::Show() {
UserMetrics::RecordAction(UserMetricsAction("ScreenLocker_Show"));
DCHECK(MessageLoop::current()->type() == MessageLoop::TYPE_UI);
+ // Check whether the currently logged in user is a guest account and if so,
+ // refuse to lock the screen (crosbug.com/23764).
+ // TODO(flackr): We can allow lock screen for guest accounts when
+ // unlock_on_input is supported by the WebUI screen locker.
+ if (UserManager::Get()->logged_in_user().email().empty()) {
+ VLOG(1) << "Show: Refusing to lock screen for guest account.";
achuithb 2011/12/07 18:46:02 Could you please change this to DVLOG? And change
flackr 2011/12/07 19:05:55 Done.
+ return;
+ }
+
// Exit fullscreen.
Browser* browser = BrowserList::GetLastActive();
// browser can be NULL if we receive a lock request before the first browser
« no previous file with comments | « no previous file | chrome/browser/ui/toolbar/wrench_menu_model_chromeos.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698