| 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_state_delegate.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" |
| 11 #include "ash/common/wm/maximize_mode/maximize_mode_controller.h" | 11 #include "ash/common/wm/maximize_mode/maximize_mode_controller.h" |
| 12 #include "ash/common/wm/overview/window_selector_controller.h" | 12 #include "ash/common/wm/overview/window_selector_controller.h" |
| 13 #include "ash/common/wm_shell.h" | 13 #include "ash/common/wm_shell.h" |
| 14 #include "ash/resources/vector_icons/vector_icons.h" | 14 #include "ash/resources/vector_icons/vector_icons.h" |
| 15 #include "ash/shell.h" | 15 #include "ash/shell.h" |
| 16 #include "ash/strings/grit/ash_strings.h" | 16 #include "ash/strings/grit/ash_strings.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); |
| 27 | 27 |
| 28 icon_->SetImage(CreateVectorIcon(kShelfOverviewIcon, kShelfIconColor)); | 28 icon_->SetImage(CreateVectorIcon(kShelfOverviewIcon, kShelfIconColor)); |
| 29 SetIconBorderForShelfAlignment(); | 29 SetIconBorderForShelfAlignment(); |
| 30 tray_container()->AddChildView(icon_); | 30 tray_container()->AddChildView(icon_); |
| 31 | 31 |
| 32 // Since OverviewButtonTray is located on the rightmost position of a | 32 // Since OverviewButtonTray is located on the rightmost position of a |
| 33 // horizontal shelf, no separator is required. | 33 // horizontal shelf, no separator is required. |
| 34 set_separator_visibility(false); | 34 set_separator_visibility(false); |
| 35 | 35 |
| 36 Shell::GetInstance()->AddShellObserver(this); | 36 Shell::GetInstance()->AddShellObserver(this); |
| 37 WmShell::Get()->GetSessionStateDelegate()->AddSessionStateObserver(this); | 37 WmShell::Get()->session_controller()->AddSessionStateObserver(this); |
| 38 } | 38 } |
| 39 | 39 |
| 40 OverviewButtonTray::~OverviewButtonTray() { | 40 OverviewButtonTray::~OverviewButtonTray() { |
| 41 Shell::GetInstance()->RemoveShellObserver(this); | 41 Shell::GetInstance()->RemoveShellObserver(this); |
| 42 WmShell::Get()->GetSessionStateDelegate()->RemoveSessionStateObserver(this); | 42 WmShell::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 WmShell::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. |
| (...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 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 WmShell* shell = WmShell::Get(); |
| 113 SessionStateDelegate* session_state_delegate = | 113 SessionController* session_controller = shell->session_controller(); |
| 114 shell->GetSessionStateDelegate(); | |
| 115 | 114 |
| 116 SetVisible( | 115 SetVisible( |
| 117 shell->maximize_mode_controller()->IsMaximizeModeWindowManagerEnabled() && | 116 shell->maximize_mode_controller()->IsMaximizeModeWindowManagerEnabled() && |
| 118 session_state_delegate->IsActiveUserSessionStarted() && | 117 session_controller->IsActiveUserSessionStarted() && |
| 119 !session_state_delegate->IsScreenLocked() && | 118 !session_controller->IsScreenLocked() && |
| 120 session_state_delegate->GetSessionState() == | 119 session_controller->GetSessionState() == |
| 121 session_manager::SessionState::ACTIVE && | 120 session_manager::SessionState::ACTIVE && |
| 122 shell->system_tray_delegate()->GetUserLoginStatus() != | 121 shell->system_tray_delegate()->GetUserLoginStatus() != |
| 123 LoginStatus::KIOSK_APP && | 122 LoginStatus::KIOSK_APP && |
| 124 shell->system_tray_delegate()->GetUserLoginStatus() != | 123 shell->system_tray_delegate()->GetUserLoginStatus() != |
| 125 LoginStatus::ARC_KIOSK_APP); | 124 LoginStatus::ARC_KIOSK_APP); |
| 126 } | 125 } |
| 127 | 126 |
| 128 } // namespace ash | 127 } // namespace ash |
| OLD | NEW |