ash/system/overview/overview_button_tray.cc - Issue 2058173002: mash: Move SystemTrayDelegate ownership to WmShell

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side Diff: ash/system/overview/overview_button_tray.cc

Issue 2058173002: mash: Move SystemTrayDelegate ownership to WmShell (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: review feedback Created 4 years, 6 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 unified diff | Download patch

OLD	NEW
1 // Copyright 2014 The Chromium Authors. All rights reserved.	1 // Copyright 2014 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #include "ash/system/overview/overview_button_tray.h"	5 #include "ash/system/overview/overview_button_tray.h"

6	6

7 #include "ash/common/material_design/material_design_controller.h"	7 #include "ash/common/material_design/material_design_controller.h"

8 #include "ash/common/session/session_state_delegate.h"	8 #include "ash/common/session/session_state_delegate.h"

9 #include "ash/common/shelf/shelf_constants.h"	9 #include "ash/common/shelf/shelf_constants.h"

10 #include "ash/common/shelf/shelf_types.h"	10 #include "ash/common/shelf/shelf_types.h"

(...skipping 128 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
139 Shell* shell = Shell::GetInstance();	139 Shell* shell = Shell::GetInstance();

140 SessionStateDelegate* session_state_delegate =	140 SessionStateDelegate* session_state_delegate =

141 shell->session_state_delegate();	141 shell->session_state_delegate();

142	142

143 SetVisible(	143 SetVisible(

144 shell->maximize_mode_controller()->IsMaximizeModeWindowManagerEnabled() &&	144 shell->maximize_mode_controller()->IsMaximizeModeWindowManagerEnabled() &&

145 session_state_delegate->IsActiveUserSessionStarted() &&	145 session_state_delegate->IsActiveUserSessionStarted() &&

146 !session_state_delegate->IsScreenLocked() &&	146 !session_state_delegate->IsScreenLocked() &&

147 session_state_delegate->GetSessionState() ==	147 session_state_delegate->GetSessionState() ==

148 SessionStateDelegate::SESSION_STATE_ACTIVE &&	148 SessionStateDelegate::SESSION_STATE_ACTIVE &&

149 shell->system_tray_delegate()->GetUserLoginStatus() !=	149 WmShell::Get()->system_tray_delegate()->GetUserLoginStatus() !=

150 LoginStatus::KIOSK_APP);	150 LoginStatus::KIOSK_APP);

151 }	151 }

152	152

153 } // namespace ash	153 } // namespace ash

OLD	NEW