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..028867d74dc3eedc954d13dcafcad7469056dc40 100644 |
--- a/chrome/browser/app_mode/app_mode_utils.cc |
+++ b/chrome/browser/app_mode/app_mode_utils.cc |
@@ -45,13 +45,14 @@ bool IsCommandAllowedInAppMode(int command_id) { |
bool IsRunningInAppMode() { |
base::CommandLine* command_line = base::CommandLine::ForCurrentProcess(); |
return command_line->HasSwitch(switches::kKioskMode) || |
- IsRunningInForcedAppMode(); |
+ IsRunningInForcedAppMode(); |
} |
bool IsRunningInForcedAppMode() { |
base::CommandLine* command_line = base::CommandLine::ForCurrentProcess(); |
- return command_line->HasSwitch(switches::kForceAppMode) && |
- command_line->HasSwitch(switches::kAppId); |
+ return (command_line->HasSwitch(switches::kForceAppMode) && |
+ command_line->HasSwitch(switches::kAppId)) || |
+ command_line->HasSwitch(switches::kForceAndroidAppMode); |
} |
} // namespace chrome |