Infobar material design refresh: bg color

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 "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/resource/material_design/material_design_controller.h"
 #include "ui/gfx/animation/slide_animation.h"
 
 namespace infobars {
 
+namespace {
+
+static const SkColor kWarningBackgroundColorMd =
+    SkColorSetRGB(0xFF, 0xEC, 0xB3);  // Yellow
+static const SkColor kPageActionBackgroundColorMd = SK_ColorWHITE;

[Peter Kasting, 2015/09/02 21:46:10]

Nit: Put these in GetTopColor() so they're next to their uses, and so they match
how we already put the other color constants there (but see below also)

[Evan Stade, 2015/09/02 23:34:35]

done

+
+}  // namespace
+
 InfoBar::InfoBar(scoped_ptr<InfoBarDelegate> delegate)
     : owner_(NULL),
       delegate_(delegate.Pass()),
       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()) {
+    return infobar_type == InfoBarDelegate::WARNING_TYPE ?
+        kWarningBackgroundColorMd : kPageActionBackgroundColorMd;

[Peter Kasting, 2015/09/02 21:46:10]

Should we be getting these colors from the theme provider or something instead
of hardcoding them here?

[Evan Stade, 2015/09/02 23:34:35]

I don't see any other places where this is used in Chrome code yet, so for now
I'll leave it local to this file.

+  }
+
   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;
 }
 
 void InfoBar::SetOwner(InfoBarManager* owner) {
   DCHECK(!owner_);
@@ skipping 95 matching lines @@
 
 void InfoBar::MaybeDelete() {
   if (!owner_ && (animation_.GetCurrentValue() == 0.0)) {
     if (container_)
       container_->RemoveInfoBar(this);
     delete this;
   }
 }
 
 }  // namespace infobars