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

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

Issue 2775973002: Promotes more accessors from WmShell to Shell (Closed)
Patch Set: feedback 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
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/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 30 matching lines...) Expand all
41 Shell::GetInstance()->RemoveShellObserver(this); 41 Shell::GetInstance()->RemoveShellObserver(this);
42 Shell::Get()->session_controller()->RemoveSessionStateObserver(this); 42 Shell::Get()->session_controller()->RemoveSessionStateObserver(this);
43 } 43 }
44 44
45 void OverviewButtonTray::UpdateAfterLoginStatusChange(LoginStatus status) { 45 void OverviewButtonTray::UpdateAfterLoginStatusChange(LoginStatus status) {
46 UpdateIconVisibility(); 46 UpdateIconVisibility();
47 } 47 }
48 48
49 bool OverviewButtonTray::PerformAction(const ui::Event& event) { 49 bool OverviewButtonTray::PerformAction(const ui::Event& event) {
50 WindowSelectorController* controller = 50 WindowSelectorController* controller =
51 WmShell::Get()->window_selector_controller(); 51 Shell::Get()->window_selector_controller();
52 // Toggling overview mode will fail if there is no window to show. 52 // Toggling overview mode will fail if there is no window to show.
53 bool performed = controller->ToggleOverview(); 53 bool performed = controller->ToggleOverview();
54 WmShell::Get()->RecordUserMetricsAction(UMA_TRAY_OVERVIEW); 54 WmShell::Get()->RecordUserMetricsAction(UMA_TRAY_OVERVIEW);
55 return performed; 55 return performed;
56 } 56 }
57 57
58 void OverviewButtonTray::SessionStateChanged( 58 void OverviewButtonTray::SessionStateChanged(
59 session_manager::SessionState state) { 59 session_manager::SessionState state) {
60 UpdateIconVisibility(); 60 UpdateIconVisibility();
61 } 61 }
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
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->system_tray_delegate()->GetUserLoginStatus() !=
122 LoginStatus::KIOSK_APP && 122 LoginStatus::KIOSK_APP &&
123 shell->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
OLDNEW
« no previous file with comments | « ash/common/system/ime/tray_ime_chromeos_unittest.cc ('k') | ash/common/system/tiles/tiles_default_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698