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

Unified Diff: ash/common/system/overview/overview_button_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: Addressing comments + unit test build fix. 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 | « no previous file | ash/common/system/tray/system_tray.cc » ('j') | chrome/browser/app_mode/app_mode_utils.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/common/system/overview/overview_button_tray.cc
diff --git a/ash/common/system/overview/overview_button_tray.cc b/ash/common/system/overview/overview_button_tray.cc
index f88134f04213d3c94ee58a0624651ae6f70a7d93..0b67e14ec446a4fd68f8406de1efbde046d38f97 100644
--- a/ash/common/system/overview/overview_button_tray.cc
+++ b/ash/common/system/overview/overview_button_tray.cc
@@ -147,7 +147,9 @@ void OverviewButtonTray::UpdateIconVisibility() {
session_state_delegate->GetSessionState() ==
session_manager::SessionState::ACTIVE &&
shell->system_tray_delegate()->GetUserLoginStatus() !=
- LoginStatus::KIOSK_APP);
+ LoginStatus::KIOSK_APP &&
+ shell->system_tray_delegate()->GetUserLoginStatus() !=
+ LoginStatus::ARC_KIOSK_APP);
}
} // namespace ash
« no previous file with comments | « no previous file | ash/common/system/tray/system_tray.cc » ('j') | chrome/browser/app_mode/app_mode_utils.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698