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

Unified Diff: chrome/browser/ui/views/aura/chrome_shell_delegate.cc

Issue 9309088: Don't send lock screen request for guest sessions. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/aura/chrome_shell_delegate.cc
diff --git a/chrome/browser/ui/views/aura/chrome_shell_delegate.cc b/chrome/browser/ui/views/aura/chrome_shell_delegate.cc
index b182cf0b0fadeed180f611793a1a8c9e56de4b4a..ec14689c9c0b2e5a020658e3f70c896a64d20ec2 100644
--- a/chrome/browser/ui/views/aura/chrome_shell_delegate.cc
+++ b/chrome/browser/ui/views/aura/chrome_shell_delegate.cc
@@ -17,6 +17,7 @@
#include "chrome/browser/ui/views/aura/launcher_icon_updater.h"
#include "chrome/browser/ui/views/aura/status_area_host_aura.h"
#include "chrome/browser/ui/views/frame/browser_view.h"
+#include "chrome/common/chrome_switches.h"
#include "grit/theme_resources.h"
#include "ui/aura/window.h"
@@ -68,8 +69,10 @@ views::Widget* ChromeShellDelegate::CreateStatusArea() {
#if defined(OS_CHROMEOS)
void ChromeShellDelegate::LockScreen() {
- chromeos::DBusThreadManager::Get()->GetPowerManagerClient()->
- NotifyScreenLockRequested();
+ if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kGuestSession)) {
+ chromeos::DBusThreadManager::Get()->GetPowerManagerClient()->
+ NotifyScreenLockRequested();
+ }
}
#endif
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698