Remove MaterialDesignController::IsModeMaterial

components/infobars/core/infobar.cc

 // Copyright 2014 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 "components/infobars/core/infobar.h"
 
 #include <cmath>
 #include <utility>
 
 #include "base/logging.h"
 #include "build/build_config.h"
 #include "components/infobars/core/infobar_container.h"
 #include "components/infobars/core/infobar_manager.h"
-#include "ui/base/material_design/material_design_controller.h"
 #include "ui/gfx/animation/slide_animation.h"
 
 namespace infobars {
 
 InfoBar::InfoBar(std::unique_ptr<InfoBarDelegate> delegate)
     : owner_(NULL),
       delegate_(std::move(delegate)),
       container_(NULL),
       animation_(this),
       arrow_height_(0),
       arrow_target_height_(0),
       arrow_half_width_(0),
       bar_height_(0),
       bar_target_height_(-1) {
   DCHECK(delegate_ != NULL);
   animation_.SetTweenType(gfx::Tween::LINEAR);
   delegate_->set_infobar(this);
 }
 
 InfoBar::~InfoBar() {
   DCHECK(!owner_);
 }
 
 // static
-SkColor InfoBar::GetTopColor(InfoBarDelegate::Type infobar_type) {
-  if (ui::MaterialDesignController::IsModeMaterial()) {
-    static const SkColor kWarningBackgroundColorMd =
-        SkColorSetRGB(0xFF, 0xEC, 0xB3);  // Yellow
-    static const SkColor kPageActionBackgroundColorMd = SK_ColorWHITE;
+SkColor InfoBar::GetBackgroundColor(InfoBarDelegate::Type infobar_type) {
+  static const SkColor kWarningBackgroundColor =
+      SkColorSetRGB(0xFF, 0xEC, 0xB3);  // Yellow
+  static const SkColor kPageActionBackgroundColor = SK_ColorWHITE;

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

Nit: This one can be constexpr

(The other can't because in debug mode SkColorSetRGB() calls an assertion
function which printfs.)

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

Done.

 
-    return infobar_type == InfoBarDelegate::WARNING_TYPE ?
-        kWarningBackgroundColorMd : kPageActionBackgroundColorMd;
-  }
-
-  static const SkColor kWarningBackgroundColorTop =
-      SkColorSetRGB(255, 242, 183);  // Yellow
-  static const SkColor kPageActionBackgroundColorTop =
-      SkColorSetRGB(237, 237, 237);  // Gray
-  return (infobar_type == InfoBarDelegate::WARNING_TYPE) ?
-      kWarningBackgroundColorTop : kPageActionBackgroundColorTop;
-}
-
-// static
-SkColor InfoBar::GetBottomColor(InfoBarDelegate::Type infobar_type) {
-  // No gradient in MD.
-  if (ui::MaterialDesignController::IsModeMaterial())
-    return GetTopColor(infobar_type);
-
-  static const SkColor kWarningBackgroundColorBottom =
-      SkColorSetRGB(250, 230, 145);  // Yellow
-  static const SkColor kPageActionBackgroundColorBottom =
-      SkColorSetRGB(217, 217, 217);  // Gray
-  return (infobar_type == InfoBarDelegate::WARNING_TYPE) ?
-      kWarningBackgroundColorBottom : kPageActionBackgroundColorBottom;
+  return infobar_type == InfoBarDelegate::WARNING_TYPE
+             ? kWarningBackgroundColor
+             : kPageActionBackgroundColor;
 }
 
 void InfoBar::SetOwner(InfoBarManager* owner) {
   DCHECK(!owner_);
   owner_ = owner;
   delegate_->set_nav_entry_id(owner->GetActiveEntryID());
   PlatformSpecificSetOwner();
 }
 
 void InfoBar::Show(bool animate) {
@@ skipping 89 matching lines @@
 
 void InfoBar::MaybeDelete() {
   if (!owner_ && (animation_.GetCurrentValue() == 0.0)) {
     if (container_)
       container_->RemoveInfoBar(this);
     delete this;
   }
 }
 
 }  // namespace infobars