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

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

Issue 2766543002: Move even more from WmShell to Shell (Closed)

Patch Set: 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:

« no previous file with comments | « ash/common/system/chromeos/media_security/multi_profile_media_tray_item_unittest.cc ('k') | ash/common/system/user/user_card_view.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 91 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
102 const int horizontal_padding = (kTrayItemSize - image.width()) / 2;	102 const int horizontal_padding = (kTrayItemSize - image.width()) / 2;

103 icon_->SetBorder(views::CreateEmptyBorder(	103 icon_->SetBorder(views::CreateEmptyBorder(

104 gfx::Insets(vertical_padding, horizontal_padding)));	104 gfx::Insets(vertical_padding, horizontal_padding)));

105 }	105 }

106	106

107 void OverviewButtonTray::UpdateIconVisibility() {	107 void OverviewButtonTray::UpdateIconVisibility() {

108 // The visibility of the OverviewButtonTray has diverged from	108 // The visibility of the OverviewButtonTray has diverged from

109 // WindowSelectorController::CanSelect. The visibility of the button should	109 // WindowSelectorController::CanSelect. The visibility of the button should

110 // not change during transient times in which CanSelect is false. Such as when	110 // not change during transient times in which CanSelect is false. Such as when

111 // a modal dialog is present.	111 // a modal dialog is present.

112 WmShell* shell = WmShell::Get();	112 SessionController* session_controller = WmShell::Get()->session_controller();

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

114	113

	114 Shell* shell = Shell::Get();

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::Get()->system_tray_delegate()->GetUserLoginStatus() !=	121 shell->system_tray_delegate()->GetUserLoginStatus() !=

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

123 Shell::Get()->system_tray_delegate()->GetUserLoginStatus() !=	123 shell->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