Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(59)

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: rebase 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
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 7e5c239d276866b2d13ee623da9702dd81def050..655539df265e13883de9a48017d53f98ea009fab 100644
--- a/ash/common/system/tray/system_tray.cc
+++ b/ash/common/system/tray/system_tray.cc
@@ -538,8 +538,11 @@ void SystemTray::ShowItems(const std::vector<SystemTrayItem*>& items,
BubbleCreationType creation_type,
bool persistent) {
// No system tray bubbles in kiosk mode.
- if (WmShell::Get()->system_tray_delegate()->GetUserLoginStatus() ==
- LoginStatus::KIOSK_APP) {
+ SystemTrayDelegate* system_tray_delegate =
+ WmShell::Get()->system_tray_delegate();
+ if (system_tray_delegate->GetUserLoginStatus() == LoginStatus::KIOSK_APP ||
+ system_tray_delegate->GetUserLoginStatus() ==
+ LoginStatus::ARC_KIOSK_APP) {
return;
}
« no previous file with comments | « ash/common/system/overview/overview_button_tray.cc ('k') | ash/common/wm/overview/window_selector_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698