| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/favicon_service.h" | 5 #include "chrome/browser/favicon_service.h" |
| 6 | 6 |
| 7 #include "chrome/browser/history/history.h" | 7 #include "chrome/browser/history/history.h" |
| 8 #include "chrome/browser/history/history_backend.h" | 8 #include "chrome/browser/history/history_backend.h" |
| 9 #include "chrome/browser/profiles/profile.h" | 9 #include "chrome/browser/profiles/profile.h" |
| 10 #include "chrome/browser/webui/web_ui_factory.h" | |
| 11 #include "chrome/common/url_constants.h" | 10 #include "chrome/common/url_constants.h" |
| 11 #include "content/browser/webui/web_ui_factory.h" |
| 12 | 12 |
| 13 FaviconService::FaviconService(Profile* profile) : profile_(profile) { | 13 FaviconService::FaviconService(Profile* profile) : profile_(profile) { |
| 14 } | 14 } |
| 15 | 15 |
| 16 FaviconService::Handle FaviconService::GetFavicon( | 16 FaviconService::Handle FaviconService::GetFavicon( |
| 17 const GURL& icon_url, | 17 const GURL& icon_url, |
| 18 CancelableRequestConsumerBase* consumer, | 18 CancelableRequestConsumerBase* consumer, |
| 19 FaviconDataCallback* callback) { | 19 FaviconDataCallback* callback) { |
| 20 GetFaviconRequest* request = new GetFaviconRequest(callback); | 20 GetFaviconRequest* request = new GetFaviconRequest(callback); |
| 21 AddRequest(request, consumer); | 21 AddRequest(request, consumer); |
| (...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 83 hs->SetFavicon(page_url, icon_url, image_data); | 83 hs->SetFavicon(page_url, icon_url, image_data); |
| 84 } | 84 } |
| 85 | 85 |
| 86 FaviconService::~FaviconService() { | 86 FaviconService::~FaviconService() { |
| 87 } | 87 } |
| 88 | 88 |
| 89 void FaviconService::ForwardEmptyResultAsync(GetFaviconRequest* request) { | 89 void FaviconService::ForwardEmptyResultAsync(GetFaviconRequest* request) { |
| 90 request->ForwardResultAsync(FaviconDataCallback::TupleType(request->handle(), | 90 request->ForwardResultAsync(FaviconDataCallback::TupleType(request->handle(), |
| 91 false, NULL, false, GURL())); | 91 false, NULL, false, GURL())); |
| 92 } | 92 } |
| OLD | NEW |