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

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

Issue 2095663004: Revert of mash: Convert TrayBackgroundView to wm common types (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 6 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/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"
19 #include "ash/wm/maximize_mode/maximize_mode_controller.h" 18 #include "ash/wm/maximize_mode/maximize_mode_controller.h"
20 #include "grit/ash_resources.h" 19 #include "grit/ash_resources.h"
21 #include "grit/ash_strings.h" 20 #include "grit/ash_strings.h"
22 #include "ui/base/l10n/l10n_util.h" 21 #include "ui/base/l10n/l10n_util.h"
23 #include "ui/base/resource/resource_bundle.h" 22 #include "ui/base/resource/resource_bundle.h"
24 #include "ui/gfx/paint_vector_icon.h" 23 #include "ui/gfx/paint_vector_icon.h"
25 #include "ui/gfx/vector_icons_public.h" 24 #include "ui/gfx/vector_icons_public.h"
26 #include "ui/views/border.h" 25 #include "ui/views/border.h"
27 #include "ui/views/controls/image_view.h" 26 #include "ui/views/controls/image_view.h"
28 27
29 namespace { 28 namespace {
30 29
31 // Predefined padding for the icon used in this tray. These are to be set to the 30 // Predefined padding for the icon used in this tray. These are to be set to the
32 // border of the icon, depending on the current shelf_alignment() 31 // border of the icon, depending on the current shelf_alignment()
33 const int kHorizontalShelfHorizontalPadding = 8; 32 const int kHorizontalShelfHorizontalPadding = 8;
34 const int kHorizontalShelfVerticalPadding = 4; 33 const int kHorizontalShelfVerticalPadding = 4;
35 const int kVerticalShelfHorizontalPadding = 2; 34 const int kVerticalShelfHorizontalPadding = 2;
36 const int kVerticalShelfVerticalPadding = 5; 35 const int kVerticalShelfVerticalPadding = 5;
37 36
38 } // namespace 37 } // namespace
39 38
40 namespace ash { 39 namespace ash {
41 40
42 OverviewButtonTray::OverviewButtonTray(StatusAreaWidget* status_area_widget) 41 OverviewButtonTray::OverviewButtonTray(StatusAreaWidget* status_area_widget)
43 : TrayBackgroundView(status_area_widget->wm_shelf()), icon_(nullptr) { 42 : TrayBackgroundView(status_area_widget), icon_(NULL) {
44 SetContentsBackground(); 43 SetContentsBackground();
45 44
46 icon_ = new views::ImageView(); 45 icon_ = new views::ImageView();
47 if (MaterialDesignController::IsShelfMaterial()) { 46 if (MaterialDesignController::IsShelfMaterial()) {
48 gfx::ImageSkia image_md = 47 gfx::ImageSkia image_md =
49 CreateVectorIcon(gfx::VectorIconId::SHELF_OVERVIEW, kShelfIconColor); 48 CreateVectorIcon(gfx::VectorIconId::SHELF_OVERVIEW, kShelfIconColor);
50 icon_->SetImage(image_md); 49 icon_->SetImage(image_md);
51 } else { 50 } else {
52 gfx::ImageSkia* image_non_md = 51 gfx::ImageSkia* image_non_md =
53 ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed( 52 ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after
145 shell->maximize_mode_controller()->IsMaximizeModeWindowManagerEnabled() && 144 shell->maximize_mode_controller()->IsMaximizeModeWindowManagerEnabled() &&
146 session_state_delegate->IsActiveUserSessionStarted() && 145 session_state_delegate->IsActiveUserSessionStarted() &&
147 !session_state_delegate->IsScreenLocked() && 146 !session_state_delegate->IsScreenLocked() &&
148 session_state_delegate->GetSessionState() == 147 session_state_delegate->GetSessionState() ==
149 SessionStateDelegate::SESSION_STATE_ACTIVE && 148 SessionStateDelegate::SESSION_STATE_ACTIVE &&
150 WmShell::Get()->system_tray_delegate()->GetUserLoginStatus() != 149 WmShell::Get()->system_tray_delegate()->GetUserLoginStatus() !=
151 LoginStatus::KIOSK_APP); 150 LoginStatus::KIOSK_APP);
152 } 151 }
153 152
154 } // namespace ash 153 } // namespace ash
OLDNEW
« no previous file with comments | « ash/system/overview/overview_button_tray.h ('k') | ash/system/tray/media_security/multi_profile_media_tray_item_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698