| 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..24e6cfd33d05945a9b55fc3c6e6e7c503bd1bf06 100644
|
| --- a/chrome/browser/ui/ash/system_tray_delegate_chromeos.cc
|
| +++ b/chrome/browser/ui/ash/system_tray_delegate_chromeos.cc
|
| @@ -488,7 +488,9 @@ void SystemTrayDelegateChromeOS::ShowSetTimeDialog() {
|
|
|
| void SystemTrayDelegateChromeOS::ShowNetworkSettings(
|
| const std::string& service_path) {
|
| - if (!LoginState::Get()->IsUserLoggedIn())
|
| + if (!LoginState::Get()->IsUserLoggedIn() ||
|
| + ash::Shell::GetInstance()->session_state_delegate()->GetSessionState() ==
|
| + ash::SessionStateDelegate::SESSION_STATE_LOGIN_SECONDARY)
|
| return;
|
| ShowNetworkSettingsPage(service_path);
|
| }
|
| @@ -581,7 +583,9 @@ void SystemTrayDelegateChromeOS::ShowSupervisedUserInfo() {
|
| void SystemTrayDelegateChromeOS::ShowEnterpriseInfo() {
|
| ash::user::LoginStatus status = GetUserLoginStatus();
|
| if (status == ash::user::LOGGED_IN_NONE ||
|
| - status == ash::user::LOGGED_IN_LOCKED) {
|
| + status == ash::user::LOGGED_IN_LOCKED ||
|
| + ash::Shell::GetInstance()->session_state_delegate()->GetSessionState() ==
|
| + ash::SessionStateDelegate::SESSION_STATE_LOGIN_SECONDARY) {
|
| scoped_refptr<chromeos::HelpAppLauncher> help_app(
|
| new chromeos::HelpAppLauncher(GetNativeWindow()));
|
| help_app->ShowHelpTopic(chromeos::HelpAppLauncher::HELP_ENTERPRISE);
|
|
|