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

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

Issue 2679133003: [ash-md] Wired in the Shelf color to be derived from the Wallpaper. (Closed)
Patch Set: Addressed nits. Created 3 years, 9 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
« no previous file with comments | « ash/common/shelf/shelf_constants.h ('k') | ash/common/shelf/shelf_view.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "base/logging.h" 7 #include "base/logging.h"
8 #include "third_party/skia/include/core/SkColor.h" 8 #include "third_party/skia/include/core/SkColor.h"
9 9
10 namespace ash { 10 namespace ash {
11 11
12 const int kTimeToSwitchBackgroundMs = 1000; 12 const int kTimeToSwitchBackgroundMs = 1000;
13 const int kWorkspaceAreaVisibleInset = 2; 13 const int kWorkspaceAreaVisibleInset = 2;
14 const int kWorkspaceAreaAutoHideInset = 5; 14 const int kWorkspaceAreaAutoHideInset = 5;
15 const int kShelfAutoHideSize = 3; 15 const int kShelfAutoHideSize = 3;
16 const int kShelfItemInset = 3; 16 const int kShelfItemInset = 3;
17 const SkColor kShelfBaseColor = SK_ColorBLACK; 17 const SkColor kShelfDefaultBaseColor = SK_ColorBLACK;
18 const SkColor kShelfButtonActivatedHighlightColor = 18 const SkColor kShelfButtonActivatedHighlightColor =
19 SkColorSetA(SK_ColorWHITE, 100); 19 SkColorSetA(SK_ColorWHITE, 100);
20 const SkColor kShelfInkDropBaseColor = SK_ColorWHITE; 20 const SkColor kShelfInkDropBaseColor = SK_ColorWHITE;
21 const float kShelfInkDropVisibleOpacity = 0.2f; 21 const float kShelfInkDropVisibleOpacity = 0.2f;
22 const SkColor kShelfIconColor = SK_ColorWHITE; 22 const SkColor kShelfIconColor = SK_ColorWHITE;
23 const int kShelfTranslucentAlpha = 153; 23 const int kShelfTranslucentAlpha = 153;
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
(...skipping 14 matching lines...) Expand all
42 case SHELF_BUTTON_SIZE: 42 case SHELF_BUTTON_SIZE:
43 return kShelfButtonSize[mode]; 43 return kShelfButtonSize[mode];
44 case SHELF_INSETS_FOR_AUTO_HIDE: 44 case SHELF_INSETS_FOR_AUTO_HIDE:
45 return kShelfInsetsForAutoHide[mode]; 45 return kShelfInsetsForAutoHide[mode];
46 } 46 }
47 NOTREACHED(); 47 NOTREACHED();
48 return 0; 48 return 0;
49 } 49 }
50 50
51 } // namespace ash 51 } // namespace ash
OLDNEW
« no previous file with comments | « ash/common/shelf/shelf_constants.h ('k') | ash/common/shelf/shelf_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698