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

Unified Diff: chrome/browser/ui/intents/web_intent_picker_controller.cc

Issue 10828263: Moving FaviconService to a ProfileKeyedService. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: resyncing with library after revert Created 8 years, 4 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/intents/web_intent_picker_controller.cc
===================================================================
--- chrome/browser/ui/intents/web_intent_picker_controller.cc (revision 152993)
+++ chrome/browser/ui/intents/web_intent_picker_controller.cc (working copy)
@@ -14,6 +14,7 @@
#include "chrome/browser/extensions/platform_app_launcher.h"
#include "chrome/browser/extensions/webstore_installer.h"
#include "chrome/browser/favicon/favicon_service.h"
+#include "chrome/browser/favicon/favicon_service_factory.h"
#include "chrome/browser/intents/cws_intents_registry_factory.h"
#include "chrome/browser/intents/default_web_intent_service.h"
#include "chrome/browser/intents/web_intents_registry_factory.h"
@@ -69,7 +70,8 @@
// Gets the favicon service for the profile in |tab_contents|.
FaviconService* GetFaviconService(TabContents* tab_contents) {
- return tab_contents->profile()->GetFaviconService(Profile::EXPLICIT_ACCESS);
+ return FaviconServiceFactory::GetForProfile(tab_contents->profile(),
+ Profile::EXPLICIT_ACCESS);
}
// Gets the web intents registry for the profile in |tab_contents|.
@@ -503,6 +505,7 @@
pending_async_count_++;
FaviconService::Handle handle = favicon_service->GetFaviconForURL(
+ tab_contents_->profile(),
service.service_url,
history::FAVICON,
&favicon_consumer_,
« no previous file with comments | « chrome/browser/ui/cocoa/history_menu_bridge.mm ('k') | chrome/browser/ui/intents/web_intent_picker_controller_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698