Change chrome:// favicons in tabstrip based on theming.

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 71 matching lines @@
 #include "ui/base/page_transition_types.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/theme_provider.h"
 #include "ui/base/window_open_disposition.h"
 #include "ui/compositor/paint_recorder.h"
 #include "ui/gfx/animation/slide_animation.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/color_utils.h"
 #include "ui/gfx/favicon_size.h"
 #include "ui/gfx/geometry/rect.h"
+#include "ui/gfx/image/image_skia_operations.h"
 #include "ui/gfx/paint_vector_icon.h"
 #include "ui/gfx/scoped_canvas.h"
 #include "ui/gfx/text_constants.h"
 #include "ui/gfx/text_elider.h"
 #include "ui/gfx/vector_icons_public.h"
 #include "ui/resources/grit/ui_resources.h"
 #include "ui/views/animation/flood_fill_ink_drop_ripple.h"
 #include "ui/views/animation/ink_drop_highlight.h"
 #include "ui/views/button_drag_utils.h"
 #include "ui/views/controls/button/label_button.h"
@@ skipping 1676 matching lines @@
     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()) {
-    const gfx::Image& favicon = model_->GetFavicon(node);
-    button->SetImage(views::Button::STATE_NORMAL,
-                     favicon.IsEmpty() ? *GetImageSkiaNamed(IDR_DEFAULT_FAVICON)
-                                       : *favicon.ToImageSkia());
+    // Themify chrome:// favicons and the default one.

[Peter Kasting, 2016/06/30 00:07:04]

Nit: Might want to add "This ensures they're visible over the tab background" or
some other motivator.

[Evan Stade, 2016/06/30 15:39:45]

Done.

+    bool themify_icon = node->url().SchemeIs(content::kChromeUIScheme);
+    gfx::ImageSkia favicon = model_->GetFavicon(node).AsImageSkia();
+    if (favicon.isNull()) {
+      favicon = *GetImageSkiaNamed(IDR_DEFAULT_FAVICON);
+      themify_icon = true;
+    }
+
+    if (themify_icon && GetThemeProvider()) {
+      favicon = gfx::ImageSkiaOperations::CreateHSLShiftedImage(
+          favicon, GetThemeProvider()->GetTint(ThemeProperties::TINT_BUTTONS));
+    }
+
+    button->SetImage(views::Button::STATE_NORMAL, favicon);
   }
   button->SetMaxSize(gfx::Size(kMaxButtonWidth, 0));
 }
 
 bool BookmarkBarView::BookmarkNodeAddedImpl(BookmarkModel* model,
                                             const BookmarkNode* parent,
                                             int index) {
   const bool needs_layout_and_paint = UpdateOtherAndManagedButtonsVisibility();
   if (parent != model->bookmark_bar_node())
     return needs_layout_and_paint;
@@ skipping 357 matching lines @@
     return;
   apps_page_shortcut_->SetVisible(visible);
   UpdateBookmarksSeparatorVisibility();
   LayoutAndPaint();
 }
 
 void BookmarkBarView::OnShowManagedBookmarksPrefChanged() {
   if (UpdateOtherAndManagedButtonsVisibility())
     LayoutAndPaint();
 }