Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(38)

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

Issue 2416253004: ash: Use session_manager::SessionState (Closed)
Patch Set: add comment about session state in SessionStaetDelegateChromeos Created 4 years, 2 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
OLDNEW
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/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/wm_shelf_util.h" 10 #include "ash/common/shelf/wm_shelf_util.h"
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
71 bool OverviewButtonTray::PerformAction(const ui::Event& event) { 71 bool OverviewButtonTray::PerformAction(const ui::Event& event) {
72 WindowSelectorController* controller = 72 WindowSelectorController* controller =
73 WmShell::Get()->window_selector_controller(); 73 WmShell::Get()->window_selector_controller();
74 controller->ToggleOverview(); 74 controller->ToggleOverview();
75 SetDrawBackgroundAsActive(controller->IsSelecting()); 75 SetDrawBackgroundAsActive(controller->IsSelecting());
76 WmShell::Get()->RecordUserMetricsAction(UMA_TRAY_OVERVIEW); 76 WmShell::Get()->RecordUserMetricsAction(UMA_TRAY_OVERVIEW);
77 return true; 77 return true;
78 } 78 }
79 79
80 void OverviewButtonTray::SessionStateChanged( 80 void OverviewButtonTray::SessionStateChanged(
81 SessionStateDelegate::SessionState state) { 81 session_manager::SessionState state) {
82 UpdateIconVisibility(); 82 UpdateIconVisibility();
83 } 83 }
84 84
85 void OverviewButtonTray::OnMaximizeModeStarted() { 85 void OverviewButtonTray::OnMaximizeModeStarted() {
86 UpdateIconVisibility(); 86 UpdateIconVisibility();
87 } 87 }
88 88
89 void OverviewButtonTray::OnMaximizeModeEnded() { 89 void OverviewButtonTray::OnMaximizeModeEnded() {
90 UpdateIconVisibility(); 90 UpdateIconVisibility();
91 } 91 }
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
138 // a modal dialog is present. 138 // a modal dialog is present.
139 WmShell* shell = WmShell::Get(); 139 WmShell* shell = WmShell::Get();
140 SessionStateDelegate* session_state_delegate = 140 SessionStateDelegate* session_state_delegate =
141 shell->GetSessionStateDelegate(); 141 shell->GetSessionStateDelegate();
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 session_manager::SessionState::ACTIVE &&
149 shell->system_tray_delegate()->GetUserLoginStatus() != 149 shell->system_tray_delegate()->GetUserLoginStatus() !=
150 LoginStatus::KIOSK_APP); 150 LoginStatus::KIOSK_APP);
151 } 151 }
152 152
153 } // namespace ash 153 } // namespace ash
OLDNEW
« no previous file with comments | « ash/common/system/overview/overview_button_tray.h ('k') | ash/common/test/test_session_state_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698