| Index: chrome/browser/instant/instant_controller.cc
|
| diff --git a/chrome/browser/instant/instant_controller.cc b/chrome/browser/instant/instant_controller.cc
|
| index 69d2e7d91ffba0a64a1558ed312862de113e54d0..5e0dfb5858f3c5a7fef9bbc39a75e3fb85d84325 100644
|
| --- a/chrome/browser/instant/instant_controller.cc
|
| +++ b/chrome/browser/instant/instant_controller.cc
|
| @@ -30,6 +30,7 @@
|
| #include "content/public/browser/render_widget_host_view.h"
|
| #include "content/public/browser/web_contents.h"
|
| #include "ui/gfx/codec/png_codec.h"
|
| +#include "ui/gfx/image/image_skia.h"
|
|
|
| #if defined(TOOLKIT_VIEWS)
|
| #include "ui/views/widget/widget.h"
|
| @@ -345,14 +346,8 @@ TabContents* InstantController::ReleasePreviewContents(InstantCommitType type) {
|
| preview->profile(), Profile::EXPLICIT_ACCESS);
|
| if (favicon_service && entry->GetFavicon().valid &&
|
| entry->GetFavicon().image.IsEmpty()) {
|
| - std::vector<unsigned char> image_data;
|
| - // TODO: Add all variants once the history service supports it.
|
| - gfx::PNGCodec::EncodeBGRASkBitmap(
|
| - entry->GetFavicon().image.AsBitmap(), false, &image_data);
|
| - favicon_service->SetFavicon(entry->GetURL(),
|
| - entry->GetFavicon().url,
|
| - image_data,
|
| - history::FAVICON);
|
| + favicon_service->SetFavicons(entry->GetURL(), entry->GetFavicon().url,
|
| + history::FAVICON, entry->GetFavicon().image);
|
| }
|
| }
|
|
|
|
|