Index: ash/common/system/tray/tray_constants.cc |
diff --git a/ash/common/system/tray/tray_constants.cc b/ash/common/system/tray/tray_constants.cc |
index f9d2cd66be962672a7e9397032e57232f63c8360..55ecbed9347bf64d2d45cfbbe605b2a474b74993 100644 |
--- a/ash/common/system/tray/tray_constants.cc |
+++ b/ash/common/system/tray/tray_constants.cc |
@@ -4,7 +4,6 @@ |
#include "ash/common/system/tray/tray_constants.h" |
-#include "ash/common/material_design/material_design_controller.h" |
#include "base/logging.h" |
#include "third_party/skia/include/core/SkColor.h" |
#include "ui/gfx/color_palette.h" |
@@ -127,10 +126,9 @@ int GetTrayConstant(TrayConstant constant) { |
const int kTrayImeMenuIcon[] = {40, kTrayItemSize, kTrayItemSize}; |
const int kTrayImageItemPadding[] = {1, 3, 3}; |
- 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 (constant) { |
case TRAY_ITEM_HEIGHT_LEGACY: |
return kTrayItemHeightLegacy[mode]; |