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

Unified Diff: ash/common/system/tray/tray_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
« no previous file with comments | « ash/common/system/date/system_info_default_view_unittest.cc ('k') | ash/common/test/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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];
« no previous file with comments | « ash/common/system/date/system_info_default_view_unittest.cc ('k') | ash/common/test/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698