Remove MaterialDesignController::IsModeMaterial

components/infobars/core/infobar.cc

Index: components/infobars/core/infobar.cc
diff --git a/components/infobars/core/infobar.cc b/components/infobars/core/infobar.cc
index f71717403070d1387d216b1a3be104f88a52f981..d4b5458dd4c1cf5ebcac75ac8f8519ec80d4a144 100644
--- a/components/infobars/core/infobar.cc
+++ b/components/infobars/core/infobar.cc
@@ -11,7 +11,6 @@
 #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 {
@@ -36,36 +35,14 @@ InfoBar::~InfoBar() {
 }
 
 // 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;
-
-    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;
+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
+             ? kWarningBackgroundColor
+             : kPageActionBackgroundColor;
 }
 
 void InfoBar::SetOwner(InfoBarManager* owner) {