chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.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/chromeos/login/users/wallpaper/wallpaper_manager.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

« chrome/browser/chromeos/login/users/chrome_user_manager_impl.cc ('K') | « chrome/browser/chromeos/login/users/mock_user_manager.h ('k') | chrome/browser/resources/chromeos/login/apps_menu.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.cc

diff --git a/chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.cc b/chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.cc

index 52455a061c3a7e6fcd140e062bb02d1e91bea796..f69d0bd2e198ab4be7a49a1917b9426b3dc9486a 100644

--- a/chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.cc

+++ b/chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.cc

@@ -696,8 +696,10 @@ void WallpaperManager::ScheduleSetUserWallpaper(const AccountId& account_id,

user_manager::UserManager::Get()->FindUser(account_id);

// User is unknown or there is no visible wallpaper in kiosk mode.

- if (!user || user->GetType() == user_manager::USER_TYPE_KIOSK_APP)

+ if (!user || user->GetType() == user_manager::USER_TYPE_KIOSK_APP ||

+ user->GetType() == user_manager::USER_TYPE_ARC_KIOSK_APP) {

return;

+ }

// Guest user or regular user in ephemeral mode.

if ((user_manager::UserManager::Get()->IsUserNonCryptohomeDataEphemeral(