Pass intent data through to the picker and launch a new tab

on service selection.

R=jhawkins@chromium.org
BUG=None
TEST=None


Review URL: http://codereview.chromium.org/7978014

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

2 files changed, 6 insertions, 14 deletions

diff --git a/content/browser/intents/intent_injector.cc b/content/browser/intents/intent_injector.cc
index 600baad..7c416d0 100644
--- a/content/browser/intents/intent_injector.cc
+++ b/content/browser/intents/intent_injector.cc
@@ -28,17 +28,11 @@ void IntentInjector::TabContentsDestroyed(TabContents* tab) {
 }
 
 void IntentInjector::SetIntent(int routing_id,
-                               int intent_id,
-                               const string16& action,
-                               const string16& type,
-                               const string16& data) {
-  webkit_glue::WebIntentData* intent_data = new webkit_glue::WebIntentData;
-  intent_data->action = action;
-  intent_data->type = type;
-  intent_data->data = data;
-  source_intent_.reset(intent_data);
-  intent_id_ = intent_id;
+                               const webkit_glue::WebIntentData& intent,
+                               int intent_id) {
   source_routing_id_ = routing_id;
+  source_intent_.reset(new webkit_glue::WebIntentData(intent));
+  intent_id_ = intent_id;
 
   SendIntent();
 }
diff --git a/content/browser/intents/intent_injector.h b/content/browser/intents/intent_injector.h
index 0250060..f658446 100644
--- a/content/browser/intents/intent_injector.h
+++ b/content/browser/intents/intent_injector.h
@@ -43,10 +43,8 @@ class IntentInjector : public TabContentsObserver {
   // Sets the intent data to be injected. Call after the user has selected a
   // service to pass the intent data to that service.
   void SetIntent(int routing_id,
-                 int intent_id,
-                 const string16& action,
-                 const string16& type,
-                 const string16& data);
+                 const webkit_glue::WebIntentData& intent,
+                 int intent_id);
 
  private:
   // Delivers the intent data to the renderer.