[MD] update EV bubble icon and location bar https icons

chrome/browser/ui/views/location_bar/icon_label_bubble_view.cc

 // Copyright (c) 2012 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/ui/views/location_bar/icon_label_bubble_view.h"
 
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/ui/views/layout_constants.h"
 #include "chrome/browser/ui/views/location_bar/background_with_1_px_border.h"
 #include "ui/base/resource/material_design/material_design_controller.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/color_utils.h"
+#include "ui/native_theme/native_theme.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/painter.h"
 
 namespace {
 
 SkColor CalculateImageColor(gfx::ImageSkia* image) {
   // We grab the color of the middle pixel of the image, which we treat as
   // the representative color of the entire image (reasonable, given the current
   // appearance of these assets).
   const SkBitmap& bitmap(image->GetRepresentation(1.0f).sk_bitmap());
@@ skipping 91 matching lines @@
                     height());
 }
 
 void IconLabelBubbleView::OnNativeThemeChanged(
     const ui::NativeTheme* native_theme) {
   if (!ui::MaterialDesignController::IsModeMaterial())
     return;
 
   label_->SetEnabledColor(GetTextColor());
 
-  bool inverted =
-      color_utils::GetLuminanceForColor(parent_background_color_) < 128;
+  bool inverted = IsInvertedColorScheme();
   SkColor border_color = inverted ? SK_ColorWHITE : GetBorderColor();
   SkColor background_color =
       inverted ? SK_ColorWHITE : SkColorSetA(border_color, 0x13);
   set_background(
       new BackgroundWith1PxBorder(background_color, border_color, false));
   SetLabelBackgroundColor(background_color);
 }
 
+bool IconLabelBubbleView::IsInvertedColorScheme() const {
+  return color_utils::IsDark(GetNativeTheme()->GetSystemColor(
+      ui::NativeTheme::kColorId_TextfieldDefaultBackground));

[Peter Kasting, 2015/11/17 21:27:03]

The code to get this background color is repeated in SetLabelBackgroundColor().

I think it might make sense to have a member function that returns that color. 
Then the question is whether we still need IsInvertedColorScheme(), or whether
the two callsites of it can just do

  bool inverted = color_utils::IsDark(GetBackgroundColor());

...which is almost as short and seems just about as clear.  This would also
match e.g. LocationBarView::GetSecureTextColor().

[Evan Stade, 2015/11/17 22:57:21]

Done.

+}
+
 gfx::Size IconLabelBubbleView::GetSizeForLabelWidth(int width) const {
   gfx::Size size(image_->GetPreferredSize());
   if (ShouldShowBackground()) {
     const int non_label_width = GetBubbleOuterPadding(true) +
                                 GetImageAndPaddingWidth() +
                                 GetBubbleOuterPadding(false);
     size = gfx::Size(WidthMultiplier() * (width + non_label_width), 0);
     if (!ui::MaterialDesignController::IsModeMaterial())
       size.SetToMax(background_painter_->GetMinimumSize());
   }
@@ skipping 13 matching lines @@
 int IconLabelBubbleView::GetBubbleOuterPaddingMd(bool leading) const {
   // When the image is empty, leading and trailing padding are equal.
   if (image_->GetPreferredSize().IsEmpty() || !leading)
     return GetLayoutConstant(ICON_LABEL_VIEW_TRAILING_PADDING);
 
   // Leading padding is 2dp.
   return 2;
 }
 
 void IconLabelBubbleView::SetLabelBackgroundColor(
-    SkColor background_image_color) {
+    SkColor chip_background_color) {
+  SkColor parent_background_color =
+      ui::MaterialDesignController::IsModeMaterial()
+          ? GetNativeTheme()->GetSystemColor(
+                ui::NativeTheme::kColorId_TextfieldDefaultBackground)
+          : parent_background_color_;
   // The background images are painted atop |parent_background_color_|.
-  // Alpha-blend |background_image_color| with |parent_background_color_| to
+  // Alpha-blend |chip_background_color| with |parent_background_color_| to
   // determine the actual color the label text will sit atop.
-  // Tricky bit: We alpha blend an opaque version of |background_image_color|
+  // Tricky bit: We alpha blend an opaque version of |chip_background_color|
   // against |parent_background_color_| using the original image grid color's
   // alpha. This is because AlphaBlend(a, b, 255) always returns |a| unchanged
   // even if |a| is a color with non-255 alpha.
   label_->SetBackgroundColor(color_utils::AlphaBlend(
-      SkColorSetA(background_image_color, 255), parent_background_color_,
-      SkColorGetA(background_image_color)));
+      SkColorSetA(chip_background_color, 255), parent_background_color,
+      SkColorGetA(chip_background_color)));
 }
 
 const char* IconLabelBubbleView::GetClassName() const {
   return "IconLabelBubbleView";
 }
 
 void IconLabelBubbleView::OnPaint(gfx::Canvas* canvas) {
   if (!ShouldShowBackground())
     return;
   if (background_painter_)
     background_painter_->Paint(canvas, size());
   if (background())
     background()->Paint(canvas, this);
 }