[MD] Use programmatic rendering for omnibox chips

chrome/browser/ui/views/location_bar/content_setting_image_view.h

Index: chrome/browser/ui/views/location_bar/content_setting_image_view.h
diff --git a/chrome/browser/ui/views/location_bar/content_setting_image_view.h b/chrome/browser/ui/views/location_bar/content_setting_image_view.h
index f68232fc2c1baa58401f3d208a7db741f4b6e24e..3b00a0afb9f6f49716f4faae811c363800655638 100644
--- a/chrome/browser/ui/views/location_bar/content_setting_image_view.h
+++ b/chrome/browser/ui/views/location_bar/content_setting_image_view.h
@@ -37,6 +37,7 @@ class ContentSettingImageView : public IconLabelBubbleView,
                                 public gfx::AnimationDelegate,
                                 public views::WidgetObserver {
  public:
+  // TODO(estade): remove |text_color| because it isn't necessary for MD.
   ContentSettingImageView(ContentSettingsType content_type,
                           LocationBarView* parent,
                           const gfx::FontList& font_list,
@@ -56,9 +57,11 @@ class ContentSettingImageView : public IconLabelBubbleView,
   // intervening "stay open" period.
   static const int kAnimationDurationMS;
 
-  // IconLabelBubbleView::
+  // IconLabelBubbleView:
   bool ShouldShowBackground() const override;
   double WidthMultiplier() const override;
+  SkColor GetTextColor() const override;
+  SkColor GetBorderColor() const override;

[Peter Kasting, 2015/11/05 06:22:11]

Nit: List overrides in the same order they appear in the base class (this
comment applies in all files)

[Evan Stade, 2015/11/05 23:59:06]

Done.

 
   // gfx::AnimationDelegate:
   void AnimationEnded(const gfx::Animation* animation) override;