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

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

Issue 2692663002: Gut ash::MaterialDesignController, and remove the about:flags entry. (Closed)
Patch Set: yet another rebase 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
Index: ash/common/shelf/shelf_constants.cc
diff --git a/ash/common/shelf/shelf_constants.cc b/ash/common/shelf/shelf_constants.cc
index c3377bbd455927cf8615028e60a129f9d2fde097..a486b7ab2610e22bb667681bb3472363d31b6a2d 100644
--- a/ash/common/shelf/shelf_constants.cc
+++ b/ash/common/shelf/shelf_constants.cc
@@ -4,7 +4,6 @@
#include "ash/common/shelf/shelf_constants.h"
-#include "ash/common/material_design/material_design_controller.h"
#include "base/logging.h"
#include "third_party/skia/include/core/SkColor.h"
@@ -32,10 +31,9 @@ int GetShelfConstant(ShelfConstant shelf_constant) {
const int kShelfButtonSize[] = {44, 48, 48};
const int kShelfInsetsForAutoHide[] = {3, 0, 0};
- const int mode = MaterialDesignController::GetMode();
- DCHECK(mode >= MaterialDesignController::NON_MATERIAL &&
- mode <= MaterialDesignController::MATERIAL_EXPERIMENTAL);
-
+ // TODO(estade): clean this up --- remove unneeded constants and reduce
+ // remaining arrays to a single constant.
+ const int mode = 1;
switch (shelf_constant) {
case SHELF_SIZE:
return kShelfSize[mode];

Powered by Google App Engine
This is Rietveld 408576698