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

Unified Diff: ash/common/shelf/shelf_constants.cc

Issue 2712293002: Remove non-MD code from ShelfButton (Closed)
Patch Set: Rebased Created 3 years, 10 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/common/shelf/shelf_constants.h ('k') | ash/common/shelf/shelf_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/common/shelf/shelf_constants.cc
diff --git a/ash/common/shelf/shelf_constants.cc b/ash/common/shelf/shelf_constants.cc
index 53b90f41649522083e9250417f6399bbc2fae602..4c7db93a3a263677b3d0d98aae843bd531808254 100644
--- a/ash/common/shelf/shelf_constants.cc
+++ b/ash/common/shelf/shelf_constants.cc
@@ -15,6 +15,8 @@ const int kWorkspaceAreaAutoHideInset = 5;
const int kShelfAutoHideSize = 3;
const int kShelfItemInset = 3;
const SkColor kShelfDefaultBaseColor = SK_ColorBLACK;
+const int kShelfButtonSize = 48;
+const int kShelfButtonSpacing = 16;
const SkColor kShelfButtonActivatedHighlightColor =
SkColorSetA(SK_ColorWHITE, 100);
const SkColor kShelfInkDropBaseColor = SK_ColorWHITE;
@@ -27,8 +29,6 @@ const int kAppListButtonRadius = kOverflowButtonSize / 2;
int GetShelfConstant(ShelfConstant shelf_constant) {
const int kShelfSize[] = {47, 48, 48};
- const int kShelfButtonSpacing[] = {10, 16, 16};
- const int kShelfButtonSize[] = {44, 48, 48};
const int kShelfInsetsForAutoHide[] = {3, 0, 0};
// TODO(estade): clean this up --- remove unneeded constants and reduce
@@ -37,10 +37,6 @@ int GetShelfConstant(ShelfConstant shelf_constant) {
switch (shelf_constant) {
case SHELF_SIZE:
return kShelfSize[mode];
- case SHELF_BUTTON_SPACING:
- return kShelfButtonSpacing[mode];
- case SHELF_BUTTON_SIZE:
- return kShelfButtonSize[mode];
case SHELF_INSETS_FOR_AUTO_HIDE:
return kShelfInsetsForAutoHide[mode];
}
« no previous file with comments | « ash/common/shelf/shelf_constants.h ('k') | ash/common/shelf/shelf_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698