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

chrome/browser/ui/gtk/web_intent_picker_gtk.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/gtk/web_intent_picker_gtk.h"
 
 #include <algorithm>
 
 #include "base/i18n/rtl.h"
 #include "base/utf_string_conversions.h"
@@ skipping 133 matching lines @@
 void WebIntentPickerGtk::OnFaviconChanged(WebIntentPickerModel* model,
                                           size_t index) {
   UpdateInstalledServices();
 }
 
 void WebIntentPickerGtk::OnExtensionIconChanged(WebIntentPickerModel* model,
                                                 const string16& extension_id) {
   UpdateSuggestedExtensions();
 }
 
-void WebIntentPickerGtk::OnInlineDisposition(WebIntentPickerModel* model) {
-  const WebIntentPickerModel::InstalledService& installed_service =
-      model->GetInstalledServiceAt(model->inline_disposition_index());
-  const GURL& url = installed_service.url;
-
+void WebIntentPickerGtk::OnInlineDisposition(WebIntentPickerModel* model,
+                                             const GURL& url) {
   content::WebContents* web_contents = content::WebContents::Create(
       browser_->profile(), NULL, MSG_ROUTING_NONE, NULL, NULL);
   inline_disposition_tab_contents_.reset(new TabContentsWrapper(web_contents));
   inline_disposition_delegate_.reset(new WebIntentInlineDispositionDelegate);
   web_contents->SetDelegate(inline_disposition_delegate_.get());
 
   // Must call this immediately after WebContents creation to avoid race
   // with load.
   delegate_->OnInlineDispositionWebContentsCreated(web_contents);
 
@@ skipping 110 matching lines @@
 }
 
 void WebIntentPickerGtk::OnServiceButtonClick(GtkWidget* button) {
   GList* button_list = gtk_container_get_children(GTK_CONTAINER(button_vbox_));
   gint index = g_list_index(button_list, button);
   DCHECK(index != -1);
 
   const WebIntentPickerModel::InstalledService& installed_service =
       model_->GetInstalledServiceAt(index);
 
-  delegate_->OnServiceChosen(static_cast<size_t>(index),
+  delegate_->OnServiceChosen(installed_service.url,
                              installed_service.disposition);
 }
 
 void WebIntentPickerGtk::InitContents() {
   ThemeServiceGtk* theme_service = GetThemeService(wrapper_);
 
   // Main contents vbox.
   contents_ = gtk_vbox_new(FALSE, ui::kContentAreaSpacing);
   gtk_container_set_border_width(GTK_CONTAINER(contents_),
                                  ui::kContentAreaBorder);
@@ skipping 169 matching lines @@
   for (int i = 0; i < 5; ++i) {
     gtk_box_pack_start(
         GTK_BOX(hbox),
         gtk_image_new_from_pixbuf(rb.GetRTLEnabledPixbufNamed(
             WebIntentPicker::GetNthStarImageIdFromCWSRating(rating, i))),
         FALSE, FALSE, 0);
   }
 
   return hbox;
 }