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

Unified Diff: chrome/browser/ui/webui/options/browser_options_handler.cc

Issue 15715014: app_mode: Add a flag for kiosk app settings UI. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 years, 7 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/about_flags.cc ('k') | chromeos/chromeos_switches.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/webui/options/browser_options_handler.cc
diff --git a/chrome/browser/ui/webui/options/browser_options_handler.cc b/chrome/browser/ui/webui/options/browser_options_handler.cc
index 1ac1a6289be43e7bdc3a66c483654fa2c0af6782..7edd6073f4c2cb34da9d37f2273e21df176c304a 100644
--- a/chrome/browser/ui/webui/options/browser_options_handler.cc
+++ b/chrome/browser/ui/webui/options/browser_options_handler.cc
@@ -489,6 +489,8 @@ void BrowserOptionsHandler::GetLocalizedValues(DictionaryValue* values) {
// Sets flag of whether kiosk section should be enabled.
values->SetBoolean(
"enableKioskSection",
+ CommandLine::ForCurrentProcess()->HasSwitch(
+ chromeos::switches::kEnableKioskAppSettings) &&
!CommandLine::ForCurrentProcess()->HasSwitch(
chromeos::switches::kDisableAppMode) &&
(chromeos::UserManager::Get()->IsCurrentUserOwner() ||
« no previous file with comments | « chrome/browser/about_flags.cc ('k') | chromeos/chromeos_switches.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698