ash/system/overview/overview_button_tray.cc - Issue 2084503007: Moves WindowSelectorController onto WmShell

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

Issue 2084503007: Moves WindowSelectorController onto WmShell (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@move_overview

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

« no previous file with comments | « ash/shell.cc ('k') | ash/system/overview/overview_button_tray_unittest.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/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 54 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
65 Shell::GetInstance()->session_state_delegate()->RemoveSessionStateObserver(	65 Shell::GetInstance()->session_state_delegate()->RemoveSessionStateObserver(

66 this);	66 this);

67 }	67 }

68	68

69 void OverviewButtonTray::UpdateAfterLoginStatusChange(LoginStatus status) {	69 void OverviewButtonTray::UpdateAfterLoginStatusChange(LoginStatus status) {

70 UpdateIconVisibility();	70 UpdateIconVisibility();

71 }	71 }

72	72

73 bool OverviewButtonTray::PerformAction(const ui::Event& event) {	73 bool OverviewButtonTray::PerformAction(const ui::Event& event) {

74 WindowSelectorController* controller =	74 WindowSelectorController* controller =

75 Shell::GetInstance()->window_selector_controller();	75 WmShell::Get()->window_selector_controller();

76 controller->ToggleOverview();	76 controller->ToggleOverview();

77 SetDrawBackgroundAsActive(controller->IsSelecting());	77 SetDrawBackgroundAsActive(controller->IsSelecting());

78 Shell::GetInstance()->metrics()->RecordUserMetricsAction(UMA_TRAY_OVERVIEW);	78 Shell::GetInstance()->metrics()->RecordUserMetricsAction(UMA_TRAY_OVERVIEW);

79 return true;	79 return true;

80 }	80 }

81	81

82 void OverviewButtonTray::SessionStateChanged(	82 void OverviewButtonTray::SessionStateChanged(

83 SessionStateDelegate::SessionState state) {	83 SessionStateDelegate::SessionState state) {

84 UpdateIconVisibility();	84 UpdateIconVisibility();

85 }	85 }

(...skipping 58 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
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 WmShell::Get()->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