ash/common/system/tray/system_tray.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: ash/common/system/tray/system_tray.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

« no previous file with comments | « ash/common/system/overview/overview_button_tray.cc ('k') | ash/common/wm/overview/window_selector_controller.cc » ('j') | ash/common/wm/overview/window_selector_controller.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: ash/common/system/tray/system_tray.cc

diff --git a/ash/common/system/tray/system_tray.cc b/ash/common/system/tray/system_tray.cc

index a530f0b62738bdf32f983228740d522d92acd94c..e8285ff72d44c48dab54d32e9204f2c97909ee54 100644

--- a/ash/common/system/tray/system_tray.cc

+++ b/ash/common/system/tray/system_tray.cc

@@ -567,7 +567,9 @@ void SystemTray::ShowItems(const std::vector<SystemTrayItem*>& items,

bool persistent) {

// No system tray bubbles in kiosk mode.

if (WmShell::Get()->system_tray_delegate()->GetUserLoginStatus() ==

oshima 2016/11/16 19:52:35 nit: please get the pointer to system tray delegat

Sergey Poromov 2016/11/17 12:33:13 Done.

- LoginStatus::KIOSK_APP) {

+ LoginStatus::KIOSK_APP ||

+ WmShell::Get()->system_tray_delegate()->GetUserLoginStatus() ==

+ LoginStatus::ARC_KIOSK_APP) {

return;

}