ash/system/chromeos/network/network_state_list_detailed_view.cc - Issue 357323002: Tray elements behave appropriately on the multiple signin screen (more like lock screen)

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ash/system/chromeos/network/network_state_list_detailed_view.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

« ash/system/bluetooth/tray_bluetooth.cc ('K') | « ash/system/bluetooth/tray_bluetooth.cc ('k') | ash/system/chromeos/network/tray_vpn.cc » ('j') | ash/system/chromeos/network/tray_vpn.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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..7d1169ac38a759405590d32214c5066952820266 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,14 @@ void NetworkStateListDetailedView::UpdateNetworkExtra() {

void NetworkStateListDetailedView::CreateSettingsEntry() {

ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();

- bool show_settings = ash::Shell::GetInstance()->

- system_tray_delegate()->ShouldShowSettings();

+ bool userAddingRunning =

+ (ash::Shell::GetInstance()->session_state_delegate()->GetSessionState() ==

+ ash::SessionStateDelegate::SESSION_STATE_LOGIN_SECONDARY);

oshima 2014/08/01 20:31:22 shouldn't this be in ShouldShowSettings() ?

Roman Sorokin (ftl) 2014/08/05 13:44:09 Done.

+ bool show_settings =

+ ash::Shell::GetInstance()->system_tray_delegate()->ShouldShowSettings() &&

+ !userAddingRunning;

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

« ash/system/bluetooth/tray_bluetooth.cc ('K') | « ash/system/bluetooth/tray_bluetooth.cc ('k') | ash/system/chromeos/network/tray_vpn.cc » ('j') | ash/system/chromeos/network/tray_vpn.cc » ('J')