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

Side by Side Diff: ash/common/shelf/shelf_constants.cc

Issue 2454393002: Enable Ash material design shelf and system menu by default (Closed)
Patch Set: rebase Created 4 years, 1 month 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/shelf/shelf_constants.h" 5 #include "ash/common/shelf/shelf_constants.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 "base/logging.h" 8 #include "base/logging.h"
9 #include "third_party/skia/include/core/SkColor.h" 9 #include "third_party/skia/include/core/SkColor.h"
10 10
11 namespace ash { 11 namespace ash {
12 12
13 const int kTimeToSwitchBackgroundMs = 1000; 13 const int kTimeToSwitchBackgroundMs = 1000;
14 const int kWorkspaceAreaVisibleInset = 2; 14 const int kWorkspaceAreaVisibleInset = 2;
15 const int kWorkspaceAreaAutoHideInset = 5; 15 const int kWorkspaceAreaAutoHideInset = 5;
16 const int kShelfAutoHideSize = 3; 16 const int kShelfAutoHideSize = 3;
17 const int kShelfItemInset = 3; 17 const int kShelfItemInset = 3;
18 const SkColor kShelfBaseColor = SK_ColorBLACK; 18 const SkColor kShelfBaseColor = SK_ColorBLACK;
19 const SkColor kShelfButtonActivatedHighlightColor = 19 const SkColor kShelfButtonActivatedHighlightColor =
20 SkColorSetA(SK_ColorWHITE, 100); 20 SkColorSetA(SK_ColorWHITE, 100);
21 const SkColor kShelfInkDropBaseColor = SK_ColorWHITE; 21 const SkColor kShelfInkDropBaseColor = SK_ColorWHITE;
22 const float kShelfInkDropVisibleOpacity = 0.2f; 22 const float kShelfInkDropVisibleOpacity = 0.2f;
23 const SkColor kShelfIconColor = SK_ColorWHITE; 23 const SkColor kShelfIconColor = SK_ColorWHITE;
24 const int kOverflowButtonSize = 32; 24 const int kOverflowButtonSize = 32;
25 const int kOverflowButtonCornerRadius = 2; 25 const int kOverflowButtonCornerRadius = 2;
26 const int kAppListButtonRadius = kOverflowButtonSize / 2; 26 const int kAppListButtonRadius = kOverflowButtonSize / 2;
27 27
28 int GetShelfConstant(ShelfConstant shelf_constant) { 28 int GetShelfConstant(ShelfConstant shelf_constant) {
29 const int kShelfBackgroundAlpha[] = {204, 204, 153}; 29 const int kShelfBackgroundAlpha[] = {204, 153, 153};
30 const int kShelfSize[] = {47, 47, 48}; 30 const int kShelfSize[] = {47, 48, 48};
31 const int kShelfButtonSpacing[] = {10, 10, 16}; 31 const int kShelfButtonSpacing[] = {10, 16, 16};
32 const int kShelfButtonSize[] = {44, 44, 48}; 32 const int kShelfButtonSize[] = {44, 48, 48};
33 const int kShelfInsetsForAutoHide[] = {3, 0, 0}; 33 const int kShelfInsetsForAutoHide[] = {3, 0, 0};
34 34
35 const int mode = MaterialDesignController::GetMode(); 35 const int mode = MaterialDesignController::GetMode();
36 DCHECK(mode >= MaterialDesignController::NON_MATERIAL && 36 DCHECK(mode >= MaterialDesignController::NON_MATERIAL &&
37 mode <= MaterialDesignController::MATERIAL_EXPERIMENTAL); 37 mode <= MaterialDesignController::MATERIAL_EXPERIMENTAL);
38 38
39 switch (shelf_constant) { 39 switch (shelf_constant) {
40 case SHELF_BACKGROUND_ALPHA: 40 case SHELF_BACKGROUND_ALPHA:
41 return kShelfBackgroundAlpha[mode]; 41 return kShelfBackgroundAlpha[mode];
42 case SHELF_SIZE: 42 case SHELF_SIZE:
43 return kShelfSize[mode]; 43 return kShelfSize[mode];
44 case SHELF_BUTTON_SPACING: 44 case SHELF_BUTTON_SPACING:
45 return kShelfButtonSpacing[mode]; 45 return kShelfButtonSpacing[mode];
46 case SHELF_BUTTON_SIZE: 46 case SHELF_BUTTON_SIZE:
47 return kShelfButtonSize[mode]; 47 return kShelfButtonSize[mode];
48 case SHELF_INSETS_FOR_AUTO_HIDE: 48 case SHELF_INSETS_FOR_AUTO_HIDE:
49 return kShelfInsetsForAutoHide[mode]; 49 return kShelfInsetsForAutoHide[mode];
50 } 50 }
51 NOTREACHED(); 51 NOTREACHED();
52 return 0; 52 return 0;
53 } 53 }
54 54
55 } // namespace ash 55 } // namespace ash
OLDNEW
« no previous file with comments | « ash/common/material_design/material_design_controller.cc ('k') | ash/common/system/tray/tray_constants.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698