Pass user gesture indicator for RPH and intents.

We are moving to a policy which will change where we show
RPH and web intents registrations between infobar and page-action
type indicator depending on factors like user gesture, previous
showing of the infobar, and perhaps other considerations. This
change gets that user gesture indicator to the policy logic.

It also incorporates a change to the web intents registration IPC
to pass the service info struct instead of individual members. (Adding
the user gesture went over the param limit, and passing the struct
is a good change regardless.)

R=groby@chromium.org,jam@chromium.org
BUG=119438
TEST=*WebIntent*.*


Review URL: https://chromiumcodereview.appspot.com/10447067

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

2 files changed, 17 insertions, 19 deletions

diff --git a/chrome/browser/external_tab/external_tab_container_win.cc b/chrome/browser/external_tab/external_tab_container_win.cc
index 4cb512d..9c06ad8 100644
--- a/chrome/browser/external_tab/external_tab_container_win.cc
+++ b/chrome/browser/external_tab/external_tab_container_win.cc
@@ -736,18 +736,17 @@ void ExternalTabContainer::JSOutOfMemory(WebContents* tab) {
 void ExternalTabContainer::RegisterProtocolHandler(WebContents* tab,
                                                    const std::string& protocol,
                                                    const GURL& url,
-                                                   const string16& title) {
-  Browser::RegisterProtocolHandlerHelper(tab, protocol, url, title);
-}
-
-void ExternalTabContainer::RegisterIntentHandler(WebContents* tab,
-                                                 const string16& action,
-                                                 const string16& type,
-                                                 const string16& href,
-                                                 const string16& title,
-                                                 const string16& disposition) {
-  Browser::RegisterIntentHandlerHelper(
-      tab, action, type, href, title, disposition);
+                                                   const string16& title,
+                                                   bool user_gesture) {
+  Browser::RegisterProtocolHandlerHelper(tab, protocol, url, title,
+                                         user_gesture);
+}
+
+void ExternalTabContainer::RegisterIntentHandler(
+    WebContents* tab,
+    const webkit_glue::WebIntentServiceData& data,
+    bool user_gesture) {
+  Browser::RegisterIntentHandlerHelper(tab, data, user_gesture);
 }
 
 void ExternalTabContainer::WebIntentDispatch(
diff --git a/chrome/browser/external_tab/external_tab_container_win.h b/chrome/browser/external_tab/external_tab_container_win.h
index 2cb8f82..52413b3 100644
--- a/chrome/browser/external_tab/external_tab_container_win.h
+++ b/chrome/browser/external_tab/external_tab_container_win.h
@@ -176,13 +176,12 @@ class ExternalTabContainer : public content::WebContentsDelegate,
   virtual void RegisterProtocolHandler(content::WebContents* tab,
                                        const std::string& protocol,
                                        const GURL& url,
-                                       const string16& title) OVERRIDE;
-  virtual void RegisterIntentHandler(content::WebContents* tab,
-                                     const string16& action,
-                                     const string16& type,
-                                     const string16& href,
-                                     const string16& title,
-                                     const string16& disposition) OVERRIDE;
+                                       const string16& title,
+                                       bool user_gesture) OVERRIDE;
+  virtual void RegisterIntentHandler(
+      content::WebContents* tab,
+      const webkit_glue::WebIntentServiceData& data,
+      bool user_gesture) OVERRIDE;
   virtual void WebIntentDispatch(
       content::WebContents* tab,
       content::WebIntentsDispatcher* intents_dispatcher) OVERRIDE;