| Index: chrome/browser/intents/register_intent_handler_infobar_delegate.h
|
| diff --git a/chrome/browser/intents/register_intent_handler_infobar_delegate.h b/chrome/browser/intents/register_intent_handler_infobar_delegate.h
|
| index 473eb333b12b21dcdf4eba01bd2409904dd440a1..3f3a27d76476b58eb1a0f695721603fe92f27471 100644
|
| --- a/chrome/browser/intents/register_intent_handler_infobar_delegate.h
|
| +++ b/chrome/browser/intents/register_intent_handler_infobar_delegate.h
|
| @@ -14,6 +14,8 @@
|
| class InfoBarTabHelper;
|
| class TabContents;
|
| class WebIntentsRegistry;
|
| +class FaviconService;
|
| +class GURL;
|
|
|
| // The InfoBar used to request permission for a site to be registered as an
|
| // Intent handler.
|
| @@ -22,7 +24,9 @@ class RegisterIntentHandlerInfoBarDelegate : public ConfirmInfoBarDelegate {
|
| RegisterIntentHandlerInfoBarDelegate(
|
| InfoBarTabHelper* infobar_helper,
|
| WebIntentsRegistry* registry,
|
| - const webkit_glue::WebIntentServiceData& service);
|
| + const webkit_glue::WebIntentServiceData& service,
|
| + FaviconService* favicon_service,
|
| + const GURL& origin_url);
|
|
|
| // ConfirmInfoBarDelegate implementation.
|
| virtual Type GetInfoBarType() const OVERRIDE;
|
| @@ -38,10 +42,14 @@ class RegisterIntentHandlerInfoBarDelegate : public ConfirmInfoBarDelegate {
|
| // may be shown. Must not be NULL.
|
| // |registry| is the data source for web intents. Must not be NULL.
|
| // |service| is the candidate service to show the infobar for.
|
| + // |favicon_service| is the favicon service to use. Must not be NULL.
|
| + // |origin_url| is the URL that the intent is registered from.
|
| static void MaybeShowIntentInfoBar(
|
| InfoBarTabHelper* infobar_helper,
|
| WebIntentsRegistry* registry,
|
| - const webkit_glue::WebIntentServiceData& service);
|
| + const webkit_glue::WebIntentServiceData& service,
|
| + FaviconService* favicon_service,
|
| + const GURL& origin_url);
|
|
|
| private:
|
| // The web intents registry to use. Weak pointer.
|
| @@ -50,6 +58,12 @@ class RegisterIntentHandlerInfoBarDelegate : public ConfirmInfoBarDelegate {
|
| // The cached intent service data bundle passed up from the renderer.
|
| webkit_glue::WebIntentServiceData service_;
|
|
|
| + // The favicon service to use. Weak pointer.
|
| + FaviconService* favicon_service_;
|
| +
|
| + // The URL of the page the service was originally registered from.
|
| + GURL origin_url_;
|
| +
|
| DISALLOW_COPY_AND_ASSIGN(RegisterIntentHandlerInfoBarDelegate);
|
| };
|
|
|
|
|