| Index: components/favicon/core/favicon_service.cc
|
| diff --git a/components/favicon/core/favicon_service.cc b/components/favicon/core/favicon_service.cc
|
| index 57a29deaf5fe69c7250a85ef799d064bab7ffe7a..69b03ce6306d7b715ad70387dd15490c2f434d25 100644
|
| --- a/components/favicon/core/favicon_service.cc
|
| +++ b/components/favicon/core/favicon_service.cc
|
| @@ -18,7 +18,6 @@
|
| #include "components/history/core/browser/history_service.h"
|
| #include "third_party/skia/include/core/SkBitmap.h"
|
| #include "ui/gfx/codec/png_codec.h"
|
| -#include "ui/gfx/favicon_size.h"
|
| #include "ui/gfx/image/image_skia.h"
|
| #include "url/gurl.h"
|
|
|
| @@ -133,13 +132,14 @@ base::CancelableTaskTracker::TaskId FaviconService::GetFavicon(
|
| base::CancelableTaskTracker::TaskId FaviconService::GetFaviconImageForPageURL(
|
| const GURL& page_url,
|
| const favicon_base::FaviconImageCallback& callback,
|
| - base::CancelableTaskTracker* tracker) {
|
| + base::CancelableTaskTracker* tracker,
|
| + const int faviconSize) {
|
| TRACE_EVENT0("browser", "FaviconService::GetFaviconImageForPageURL");
|
| return GetFaviconForPageURLImpl(
|
| page_url, favicon_base::FAVICON,
|
| - GetPixelSizesForFaviconScales(gfx::kFaviconSize),
|
| + GetPixelSizesForFaviconScales(faviconSize),
|
| base::Bind(&FaviconService::RunFaviconImageCallbackWithBitmapResults,
|
| - base::Unretained(this), callback, gfx::kFaviconSize),
|
| + base::Unretained(this), callback, faviconSize),
|
| tracker);
|
| }
|
|
|
|
|