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/resources/vector_icons/vector_icons.h" | 7 #include "ash/resources/vector_icons/vector_icons.h" |
8 #include "ash/session/session_controller.h" | 8 #include "ash/session/session_controller.h" |
9 #include "ash/shelf/shelf_constants.h" | 9 #include "ash/shelf/shelf_constants.h" |
10 #include "ash/shell.h" | 10 #include "ash/shell.h" |
| 11 #include "ash/shell_port.h" |
11 #include "ash/strings/grit/ash_strings.h" | 12 #include "ash/strings/grit/ash_strings.h" |
12 #include "ash/system/tray/system_tray_delegate.h" | 13 #include "ash/system/tray/system_tray_delegate.h" |
13 #include "ash/system/tray/tray_constants.h" | 14 #include "ash/system/tray/tray_constants.h" |
14 #include "ash/wm/maximize_mode/maximize_mode_controller.h" | 15 #include "ash/wm/maximize_mode/maximize_mode_controller.h" |
15 #include "ash/wm/overview/window_selector_controller.h" | 16 #include "ash/wm/overview/window_selector_controller.h" |
16 #include "ash/wm_shell.h" | |
17 #include "ui/base/l10n/l10n_util.h" | 17 #include "ui/base/l10n/l10n_util.h" |
18 #include "ui/gfx/paint_vector_icon.h" | 18 #include "ui/gfx/paint_vector_icon.h" |
19 #include "ui/views/border.h" | 19 #include "ui/views/border.h" |
20 #include "ui/views/controls/image_view.h" | 20 #include "ui/views/controls/image_view.h" |
21 | 21 |
22 namespace ash { | 22 namespace ash { |
23 | 23 |
24 OverviewButtonTray::OverviewButtonTray(WmShelf* wm_shelf) | 24 OverviewButtonTray::OverviewButtonTray(WmShelf* wm_shelf) |
25 : TrayBackgroundView(wm_shelf, true), icon_(new views::ImageView()) { | 25 : TrayBackgroundView(wm_shelf, true), icon_(new views::ImageView()) { |
26 SetInkDropMode(InkDropMode::ON); | 26 SetInkDropMode(InkDropMode::ON); |
(...skipping 17 matching lines...) Expand all Loading... |
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 Shell::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 ShellPort::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 } |
62 | 62 |
63 void OverviewButtonTray::OnMaximizeModeStarted() { | 63 void OverviewButtonTray::OnMaximizeModeStarted() { |
64 UpdateIconVisibility(); | 64 UpdateIconVisibility(); |
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
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 |
OLD | NEW |