Remove MaterialDesignController::IsModeMaterial

chrome/browser/themes/theme_service_mac.mm

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/themes/theme_service.h"
 
 #import <Cocoa/Cocoa.h>
 
 #include "base/logging.h"
 #include "chrome/browser/themes/browser_theme_pack.h"
 #include "chrome/browser/themes/theme_properties.h"
 #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"
 
 @interface NSWorkspace (Redeclarations)
 
 @property(readonly) BOOL accessibilityDisplayShouldIncreaseContrast;
 
 @end
 
@@ skipping 19 matching lines @@
 }  // namespace
 
 NSImage* ThemeService::GetNSImageNamed(int id, bool incognito) const {
   DCHECK(CalledOnValidThread());
 
   bool is_tab_or_toolbar_color =
       id == IDR_THEME_TAB_BACKGROUND_INACTIVE ||
       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
+  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
   // that they don't conflict with the non-MD colors in the cache.
   int original_id = id;
   if (isModeMaterial && incognito && is_tab_or_toolbar_color) {
     id += kMaterialDesignIdOffset;
   }
 
   // Check to see if we already have the image in the cache.
@@ skipping 80 matching lines @@
 }
 
 NSColor* ThemeService::GetNSImageColorNamed(int id, bool incognito) const {
   DCHECK(CalledOnValidThread());
 
   bool is_tab_or_toolbar_color =
       id == IDR_THEME_TAB_BACKGROUND_INACTIVE ||
       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
   // that they don't clash with the non-MD colors in the cache.
   int original_id = id;
   if (isModeMaterial && incognito && is_tab_or_toolbar_color) {
     id += kMaterialDesignIdOffset;
   }
 
   // Check to see if we already have the color in the cache.
@@ skipping 15 matching lines @@
 
 bool ThemeService::HasCustomColor(int id) const {
   SkColor color;
   return theme_supplier_ && theme_supplier_->GetColor(id, &color);
 }
 
 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;
   }
 
   // Check to see if we already have the color in the cache.
   NSColorMap::const_iterator nscolor_iter = nscolor_cache_.find(id);
   if (nscolor_iter != nscolor_cache_.end())
     return nscolor_iter->second;
 
   SkColor sk_color = GetColor(original_id, incognito);
@@ skipping 183 matching lines @@
 
 bool ThemeService::BrowserThemeProvider::ShouldIncreaseContrast() const {
   NSWorkspace* workspace = [NSWorkspace sharedWorkspace];
   if ([workspace
           respondsToSelector:@selector(
                                  accessibilityDisplayShouldIncreaseContrast)]) {
     return workspace.accessibilityDisplayShouldIncreaseContrast == YES;
   }
   return false;
 }