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 134 matching lines @@
 }
 
 void BubbleIconView::RemoveInkDropLayer(ui::Layer* ink_drop_layer) {
   layer()->Remove(ink_drop_layer);
   SetFillsBoundsOpaquely(true);
   SetPaintToLayer(false);
   image_->SetFillsBoundsOpaquely(true);
   image_->SetPaintToLayer(false);
 }
 
+gfx::Point BubbleIconView::CalculateInkDropCenter() const {
+  return GetLocalBounds().CenterPoint();
+}
+
+bool BubbleIconView::ShouldShowInkDropHover() const {
+  // BubbleIconView views don't show hover effect.
+  return false;
+}
+
+SkColor BubbleIconView::GetInkDropBaseColor() const {
+  return color_utils::DeriveDefaultIconColor(GetNativeTheme()->GetSystemColor(
+      ui::NativeTheme::kColorId_TextfieldDefaultColor));
+}
+
 void BubbleIconView::OnWidgetDestroying(views::Widget* widget) {
   widget->RemoveObserver(this);
 }
 
 void BubbleIconView::OnWidgetVisibilityChanged(views::Widget* widget,
                                                bool visible) {
   // |widget| is a bubble that has just got shown / hidden.
   if (!visible)
     ink_drop_delegate_->OnAction(views::InkDropState::DEACTIVATED);
 }
@@ skipping 12 matching lines @@
   return false;
 }
 
 void BubbleIconView::OnBoundsChanged(const gfx::Rect& previous_bounds) {
   views::BubbleDelegateView* bubble = GetBubble();
   if (bubble)
     bubble->OnAnchorBoundsChanged();
   ink_drop_delegate_->OnLayout();
 }
 
-gfx::Point BubbleIconView::CalculateInkDropCenter() const {
-  return GetLocalBounds().CenterPoint();
-}
-
-bool BubbleIconView::ShouldShowInkDropHover() const {
-  // BubbleIconView views don't show hover effect.
-  return false;
-}
-
 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));
+  SkColor icon_color = active_
+                           ? GetNativeTheme()->GetSystemColor(
+                                 ui::NativeTheme::kColorId_CallToActionColor)
+                           : GetInkDropBaseColor();
   image_->SetImage(
       gfx::CreateVectorIcon(GetVectorIcon(), icon_size, icon_color));
 }
 
 void BubbleIconView::SetActiveInternal(bool active) {
   if (active_ == active)
     return;
   active_ = active;
   UpdateIcon();
 }