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

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

 // Copyright 2013 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/bubble_icon_view.h"
 
 #include "chrome/browser/command_updater.h"
 #include "ui/accessibility/ax_view_state.h"
 #include "ui/base/material_design/material_design_controller.h"
 #include "ui/events/event.h"
@@ skipping 96 matching lines @@
   return true;
 }
 
 void BubbleIconView::ViewHierarchyChanged(
     const ViewHierarchyChangedDetails& details) {
   View::ViewHierarchyChanged(details);
   if (details.is_add && GetNativeTheme())
     UpdateIcon();
 }
 
+void BubbleIconView::OnNativeThemeChanged(const ui::NativeTheme* theme) {
+  UpdateIcon();
+}
+
 void BubbleIconView::AddInkDropLayer(ui::Layer* ink_drop_layer) {
   image_->SetPaintToLayer(true);
   image_->SetFillsBoundsOpaquely(false);
   views::InkDropHostView::AddInkDropLayer(ink_drop_layer);
 }
 
 void BubbleIconView::RemoveInkDropLayer(ui::Layer* ink_drop_layer) {
   views::InkDropHostView::RemoveInkDropLayer(ink_drop_layer);
   image_->SetFillsBoundsOpaquely(true);
   image_->SetPaintToLayer(false);
 }
 
 scoped_ptr<views::InkDropHover> BubbleIconView::CreateInkDropHover() const {
   // BubbleIconView views don't show hover effect.
   return nullptr;
 }
 
-void BubbleIconView::OnNativeThemeChanged(const ui::NativeTheme* theme) {
-  UpdateIcon();
+SkColor BubbleIconView::GetInkDropBaseColor() const {
+  return color_utils::DeriveDefaultIconColor(GetNativeTheme()->GetSystemColor(
+      ui::NativeTheme::kColorId_TextfieldDefaultColor));
 }
 
 void BubbleIconView::OnGestureEvent(ui::GestureEvent* event) {
   if (event->type() == ui::ET_GESTURE_TAP) {
     ink_drop_delegate_->OnAction(views::InkDropState::ACTIVATED);
     ExecuteCommand(EXECUTE_SOURCE_GESTURE);
     event->SetHandled();
   }
 }
 
@@ skipping 31 matching lines @@
 void BubbleIconView::UpdateIcon() {
   if (SetRasterIcon())
     return;
 
   const int icon_size =
       ui::MaterialDesignController::IsModeMaterial() ? 16 : 18;
   const ui::NativeTheme* theme = GetNativeTheme();
   SkColor icon_color =
       active_
           ? theme->GetSystemColor(ui::NativeTheme::kColorId_CallToActionColor)
-          : color_utils::DeriveDefaultIconColor(theme->GetSystemColor(
-                ui::NativeTheme::kColorId_TextfieldDefaultColor));
+          : GetInkDropBaseColor();
   image_->SetImage(
       gfx::CreateVectorIcon(GetVectorIcon(), icon_size, icon_color));
 }
 
 void BubbleIconView::SetActiveInternal(bool active) {
   if (active_ == active)
     return;
   active_ = active;
   UpdateIcon();
 }