[Web Intents] WebIntentPickerModel uses URL instead of index to reference registered services.

chrome/browser/ui/intents/web_intent_picker_controller.cc

 // Copyright (c) 2012 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.
 
 #include "chrome/browser/ui/intents/web_intent_picker_controller.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 130 matching lines @@
 
 void WebIntentPickerController::Observe(
     int type,
     const content::NotificationSource& source,
     const content::NotificationDetails& details) {
   DCHECK(type == content::NOTIFICATION_LOAD_START ||
          type == content::NOTIFICATION_TAB_CLOSING);
   ClosePicker();
 }
 
-void WebIntentPickerController::OnServiceChosen(size_t index,
+void WebIntentPickerController::OnServiceChosen(const GURL& url,
                                                 Disposition disposition) {
   switch (disposition) {
     case WebIntentPickerModel::DISPOSITION_INLINE:
       // Set the model to inline disposition. It will notify the picker which
       // will respond (via OnInlineDispositionWebContentsCreated) with the
       // WebContents to dispatch the intent to.
-      picker_model_->SetInlineDisposition(index);
+      picker_model_->SetInlineDisposition(url);
       break;
 
     case WebIntentPickerModel::DISPOSITION_WINDOW: {
       // TODO(gbillock): This really only handles the 'window' disposition in a
       // quite prototype way. We need to flesh out what happens to the picker
       // during the lifetime of the service url context, and that may mean we
       // need to pass more information into the injector to find the picker
       // again and close it.
-      const WebIntentPickerModel::InstalledService& installed_service =
-          picker_model_->GetInstalledServiceAt(index);
-
       int index = TabStripModel::kNoTab;
       Browser* browser = Browser::GetBrowserForController(
           &wrapper_->web_contents()->GetController(), &index);
       TabContentsWrapper* contents = Browser::TabContentsFactory(
           browser->profile(),
           tab_util::GetSiteInstanceForNewTab(
-              NULL, browser->profile(), installed_service.url),
+              NULL, browser->profile(), url),
           MSG_ROUTING_NONE, NULL, NULL);
 
       intents_dispatcher_->DispatchIntent(contents->web_contents());
       service_tab_ = contents->web_contents();
 
       // This call performs all the tab strip manipulation, notifications, etc.
       // Since we're passing in a target_contents, it assumes that we will
       // navigate the page ourselves, though.
       browser::NavigateParams params(browser,
-                                     installed_service.url,
+                                     url,
                                      content::PAGE_TRANSITION_AUTO_BOOKMARK);
       params.target_contents = contents;
       params.disposition = NEW_FOREGROUND_TAB;
       params.profile = wrapper_->profile();
       browser::Navigate(&params);
 
       service_tab_->GetController().LoadURL(
-          installed_service.url, content::Referrer(),
+          url, content::Referrer(),
           content::PAGE_TRANSITION_AUTO_BOOKMARK, std::string());
 
       ClosePicker();
       break;
     }
 
     default:
       NOTREACHED();
       break;
   }
 }
 
 void WebIntentPickerController::OnInlineDispositionWebContentsCreated(
     content::WebContents* web_contents) {
-  if (web_contents) {
+  if (web_contents)
     intents_dispatcher_->DispatchIntent(web_contents);
-  } else {
-    // TODO(binji): web_contents should never be NULL; it is in this case
-    // because views doesn't have an implementation for inline disposition yet.
-    // Remove this else when it does. In the meantime, just reforward as if it
-    // were the window disposition.
-    OnServiceChosen(picker_model_->inline_disposition_index(),
-                    WebIntentPickerModel::DISPOSITION_WINDOW);
-  }
 }
 
 void WebIntentPickerController::OnCancelled() {
   if (!intents_dispatcher_)
     return;
 
   if (service_tab_) {
     intents_dispatcher_->SendReplyMessage(
         webkit_glue::WEB_INTENT_SERVICE_TAB_CLOSED, string16());
   } else {
@@ skipping 203 matching lines @@
   if (--pending_async_count_ == 0) {
     picker_->OnPendingAsyncCompleted();
   }
 }
 
 void WebIntentPickerController::ClosePicker() {
   if (picker_) {
     picker_->Close();
   }
 }