| 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_state_delegate.h" |
| 8 #include "ash/common/shelf/shelf_constants.h" | 8 #include "ash/common/shelf/shelf_constants.h" |
| 9 #include "ash/common/strings/grit/ash_strings.h" | 9 #include "ash/common/strings/grit/ash_strings.h" |
| 10 #include "ash/common/system/tray/system_tray_delegate.h" | 10 #include "ash/common/system/tray/system_tray_delegate.h" |
| 11 #include "ash/common/system/tray/tray_constants.h" | 11 #include "ash/common/system/tray/tray_constants.h" |
| 12 #include "ash/common/wm/maximize_mode/maximize_mode_controller.h" | 12 #include "ash/common/wm/maximize_mode/maximize_mode_controller.h" |
| 13 #include "ash/common/wm/overview/window_selector_controller.h" | 13 #include "ash/common/wm/overview/window_selector_controller.h" |
| 14 #include "ash/common/wm_shell.h" | 14 #include "ash/common/wm_shell.h" |
| 15 #include "ash/resources/vector_icons/vector_icons.h" | 15 #include "ash/resources/vector_icons/vector_icons.h" |
| 16 #include "ui/base/l10n/l10n_util.h" | 16 #include "ui/base/l10n/l10n_util.h" |
| 17 #include "ui/gfx/paint_vector_icon.h" | 17 #include "ui/gfx/paint_vector_icon.h" |
| 18 #include "ui/views/border.h" | 18 #include "ui/views/border.h" |
| 19 #include "ui/views/controls/image_view.h" | 19 #include "ui/views/controls/image_view.h" |
| 20 | 20 |
| 21 namespace ash { | 21 namespace ash { |
| 22 | 22 |
| 23 OverviewButtonTray::OverviewButtonTray(WmShelf* wm_shelf) | 23 OverviewButtonTray::OverviewButtonTray(WmShelf* wm_shelf) |
| 24 : TrayBackgroundView(wm_shelf), icon_(new views::ImageView()) { | 24 : TrayBackgroundView(wm_shelf, true), icon_(new views::ImageView()) { |
| 25 SetInkDropMode(InkDropMode::ON); | 25 SetInkDropMode(InkDropMode::ON); |
| 26 SetContentsBackground(false); | |
| 27 | 26 |
| 28 icon_->SetImage(CreateVectorIcon(kShelfOverviewIcon, kShelfIconColor)); | 27 icon_->SetImage(CreateVectorIcon(kShelfOverviewIcon, kShelfIconColor)); |
| 29 SetIconBorderForShelfAlignment(); | 28 SetIconBorderForShelfAlignment(); |
| 30 tray_container()->AddChildView(icon_); | 29 tray_container()->AddChildView(icon_); |
| 31 | 30 |
| 32 // Since OverviewButtonTray is located on the rightmost position of a | 31 // Since OverviewButtonTray is located on the rightmost position of a |
| 33 // horizontal shelf, no separator is required. | 32 // horizontal shelf, no separator is required. |
| 34 set_separator_visibility(false); | 33 set_separator_visibility(false); |
| 35 | 34 |
| 36 WmShell::Get()->AddShellObserver(this); | 35 WmShell::Get()->AddShellObserver(this); |
| (...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 119 !session_state_delegate->IsScreenLocked() && | 118 !session_state_delegate->IsScreenLocked() && |
| 120 session_state_delegate->GetSessionState() == | 119 session_state_delegate->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 |