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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/ui/browser.cc

Issue 9701084: Integrate Kiosk Mode with enterprise policies. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: yacf Created 8 years, 9 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/ui/screensaver_extension_dialog.cc ('k') | chrome/browser/ui/webui/chromeos/login/oobe_ui.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/browser.cc
diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc
index 5199768c34332efe0bd22c5279545c78a39b48b2..134f9687f74487cb4eb28f0f35876ae83a5db7a8 100644
--- a/chrome/browser/ui/browser.cc
+++ b/chrome/browser/ui/browser.cc
@@ -207,7 +207,7 @@
#include "chrome/browser/chromeos/boot_times_loader.h"
#include "chrome/browser/chromeos/dbus/dbus_thread_manager.h"
#include "chrome/browser/chromeos/dbus/power_manager_client.h"
-#include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_helper.h"
+#include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings.h"
#if defined(USE_AURA)
#include "chrome/browser/extensions/api/terminal/terminal_extension_helper.h"
#endif
@@ -2507,7 +2507,7 @@ void Browser::OpenFileManager() {
void Browser::LockScreen() {
content::RecordAction(UserMetricsAction("LockScreen"));
// Never lock the screen for kiosk mode.
- if (chromeos::KioskModeHelper::IsKioskModeEnabled())
+ if (chromeos::KioskModeSettings::Get()->IsKioskModeEnabled())
return;
chromeos::DBusThreadManager::Get()->GetPowerManagerClient()->
NotifyScreenLockRequested();
« no previous file with comments | « chrome/browser/chromeos/ui/screensaver_extension_dialog.cc ('k') | chrome/browser/ui/webui/chromeos/login/oobe_ui.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698