Color the ink drop ripple and hover effects based on theming.

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/layout_constants.h"
 #include "chrome/browser/ui/views/location_bar/background_with_1_px_border.h"
 #include "ui/base/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/animation/ink_drop_hover.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 107 matching lines @@
     return;
 
   bool inverted = color_utils::IsDark(GetParentBackgroundColor());
   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));
   SetLabelBackgroundColor(background_color);
 }
 
+void IconLabelBubbleView::AddInkDropLayer(ui::Layer* ink_drop_layer) {
+  image()->SetPaintToLayer(true);
+  image()->SetFillsBoundsOpaquely(false);
+  InkDropHostView::AddInkDropLayer(ink_drop_layer);
+}
+
+void IconLabelBubbleView::RemoveInkDropLayer(ui::Layer* ink_drop_layer) {
+  InkDropHostView::RemoveInkDropLayer(ink_drop_layer);
+  image()->SetFillsBoundsOpaquely(true);

[sky, 2016/02/25 00:38:32]

this isn't needed (because you destroy the layer on the next line).

[Evan Stade, 2016/02/25 01:34:28]

good call. This is a copy-pasta error so I've updated several other affected
places as well.

I'm wondering if we need SetFillsBoundsOpaquely to take a parameter at all ---
do we ever want to set it to true? It seems not, given that's the default and
almost all views just pick one value and stick to it. I've started a secondary
CL to see if I can change that or at least clean up some more unnecessary calls.

[sky, 2016/02/25 02:26:55]

Seems like a weird limitation on view and layer. There are valid reasons to
toggle.

+  image()->SetPaintToLayer(false);
+}
+
+scoped_ptr<views::InkDropHover> IconLabelBubbleView::CreateInkDropHover()
+    const {
+  // Location bar views don't show hover effect.
+  return nullptr;
+}
+
+SkColor IconLabelBubbleView::GetInkDropBaseColor() const {
+  return color_utils::DeriveDefaultIconColor(GetTextColor());
+}
+
 SkColor IconLabelBubbleView::GetParentBackgroundColor() const {
   return ui::MaterialDesignController::IsModeMaterial()
              ? GetNativeTheme()->GetSystemColor(
                    ui::NativeTheme::kColorId_TextfieldDefaultBackground)
              : parent_background_color_;
 }
 
 gfx::Size IconLabelBubbleView::GetSizeForLabelWidth(int width) const {
   gfx::Size size(image_->GetPreferredSize());
   if (ShouldShowBackground()) {
@@ skipping 45 matching lines @@
 }
 
 void IconLabelBubbleView::OnPaint(gfx::Canvas* canvas) {
   if (!ShouldShowBackground())
     return;
   if (background_painter_)
     background_painter_->Paint(canvas, size());
   if (background())
     background()->Paint(canvas, this);
 }