Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(223)

Side by Side Diff: chrome/browser/favicon_service.cc

Issue 6713082: Move WebUIFactory to chrome/browser. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: synced Created 9 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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/ui/webui/chrome_web_ui_factory.h"
10 #include "chrome/common/url_constants.h" 11 #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 history::IconType icon_type, 18 history::IconType icon_type,
19 CancelableRequestConsumerBase* consumer, 19 CancelableRequestConsumerBase* consumer,
20 FaviconDataCallback* callback) { 20 FaviconDataCallback* callback) {
21 GetFaviconRequest* request = new GetFaviconRequest(callback); 21 GetFaviconRequest* request = new GetFaviconRequest(callback);
(...skipping 25 matching lines...) Expand all
47 FaviconService::Handle FaviconService::GetFaviconForURL( 47 FaviconService::Handle FaviconService::GetFaviconForURL(
48 const GURL& page_url, 48 const GURL& page_url,
49 int icon_types, 49 int icon_types,
50 CancelableRequestConsumerBase* consumer, 50 CancelableRequestConsumerBase* consumer,
51 FaviconDataCallback* callback) { 51 FaviconDataCallback* callback) {
52 GetFaviconRequest* request = new GetFaviconRequest(callback); 52 GetFaviconRequest* request = new GetFaviconRequest(callback);
53 AddRequest(request, consumer); 53 AddRequest(request, consumer);
54 FaviconService::Handle handle = request->handle(); 54 FaviconService::Handle handle = request->handle();
55 if (page_url.SchemeIs(chrome::kChromeUIScheme) || 55 if (page_url.SchemeIs(chrome::kChromeUIScheme) ||
56 page_url.SchemeIs(chrome::kExtensionScheme)) { 56 page_url.SchemeIs(chrome::kExtensionScheme)) {
57 WebUIFactory::GetFaviconForURL(profile_, request, page_url); 57 ChromeWebUIFactory::GetInstance()->GetFaviconForURL(
58 profile_, request, page_url);
58 } else { 59 } else {
59 HistoryService* hs = profile_->GetHistoryService(Profile::EXPLICIT_ACCESS); 60 HistoryService* hs = profile_->GetHistoryService(Profile::EXPLICIT_ACCESS);
60 if (hs) 61 if (hs)
61 hs->GetFaviconForURL(request, page_url, icon_types); 62 hs->GetFaviconForURL(request, page_url, icon_types);
62 else 63 else
63 ForwardEmptyResultAsync(request); 64 ForwardEmptyResultAsync(request);
64 } 65 }
65 return handle; 66 return handle;
66 } 67 }
67 68
(...skipping 19 matching lines...) Expand all
87 hs->SetFavicon(page_url, icon_url, image_data, icon_type); 88 hs->SetFavicon(page_url, icon_url, image_data, icon_type);
88 } 89 }
89 90
90 FaviconService::~FaviconService() { 91 FaviconService::~FaviconService() {
91 } 92 }
92 93
93 void FaviconService::ForwardEmptyResultAsync(GetFaviconRequest* request) { 94 void FaviconService::ForwardEmptyResultAsync(GetFaviconRequest* request) {
94 request->ForwardResultAsync(FaviconDataCallback::TupleType( 95 request->ForwardResultAsync(FaviconDataCallback::TupleType(
95 request->handle(), history::FaviconData())); 96 request->handle(), history::FaviconData()));
96 } 97 }
OLDNEW
« no previous file with comments | « chrome/browser/extensions/extension_host.cc ('k') | chrome/browser/notifications/balloon_host.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698