Add a public content/ interface for intents. Use it.

content/browser/tab_contents/tab_contents_delegate.h

 // 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.
 
 #ifndef CONTENT_BROWSER_TAB_CONTENTS_TAB_CONTENTS_DELEGATE_H_
 #define CONTENT_BROWSER_TAB_CONTENTS_TAB_CONTENTS_DELEGATE_H_
 #pragma once
 
 #include <set>
 #include <string>
@@ skipping 14 matching lines @@
 struct NativeWebKeyboardEvent;
 struct OpenURLParams;
 
 namespace base {
 class ListValue;
 }
 
 namespace content {
 class BrowserContext;
 struct FileChooserParams;
+class IntentsHost;
 class JavaScriptDialogCreator;
 }
 
 namespace gfx {
 class Point;
 class Rect;
 class Size;
 }
 
 namespace history {
@@ skipping 281 matching lines @@
                                        const string16& title);
 
   // Register a new handler for Intents with the given action and type filter.
   virtual void RegisterIntentHandler(TabContents* tab,
                                      const string16& action,
                                      const string16& type,
                                      const string16& href,
                                      const string16& title,
                                      const string16& disposition);
 
-  // WebIntent notification handler.
+  // Web Intents notification handler. Takes ownership of the |intents_host|.
   virtual void WebIntentDispatch(TabContents* tab,
-                                 int routing_id,
-                                 const webkit_glue::WebIntentData& intent,
-                                 int intent_id);
+                                 content::IntentsHost* intents_host);
 
   // Result of string search in the page. This includes the number of matches
   // found and the selection rect (in screen coordinates) for the string found.
   // If |final_update| is false, it indicates that more results follow.
   virtual void FindReply(TabContents* tab,
                          int request_id,
                          int number_of_matches,
                          const gfx::Rect& selection_rect,
                          int active_match_ordinal,
                          bool final_update);
@@ skipping 29 matching lines @@
   void Attach(TabContents* source);
 
   // Called when |this| is no longer the TabContentsDelegate for |source|.
   void Detach(TabContents* source);
 
   // The TabContents that this is currently a delegate for.
   std::set<TabContents*> attached_contents_;
 };
 
 #endif  // CONTENT_BROWSER_TAB_CONTENTS_TAB_CONTENTS_DELEGATE_H_