| OLD | NEW |
| 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 kShelfDefaultBaseColor = SK_ColorBLACK; | 17 const SkColor kShelfDefaultBaseColor = SK_ColorBLACK; |
| 18 const int kShelfButtonSize = 48; |
| 19 const int kShelfButtonSpacing = 16; |
| 18 const SkColor kShelfButtonActivatedHighlightColor = | 20 const SkColor kShelfButtonActivatedHighlightColor = |
| 19 SkColorSetA(SK_ColorWHITE, 100); | 21 SkColorSetA(SK_ColorWHITE, 100); |
| 20 const SkColor kShelfInkDropBaseColor = SK_ColorWHITE; | 22 const SkColor kShelfInkDropBaseColor = SK_ColorWHITE; |
| 21 const float kShelfInkDropVisibleOpacity = 0.2f; | 23 const float kShelfInkDropVisibleOpacity = 0.2f; |
| 22 const SkColor kShelfIconColor = SK_ColorWHITE; | 24 const SkColor kShelfIconColor = SK_ColorWHITE; |
| 23 const int kShelfTranslucentAlpha = 153; | 25 const int kShelfTranslucentAlpha = 153; |
| 24 const int kOverflowButtonSize = 32; | 26 const int kOverflowButtonSize = 32; |
| 25 const int kOverflowButtonCornerRadius = 2; | 27 const int kOverflowButtonCornerRadius = 2; |
| 26 const int kAppListButtonRadius = kOverflowButtonSize / 2; | 28 const int kAppListButtonRadius = kOverflowButtonSize / 2; |
| 27 | 29 |
| 28 int GetShelfConstant(ShelfConstant shelf_constant) { | 30 int GetShelfConstant(ShelfConstant shelf_constant) { |
| 29 const int kShelfSize[] = {47, 48, 48}; | 31 const int kShelfSize[] = {47, 48, 48}; |
| 30 const int kShelfButtonSpacing[] = {10, 16, 16}; | |
| 31 const int kShelfButtonSize[] = {44, 48, 48}; | |
| 32 const int kShelfInsetsForAutoHide[] = {3, 0, 0}; | 32 const int kShelfInsetsForAutoHide[] = {3, 0, 0}; |
| 33 | 33 |
| 34 // TODO(estade): clean this up --- remove unneeded constants and reduce | 34 // TODO(estade): clean this up --- remove unneeded constants and reduce |
| 35 // remaining arrays to a single constant. | 35 // remaining arrays to a single constant. |
| 36 const int mode = 1; | 36 const int mode = 1; |
| 37 switch (shelf_constant) { | 37 switch (shelf_constant) { |
| 38 case SHELF_SIZE: | 38 case SHELF_SIZE: |
| 39 return kShelfSize[mode]; | 39 return kShelfSize[mode]; |
| 40 case SHELF_BUTTON_SPACING: | |
| 41 return kShelfButtonSpacing[mode]; | |
| 42 case SHELF_BUTTON_SIZE: | |
| 43 return kShelfButtonSize[mode]; | |
| 44 case SHELF_INSETS_FOR_AUTO_HIDE: | 40 case SHELF_INSETS_FOR_AUTO_HIDE: |
| 45 return kShelfInsetsForAutoHide[mode]; | 41 return kShelfInsetsForAutoHide[mode]; |
| 46 } | 42 } |
| 47 NOTREACHED(); | 43 NOTREACHED(); |
| 48 return 0; | 44 return 0; |
| 49 } | 45 } |
| 50 | 46 |
| 51 } // namespace ash | 47 } // namespace ash |
| OLD | NEW |