Chromium Code Reviews| Index: ash/common/shelf/shelf_constants.cc |
| diff --git a/ash/common/shelf/shelf_constants.cc b/ash/common/shelf/shelf_constants.cc |
| index b9a573dc21d6a9e7aaffcd69803c4a90c61f675b..2048ec8f9d65a0c114d37b8b34245de99ec0a303 100644 |
| --- a/ash/common/shelf/shelf_constants.cc |
| +++ b/ash/common/shelf/shelf_constants.cc |
| @@ -21,12 +21,12 @@ const SkColor kShelfButtonActivatedHighlightColor = |
| const SkColor kShelfInkDropBaseColor = SK_ColorWHITE; |
| const float kShelfInkDropVisibleOpacity = 0.2f; |
| const SkColor kShelfIconColor = SK_ColorWHITE; |
| +const int kShelfTranslucentAlpha = 204; |
|
James Cook
2017/02/08 00:31:27
Isn't 204 the value for NON_MATERIAL?
bruthig
2017/02/10 18:49:10
Good catch. This was moved to pre-requisite CL.
|
| const int kOverflowButtonSize = 32; |
| const int kOverflowButtonCornerRadius = 2; |
| const int kAppListButtonRadius = kOverflowButtonSize / 2; |
| int GetShelfConstant(ShelfConstant shelf_constant) { |
| - const int kShelfBackgroundAlpha[] = {204, 153, 153}; |
| const int kShelfSize[] = {47, 48, 48}; |
| const int kShelfButtonSpacing[] = {10, 16, 16}; |
| const int kShelfButtonSize[] = {44, 48, 48}; |
| @@ -37,8 +37,6 @@ int GetShelfConstant(ShelfConstant shelf_constant) { |
| mode <= MaterialDesignController::MATERIAL_EXPERIMENTAL); |
| switch (shelf_constant) { |
| - case SHELF_BACKGROUND_ALPHA: |
| - return kShelfBackgroundAlpha[mode]; |
| case SHELF_SIZE: |
| return kShelfSize[mode]; |
| case SHELF_BUTTON_SPACING: |