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

chrome/browser/ui/intents/web_intent_picker_controller.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 CHROME_BROWSER_UI_INTENTS_WEB_INTENT_PICKER_CONTROLLER_H_
 #define CHROME_BROWSER_UI_INTENTS_WEB_INTENT_PICKER_CONTROLLER_H_
 #pragma once
 
 #include <vector>
 
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/string16.h"
 #include "chrome/browser/ui/intents/web_intent_picker_delegate.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "webkit/glue/web_intent_data.h"
 
 class Browser;
 class GURL;
 class SkBitmap;
 class TabContents;
 class TabContentsWrapper;
 class WebIntentPicker;
 class WebIntentPickerFactory;
 
+namespace content {
+class IntentsHost;
+}
+
 namespace webkit_glue {
 struct WebIntentServiceData;
 }
 
 // Controls the creation of the WebIntentPicker UI and forwards the user's
 // intent handler choice back to the TabContents object.
 class WebIntentPickerController : public content::NotificationObserver,
                                   public WebIntentPickerDelegate {
  public:
   // Takes ownership of |factory|.
   WebIntentPickerController(TabContentsWrapper* wrapper,
                             WebIntentPickerFactory* factory);
   virtual ~WebIntentPickerController();
 
-  // Sets the intent data for which this picker was created. The picker will
-  // copy and hold this data until the user has made a service selection.
-  // |routing_id| is the IPC routing ID of the source renderer.
-  // |intent| is the intent data as created by the client content.
-  // |intent_id| is the ID assigned by the source renderer.
-  void SetIntent(int routing_id,
-                 const webkit_glue::WebIntentData& intent,
-                 int intent_id);
+  // Sets the intent data and return pathway handler object for which
+  // this picker was created. The picker takes ownership of |intents_host|.
+  // Must not be NULL.

[James Hawkins, 2011/11/29 19:20:04]

To be clear:

"|intents_host| must not be NULL."

otherwise it's ambiguous.

[Greg Billock, 2011/11/29 23:41:40]

Done.

+  void SetIntentsHost(content::IntentsHost* intents_host);
 
   // Shows the web intent picker for |browser|, given the intent
   // |action| and MIME-type |type|.
   void ShowDialog(Browser* browser,
                   const string16& action,
                   const string16& type);
 
  protected:
   // content::NotificationObserver implementation.
   virtual void Observe(int type,
@@ skipping 52 matching lines @@
 
   // A list of URLs to display in the UI.
   std::vector<GURL> urls_;
 
   // A list of the service data on display in the UI.
   std::vector<webkit_glue::WebIntentServiceData> service_data_;
 
   // A count of the outstanding asynchronous calls.
   int pending_async_count_;
 
-  // The routing id of the renderer which launched the intent. Should be the
-  // renderer associated with the TabContents which owns this object.
-  int routing_id_;
-
-  // The intent data from the client.
-  webkit_glue::WebIntentData intent_;
-
-  // The intent ID assigned to this intent by the renderer.
-  int intent_id_;
+  // The routing object for the renderer which launched the intent.
+  // Contains the intent data and a way to signal back to the client page.
+  scoped_ptr<content::IntentsHost> intents_host_;
 
   // Weak pointer to the tab servicing the intent. Remembered in order to
   // close it when a reply is sent.
   TabContents* service_tab_;
 
   DISALLOW_COPY_AND_ASSIGN(WebIntentPickerController);
 };
 
 #endif  // CHROME_BROWSER_UI_INTENTS_WEB_INTENT_PICKER_CONTROLLER_H_