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

Unified Diff: chrome/browser/app_mode/app_mode_utils.cc

Issue 2498613003: Add ARC++ kiosk menu items and ability to start kiosk session. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressing comments + unit test build fix. Created 4 years, 1 month 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
Index: chrome/browser/app_mode/app_mode_utils.cc
diff --git a/chrome/browser/app_mode/app_mode_utils.cc b/chrome/browser/app_mode/app_mode_utils.cc
index 758bd844ab33d992ebf0e9a27df8e352a68ba219..fef718da4c21349e069a0fc8e2b1fffd6c5e0cfc 100644
--- a/chrome/browser/app_mode/app_mode_utils.cc
+++ b/chrome/browser/app_mode/app_mode_utils.cc
@@ -45,7 +45,7 @@ bool IsCommandAllowedInAppMode(int command_id) {
bool IsRunningInAppMode() {
base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
return command_line->HasSwitch(switches::kKioskMode) ||
- IsRunningInForcedAppMode();
+ IsRunningInForcedAppMode() || IsRunningInForcedAndroidAppMode();
}
bool IsRunningInForcedAppMode() {
@@ -54,4 +54,9 @@ bool IsRunningInForcedAppMode() {
command_line->HasSwitch(switches::kAppId);
}
+bool IsRunningInForcedAndroidAppMode() {
xiyuan 2016/11/15 16:56:25 Do we need to differentiate this from IsRunningInF
Sergey Poromov 2016/11/16 15:06:21 Looks like there is no difference right now. If yo
xiyuan 2016/11/16 17:28:55 Thanks.
+ base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
+ return command_line->HasSwitch(switches::kForceAndroidAppMode);
+}
+
} // namespace chrome

Powered by Google App Engine
This is Rietveld 408576698