| Index: chrome/browser/favicon/favicon_utils.cc
|
| diff --git a/chrome/browser/favicon/favicon_utils.cc b/chrome/browser/favicon/favicon_utils.cc
|
| index a662aeb28f226ad69a0284474c9dd97b8d498e71..18c9bc53d9da0e9dc0b677a560e0c7cca278b708 100644
|
| --- a/chrome/browser/favicon/favicon_utils.cc
|
| +++ b/chrome/browser/favicon/favicon_utils.cc
|
| @@ -10,10 +10,24 @@
|
| #include "chrome/browser/profiles/profile.h"
|
| #include "chrome/browser/search/search.h"
|
| #include "chrome/common/url_constants.h"
|
| +#include "components/favicon/content/content_favicon_driver.h"
|
| +#include "content/public/browser/navigation_controller.h"
|
| +#include "content/public/browser/navigation_entry.h"
|
| #include "content/public/common/favicon_url.h"
|
| +#include "ui/gfx/image/image.h"
|
| +#include "ui/gfx/image/image_skia.h"
|
| +#include "ui/gfx/image/image_skia_operations.h"
|
|
|
| namespace favicon {
|
|
|
| +namespace {
|
| +
|
| +// Desaturate favicon HSL shift values.
|
| +const double kDesaturateHue = -1.0;
|
| +const double kDesaturateSaturation = 0.0;
|
| +const double kDesaturateLightness = 0.6;
|
| +}
|
| +
|
| void CreateContentFaviconDriverForWebContents(
|
| content::WebContents* web_contents) {
|
| DCHECK(web_contents);
|
| @@ -51,4 +65,27 @@ bool ShouldDisplayFavicon(content::WebContents* web_contents) {
|
| return true;
|
| }
|
|
|
| +gfx::Image TabFaviconFromWebContents(content::WebContents* contents) {
|
| + DCHECK(contents);
|
| +
|
| + favicon::FaviconDriver* favicon_driver =
|
| + favicon::ContentFaviconDriver::FromWebContents(contents);
|
| + gfx::Image favicon = favicon_driver->GetFavicon();
|
| +
|
| + // Desaturate the favicon if the navigation entry contains a network error.
|
| + if (!contents->IsLoadingToDifferentDocument()) {
|
| + const content::NavigationController& controller = contents->GetController();
|
| +
|
| + content::NavigationEntry* entry = controller.GetLastCommittedEntry();
|
| + if (entry && (entry->GetPageType() == content::PAGE_TYPE_ERROR)) {
|
| + color_utils::HSL shift = {kDesaturateHue, kDesaturateSaturation,
|
| + kDesaturateLightness};
|
| + return gfx::Image(gfx::ImageSkiaOperations::CreateHSLShiftedImage(
|
| + *favicon.ToImageSkia(), shift));
|
| + }
|
| + }
|
| +
|
| + return favicon;
|
| +}
|
| +
|
| } // namespace favicon
|
|
|