| 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/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/shelf_types.h" | 10 #include "ash/common/shelf/shelf_types.h" |
| 11 #include "ash/common/shelf/wm_shelf_util.h" | 11 #include "ash/common/shelf/wm_shelf_util.h" |
| 12 #include "ash/common/system/tray/system_tray_delegate.h" | 12 #include "ash/common/system/tray/system_tray_delegate.h" |
| 13 #include "ash/common/system/tray/tray_utils.h" | 13 #include "ash/common/system/tray/tray_utils.h" |
| 14 #include "ash/common/wm/overview/window_selector_controller.h" | 14 #include "ash/common/wm/overview/window_selector_controller.h" |
| 15 #include "ash/common/wm_shell.h" | 15 #include "ash/common/wm_shell.h" |
| 16 #include "ash/shelf/shelf_util.h" | 16 #include "ash/shelf/shelf_util.h" |
| 17 #include "ash/shell.h" | 17 #include "ash/shell.h" |
| 18 #include "ash/system/status_area_widget.h" |
| 18 #include "ash/wm/maximize_mode/maximize_mode_controller.h" | 19 #include "ash/wm/maximize_mode/maximize_mode_controller.h" |
| 19 #include "grit/ash_resources.h" | 20 #include "grit/ash_resources.h" |
| 20 #include "grit/ash_strings.h" | 21 #include "grit/ash_strings.h" |
| 21 #include "ui/base/l10n/l10n_util.h" | 22 #include "ui/base/l10n/l10n_util.h" |
| 22 #include "ui/base/resource/resource_bundle.h" | 23 #include "ui/base/resource/resource_bundle.h" |
| 23 #include "ui/gfx/paint_vector_icon.h" | 24 #include "ui/gfx/paint_vector_icon.h" |
| 24 #include "ui/gfx/vector_icons_public.h" | 25 #include "ui/gfx/vector_icons_public.h" |
| 25 #include "ui/views/border.h" | 26 #include "ui/views/border.h" |
| 26 #include "ui/views/controls/image_view.h" | 27 #include "ui/views/controls/image_view.h" |
| 27 | 28 |
| 28 namespace { | 29 namespace { |
| 29 | 30 |
| 30 // Predefined padding for the icon used in this tray. These are to be set to the | 31 // Predefined padding for the icon used in this tray. These are to be set to the |
| 31 // border of the icon, depending on the current shelf_alignment() | 32 // border of the icon, depending on the current shelf_alignment() |
| 32 const int kHorizontalShelfHorizontalPadding = 8; | 33 const int kHorizontalShelfHorizontalPadding = 8; |
| 33 const int kHorizontalShelfVerticalPadding = 4; | 34 const int kHorizontalShelfVerticalPadding = 4; |
| 34 const int kVerticalShelfHorizontalPadding = 2; | 35 const int kVerticalShelfHorizontalPadding = 2; |
| 35 const int kVerticalShelfVerticalPadding = 5; | 36 const int kVerticalShelfVerticalPadding = 5; |
| 36 | 37 |
| 37 } // namespace | 38 } // namespace |
| 38 | 39 |
| 39 namespace ash { | 40 namespace ash { |
| 40 | 41 |
| 41 OverviewButtonTray::OverviewButtonTray(StatusAreaWidget* status_area_widget) | 42 OverviewButtonTray::OverviewButtonTray(StatusAreaWidget* status_area_widget) |
| 42 : TrayBackgroundView(status_area_widget), icon_(NULL) { | 43 : TrayBackgroundView(status_area_widget->wm_shelf()), icon_(nullptr) { |
| 43 SetContentsBackground(); | 44 SetContentsBackground(); |
| 44 | 45 |
| 45 icon_ = new views::ImageView(); | 46 icon_ = new views::ImageView(); |
| 46 if (MaterialDesignController::IsShelfMaterial()) { | 47 if (MaterialDesignController::IsShelfMaterial()) { |
| 47 gfx::ImageSkia image_md = | 48 gfx::ImageSkia image_md = |
| 48 CreateVectorIcon(gfx::VectorIconId::SHELF_OVERVIEW, kShelfIconColor); | 49 CreateVectorIcon(gfx::VectorIconId::SHELF_OVERVIEW, kShelfIconColor); |
| 49 icon_->SetImage(image_md); | 50 icon_->SetImage(image_md); |
| 50 } else { | 51 } else { |
| 51 gfx::ImageSkia* image_non_md = | 52 gfx::ImageSkia* image_non_md = |
| 52 ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed( | 53 ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed( |
| (...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 144 shell->maximize_mode_controller()->IsMaximizeModeWindowManagerEnabled() && | 145 shell->maximize_mode_controller()->IsMaximizeModeWindowManagerEnabled() && |
| 145 session_state_delegate->IsActiveUserSessionStarted() && | 146 session_state_delegate->IsActiveUserSessionStarted() && |
| 146 !session_state_delegate->IsScreenLocked() && | 147 !session_state_delegate->IsScreenLocked() && |
| 147 session_state_delegate->GetSessionState() == | 148 session_state_delegate->GetSessionState() == |
| 148 SessionStateDelegate::SESSION_STATE_ACTIVE && | 149 SessionStateDelegate::SESSION_STATE_ACTIVE && |
| 149 WmShell::Get()->system_tray_delegate()->GetUserLoginStatus() != | 150 WmShell::Get()->system_tray_delegate()->GetUserLoginStatus() != |
| 150 LoginStatus::KIOSK_APP); | 151 LoginStatus::KIOSK_APP); |
| 151 } | 152 } |
| 152 | 153 |
| 153 } // namespace ash | 154 } // namespace ash |
| OLD | NEW |