Provide assumed favicon for intents if page was never visited.

If the service_url has never been visited, the IntentsPicker used to show
a default icon. This change will instead associate the favicon of the
registration page with the service_url page.

BUG=99784
TEST=Start with clean browser install. Run with --enable-web-intents, register a provider from webintents.org. Start picker, it should show WI favicon.


Review URL: http://codereview.chromium.org/8469018

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@110662 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 9 insertions, 3 deletions

diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc
index b25dd85..2855fc9 100644
--- a/chrome/browser/ui/browser.cc
+++ b/chrome/browser/ui/browser.cc
@@ -2576,14 +2576,18 @@ void Browser::RegisterIntentHandlerHelper(TabContents* tab,
                                           const string16& href,
                                           const string16& title,
                                           const string16& disposition) {
+  if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kEnableWebIntents))
+    return;
+
   TabContentsWrapper* tcw = TabContentsWrapper::GetCurrentWrapperForContents(
       tab);
   if (!tcw || tcw->profile()->IsOffTheRecord())
     return;
 
-  if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kEnableWebIntents))
-    return;
+  FaviconService* favicon_service =
+      tcw->profile()->GetFaviconService(Profile::EXPLICIT_ACCESS);
 
+  // |href| can be relative to originating URL. Resolve if necessary.
   GURL service_url(href);
   if (!service_url.is_valid()) {
     const GURL& url = tab->GetURL();
@@ -2600,7 +2604,9 @@ void Browser::RegisterIntentHandlerHelper(TabContents* tab,
   RegisterIntentHandlerInfoBarDelegate::MaybeShowIntentInfoBar(
       tcw->infobar_tab_helper(),
       WebIntentsRegistryFactory::GetForProfile(tcw->profile()),
-      service);
+      service,
+      favicon_service,
+      tab->GetURL());
 }
 
 // static