Provide assumed favicon for intents if service provider page was never visited.

chrome/browser/ui/browser.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/browser.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
 #include <shellapi.h>
 #endif  // OS_WIN
@@ skipping 2546 matching lines @@
   }
 }
 
 // static
 void Browser::RegisterIntentHandlerHelper(TabContents* tab,
                                           const string16& action,
                                           const string16& type,
                                           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();
     service_url = url.Resolve(href);
   }
 
   webkit_glue::WebIntentServiceData service;
   service.service_url = service_url;
   service.action = action;
   service.type = type;
   service.title = title;
   service.setDisposition(disposition);
 
   InfoBarTabHelper* infobar_helper = tcw->infobar_tab_helper();
   infobar_helper->AddInfoBar(new RegisterIntentHandlerInfoBarDelegate(
       infobar_helper,
       WebIntentsRegistryFactory::GetForProfile(tcw->profile()),
-      service));
+      service,
+      favicon_service,
+      tab->GetURL()));
 }
 
 // static
 void Browser::FindReplyHelper(TabContents* tab,
                               int request_id,
                               int number_of_matches,
                               const gfx::Rect& selection_rect,
                               int active_match_ordinal,
                               bool final_update) {
   TabContentsWrapper* tcw = TabContentsWrapper::GetCurrentWrapperForContents(
@@ skipping 2891 matching lines @@
 }
 
 void Browser::UpdateFullscreenExitBubbleContent() {
   GURL url;
   if (fullscreened_tab_)
     url = fullscreened_tab_->tab_contents()->GetURL();
 
   window_->UpdateFullscreenExitBubbleContent(
       url, GetFullscreenExitBubbleType());
 }