Index: ash/system/chromeos/network/network_state_list_detailed_view.cc |
diff --git a/ash/system/chromeos/network/network_state_list_detailed_view.cc b/ash/system/chromeos/network/network_state_list_detailed_view.cc |
index 821d009ad4d1bd25645ed3003e2ddd8f95aae71f..28e85451325f496e3c5e725e8c1e0a62eb40977b 100644 |
--- a/ash/system/chromeos/network/network_state_list_detailed_view.cc |
+++ b/ash/system/chromeos/network/network_state_list_detailed_view.cc |
@@ -7,6 +7,7 @@ |
#include "ash/ash_switches.h" |
#include "ash/metrics/user_metrics_recorder.h" |
#include "ash/root_window_controller.h" |
+#include "ash/session/session_state_delegate.h" |
#include "ash/shell.h" |
#include "ash/shell_delegate.h" |
#include "ash/shell_window_ids.h" |
@@ -740,8 +741,10 @@ void NetworkStateListDetailedView::UpdateNetworkExtra() { |
void NetworkStateListDetailedView::CreateSettingsEntry() { |
ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance(); |
- bool show_settings = ash::Shell::GetInstance()-> |
- system_tray_delegate()->ShouldShowSettings(); |
+ bool show_settings = |
+ ash::Shell::GetInstance()->system_tray_delegate()->ShouldShowSettings() && |
+ ash::Shell::GetInstance()->session_state_delegate()->GetSessionState() != |
+ ash::SessionStateDelegate::SESSION_STATE_LOGIN_SECONDARY; |
if (login_ != user::LOGGED_IN_NONE) { |
// Allow user access settings only if user is logged in |
// and showing settings is allowed. There're situations (supervised user |