[MD] Fix some ink drop colors

chrome/browser/ui/views/bookmarks/bookmark_bar_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/bookmarks/bookmark_bar_view.h"
 
 #include <stdint.h>
 
 #include <algorithm>
 #include <limits>
@@ skipping 209 matching lines @@
                                    kButtonPaddingHorizontal));
     return border;
   }
 
   bool IsTriggerableEvent(const ui::Event& e) override {
     return e.type() == ui::ET_GESTURE_TAP ||
            e.type() == ui::ET_GESTURE_TAP_DOWN ||
            event_utils::IsPossibleDispositionEvent(e);
   }
 
+  SkColor GetInkDropBaseColor() const override {

[Evan Stade, 2016/03/01 00:23:37]

Moving this here makes it apply to the app shortcut.

I've also changed the color to match the other buttons on the toolbar.

+    return GetThemeProvider()->GetColor(
+        ThemeProperties::COLOR_TOOLBAR_BUTTON_ICON);
+  }
+
  private:
   scoped_ptr<gfx::SlideAnimation> show_animation_;
 
   // Controls the visual feedback for the button state.
   views::ButtonInkDropDelegate ink_drop_delegate_;
 
   DISALLOW_COPY_AND_ASSIGN(BookmarkButtonBase);
 };
 
 // BookmarkButton -------------------------------------------------------------
@@ skipping 1449 matching lines @@
 void BookmarkBarView::ConfigureButton(const BookmarkNode* node,
                                       views::LabelButton* button) {
   button->SetText(node->GetTitle());
   button->SetAccessibleName(node->GetTitle());
   button->set_id(VIEW_ID_BOOKMARK_BAR_ELEMENT);
   // We don't always have a theme provider (ui tests, for example).
   if (GetThemeProvider()) {
     SkColor color =
         GetThemeProvider()->GetColor(ThemeProperties::COLOR_BOOKMARK_TEXT);
     button->SetEnabledTextColors(color);
-    button->set_ink_drop_base_color(color_utils::DeriveDefaultIconColor(color));
     if (node->is_folder()) {
       button->SetImage(views::Button::STATE_NORMAL,
                        chrome::GetBookmarkFolderIcon(color));
     }
   }
 
   button->SetMinSize(gfx::Size());
   button->set_context_menu_controller(this);
   button->set_drag_controller(this);
   if (node->is_url()) {
@@ skipping 366 matching lines @@
     return;
   apps_page_shortcut_->SetVisible(visible);
   UpdateBookmarksSeparatorVisibility();
   LayoutAndPaint();
 }
 
 void BookmarkBarView::OnShowManagedBookmarksPrefChanged() {
   if (UpdateOtherAndManagedButtonsVisibility())
     LayoutAndPaint();
 }