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

Unified Diff: chrome/browser/ui/ash/system_tray_delegate_chromeos.cc

Issue 357323002: Tray elements behave appropriately on the multiple signin screen (more like lock screen) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Stored result of check on multiple signin screen to local variable Created 6 years, 5 months 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: chrome/browser/ui/ash/system_tray_delegate_chromeos.cc
diff --git a/chrome/browser/ui/ash/system_tray_delegate_chromeos.cc b/chrome/browser/ui/ash/system_tray_delegate_chromeos.cc
index b0aa84a281eedd0db618792687cc644fd97a8122..8f9c5e1270ec82ff5709376579d839c322679218 100644
--- a/chrome/browser/ui/ash/system_tray_delegate_chromeos.cc
+++ b/chrome/browser/ui/ash/system_tray_delegate_chromeos.cc
@@ -488,7 +488,11 @@ void SystemTrayDelegateChromeOS::ShowSetTimeDialog() {
void SystemTrayDelegateChromeOS::ShowNetworkSettings(
const std::string& service_path) {
- if (!LoginState::Get()->IsUserLoggedIn())
+ bool userAddingRunning =
+ (ash::Shell::GetInstance()->session_state_delegate()->GetSessionState() ==
+ ash::SessionStateDelegate::SESSION_STATE_LOGIN_SECONDARY);
+
+ if (!LoginState::Get()->IsUserLoggedIn() || userAddingRunning)
return;
ShowNetworkSettingsPage(service_path);
}
@@ -580,8 +584,12 @@ void SystemTrayDelegateChromeOS::ShowSupervisedUserInfo() {
void SystemTrayDelegateChromeOS::ShowEnterpriseInfo() {
ash::user::LoginStatus status = GetUserLoginStatus();
+ bool userAddingRunning =
+ (ash::Shell::GetInstance()->session_state_delegate()->GetSessionState() ==
+ ash::SessionStateDelegate::SESSION_STATE_LOGIN_SECONDARY);
+
if (status == ash::user::LOGGED_IN_NONE ||
- status == ash::user::LOGGED_IN_LOCKED) {
+ status == ash::user::LOGGED_IN_LOCKED || userAddingRunning) {
scoped_refptr<chromeos::HelpAppLauncher> help_app(
new chromeos::HelpAppLauncher(GetNativeWindow()));
help_app->ShowHelpTopic(chromeos::HelpAppLauncher::HELP_ENTERPRISE);

Powered by Google App Engine
This is Rietveld 408576698