chrome/browser/app_mode/app_mode_utils.cc - Issue 2498613003: Add ARC++ kiosk menu items and ability to start kiosk session.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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: Merge IsRunningInForcedAndroidAppMode() method with IsRunningInForcedAppMode() 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

« ash/common/wm/overview/window_selector_controller.cc ('K') | « ash/common/wm/overview/window_selector_controller.cc ('k') | chrome/browser/chromeos/arc/arc_auth_service.cc » ('j') | chrome/browser/chromeos/login/users/chrome_user_manager_impl.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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