chrome/browser/ui/ash/chrome_launcher_prefs.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/ui/ash/chrome_launcher_prefs.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: 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

« chrome/browser/chromeos/login/session/user_session_manager.cc ('K') | « chrome/browser/resources/chromeos/login/apps_menu.js ('k') | chrome/browser/ui/ash/chrome_shell_delegate.cc » ('j') | chrome/browser/ui/webui/chromeos/login/kiosk_app_menu_handler.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/ash/chrome_launcher_prefs.cc

diff --git a/chrome/browser/ui/ash/chrome_launcher_prefs.cc b/chrome/browser/ui/ash/chrome_launcher_prefs.cc

index 4a0dadd68712d71ae366cd42afe11da85396ea58..53a96737d1416699e25843113f9765f1f4b78f68 100644

--- a/chrome/browser/ui/ash/chrome_launcher_prefs.cc

+++ b/chrome/browser/ui/ash/chrome_launcher_prefs.cc

@@ -345,7 +345,7 @@ ShelfAutoHideBehavior GetShelfAutoHideBehaviorPref(PrefService* prefs,

DCHECK_NE(display_id, display::Display::kInvalidDisplayID);

// Don't show the shelf in app mode.

- if (chrome::IsRunningInAppMode())

+ if (chrome::IsRunningInAppMode() || chrome::IsRunningInAndroidAppMode())

return SHELF_AUTO_HIDE_ALWAYS_HIDDEN;

// See comment in |kShelfAlignment| as to why we consider two prefs.