Remove MaterialDesignController::IsModeMaterial

chrome/browser/themes/theme_service_mac.mm

Index: chrome/browser/themes/theme_service_mac.mm
diff --git a/chrome/browser/themes/theme_service_mac.mm b/chrome/browser/themes/theme_service_mac.mm
index 16dd6724ab5c6e0103f4b802fa40f6763984f068..4ede5773f32569e2665bc7069d3bb9e6b115def6 100644
--- a/chrome/browser/themes/theme_service_mac.mm
+++ b/chrome/browser/themes/theme_service_mac.mm
@@ -12,7 +12,6 @@
 #include "chrome/grit/theme_resources.h"
 #include "skia/ext/skia_utils_mac.h"
 #import "third_party/google_toolbox_for_mac/src/AppKit/GTMNSColor+Luminance.h"
-#include "ui/base/material_design/material_design_controller.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/color_utils.h"
 #include "ui/gfx/image/image.h"
@@ -52,7 +51,9 @@ NSImage* ThemeService::GetNSImageNamed(int id, bool incognito) const {
       id == IDR_THEME_TOOLBAR_INACTIVE ||
       id == IDR_THEME_TAB_BACKGROUND ||
       id == IDR_THEME_TOOLBAR;
-  bool isModeMaterial = ui::MaterialDesignController::IsModeMaterial();
+  // TODO(ellyjones): remove traces of the MD redesign from this file. See
+  // crbug.com/648281

[Peter Kasting, 2016/11/10 05:42:20]

It seems like it would be fairly easy to remove those traces now (from looking
at what they affect).  Can we not do so?

[Evan Stade, 2016/11/10 15:39:46]

not really, because I think properly scrubbing MD references will involve
getting rid of this kMaterialDesignIdOffset stuff (not just adding the offset
unconditionally).

+  bool isModeMaterial = true;
 
   // In Material Design, Incognito mode draws tabs and the toolbar using colors
   // that are different from non-Incognito mode. If in MD, offset these ids so
@@ -153,7 +154,7 @@ NSColor* ThemeService::GetNSImageColorNamed(int id, bool incognito) const {
       id == IDR_THEME_TOOLBAR_INACTIVE ||
       id == IDR_THEME_TAB_BACKGROUND ||
       id == IDR_THEME_TOOLBAR;
-  bool isModeMaterial = ui::MaterialDesignController::IsModeMaterial();
+  bool isModeMaterial = true;
 
   // In Material Design, Incognito mode draws tabs and the toolbar using colors
   // that are different from non-Incognito mode. If in MD, offset these ids so
@@ -189,7 +190,7 @@ NSColor* ThemeService::GetNSColor(int id, bool incognito) const {
   DCHECK(CalledOnValidThread());
 
   int original_id = id;
-  const bool is_mode_material = ui::MaterialDesignController::IsModeMaterial();
+  const bool is_mode_material = true;
   if (is_mode_material && incognito) {
     id += kMaterialDesignIdOffset;
   }