ash/common/system/overview/overview_button_tray.cc - Issue 2761063002: Move more from WmShell to Shell

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/common/system/overview/overview_button_tray.cc

Issue 2761063002: Move more from WmShell to Shell (Closed)

Patch Set: merge Created 3 years, 9 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

« no previous file with comments | « ash/common/system/ime/tray_ime_chromeos.cc ('k') | ash/common/system/status_area_widget.cc » ('j') | no next file with comments »

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/common/system/overview/overview_button_tray.h"	5 #include "ash/common/system/overview/overview_button_tray.h"

6	6

7 #include "ash/common/session/session_controller.h"	7 #include "ash/common/session/session_controller.h"

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

9 #include "ash/common/system/tray/system_tray_delegate.h"	9 #include "ash/common/system/tray/system_tray_delegate.h"

10 #include "ash/common/system/tray/tray_constants.h"	10 #include "ash/common/system/tray/tray_constants.h"

(...skipping 100 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
111 // a modal dialog is present.	111 // a modal dialog is present.

112 WmShell* shell = WmShell::Get();	112 WmShell* shell = WmShell::Get();

113 SessionController* session_controller = shell->session_controller();	113 SessionController* session_controller = shell->session_controller();

114	114

115 SetVisible(	115 SetVisible(

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

117 session_controller->IsActiveUserSessionStarted() &&	117 session_controller->IsActiveUserSessionStarted() &&

118 !session_controller->IsScreenLocked() &&	118 !session_controller->IsScreenLocked() &&

119 session_controller->GetSessionState() ==	119 session_controller->GetSessionState() ==

120 session_manager::SessionState::ACTIVE &&	120 session_manager::SessionState::ACTIVE &&

121 shell->system_tray_delegate()->GetUserLoginStatus() !=	121 Shell::Get()->system_tray_delegate()->GetUserLoginStatus() !=

122 LoginStatus::KIOSK_APP &&	122 LoginStatus::KIOSK_APP &&

123 shell->system_tray_delegate()->GetUserLoginStatus() !=	123 Shell::Get()->system_tray_delegate()->GetUserLoginStatus() !=

124 LoginStatus::ARC_KIOSK_APP);	124 LoginStatus::ARC_KIOSK_APP);

125 }	125 }

126	126

127 } // namespace ash	127 } // namespace ash

OLD	NEW