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

chrome/browser/ui/views/web_intent_picker_views.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 <algorithm>
 #include <vector>
 
 #include "base/memory/scoped_vector.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_navigator.h"
@@ skipping 134 matching lines @@
 
 // A view that contains all service buttons (i.e. the installed services).
 class ServiceButtonsView : public views::View,
                            public views::ButtonListener {
  public:
   class Delegate {
    public:
     // Called when a service button is clicked. |index| is the index of the
     // service button in the model.
     virtual void OnServiceButtonClicked(
-        size_t index,
         const WebIntentPickerModel::InstalledService& service) = 0;
 
    protected:
     virtual ~Delegate() {}
   };
 
   ServiceButtonsView(const WebIntentPickerModel* model, Delegate* delegate);
   virtual ~ServiceButtonsView();
 
   // Updates the service button view with new model data.
@@ skipping 52 matching lines @@
   }
 
   // Add a padding row between the service buttons and the label when there
   // are service buttons to display.
   grid_layout->AddPaddingRow(0, kContentAreaSpacing);
 }
 
 void ServiceButtonsView::ButtonPressed(views::Button* sender,
                                        const views::Event& event) {
   size_t index = static_cast<size_t>(sender->tag());
-  delegate_->OnServiceButtonClicked(index,
-                                    model_->GetInstalledServiceAt(index));
+  delegate_->OnServiceButtonClicked(model_->GetInstalledServiceAt(index));
 }
 
 gfx::Size ServiceButtonsView::GetPreferredSize() {
   // If there are no service buttons, hide this view.
   if (model_->GetInstalledServiceCount() == 0)
     return gfx::Size();
   return GetLayoutManager()->GetPreferredSize(this);
 }
 
 // SuggestedExtensionsView -----------------------------------------------------
@@ skipping 208 matching lines @@
 
   // WebIntentPicker implementation.
   virtual void Close() OVERRIDE;
 
   // WebIntentPickerModelObserver implementation.
   virtual void OnModelChanged(WebIntentPickerModel* model) OVERRIDE;
   virtual void OnFaviconChanged(WebIntentPickerModel* model,
                                 size_t index) OVERRIDE;
   virtual void OnExtensionIconChanged(WebIntentPickerModel* model,
                                       const string16& extension_id) OVERRIDE;
-  virtual void OnInlineDisposition(WebIntentPickerModel* model) OVERRIDE;
+  virtual void OnInlineDisposition(WebIntentPickerModel* model,
+                                   const GURL& url) OVERRIDE;
 
   // ServiceButtonsView::Delegate implementation.
   virtual void OnServiceButtonClicked(
-      size_t index,
       const WebIntentPickerModel::InstalledService& service) OVERRIDE;
 
   // SuggestedExtensionsView::Delegate implementation.
   virtual void OnExtensionInstallClicked(const string16& extension_id) OVERRIDE;
   virtual void OnExtensionLinkClicked(const string16& extension_id) OVERRIDE;
   virtual void OnMoreSuggestionsLinkClicked() OVERRIDE;
 
  private:
   // Initialize the contents of the picker. After this call, contents_ will be
   // non-NULL.
@@ skipping 123 matching lines @@
 
 void WebIntentPickerViews::OnExtensionIconChanged(
     WebIntentPickerModel* model,
     const string16& extension_id) {
   extensions_->Update();
   contents_->Layout();
   SizeToContents();
 }
 
 void WebIntentPickerViews::OnInlineDisposition(
-    WebIntentPickerModel* model) {
-  const WebIntentPickerModel::InstalledService& installed_service =
-      model->GetInstalledServiceAt(model->inline_disposition_index());
-
+    WebIntentPickerModel* model, const GURL& url) {
   WebContents* web_contents = WebContents::Create(
       browser_->profile(), NULL, MSG_ROUTING_NONE, NULL, NULL);
   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);
 
   TabContentsContainer* tab_contents_container = new TabContentsContainer;
 
   web_contents->GetController().LoadURL(
-      installed_service.url,
+      url,
       content::Referrer(),
       content::PAGE_TRANSITION_START_PAGE,
       std::string());
 
   // Replace the picker with the inline disposition.
   contents_->RemoveAllChildViews(true);
   contents_->AddChildView(tab_contents_container);
 
   // The contents can only be changed after the child is added to view
   // hierarchy.
   tab_contents_container->ChangeWebContents(web_contents);
 
   gfx::Size size = GetDefaultInlineDispositionSize(web_contents);
   contents_->SetLayoutManager(new views::FillLayout);
   contents_->Layout();
   SizeToContents();
 }
 
 void WebIntentPickerViews::OnServiceButtonClicked(
-    size_t index,
     const WebIntentPickerModel::InstalledService& service) {
-  delegate_->OnServiceChosen(index, service.disposition);
+  delegate_->OnServiceChosen(service.url, service.disposition);
 }
 
 void WebIntentPickerViews::OnExtensionInstallClicked(
     const string16& extension_id) {
   // TODO(binji): install extension.
 }
 
 void WebIntentPickerViews::OnExtensionLinkClicked(
     const string16& extension_id) {
   GURL extension_url(extension_urls::GetWebstoreItemDetailURLPrefix() +
@@ skipping 82 matching lines @@
 }
 
 void WebIntentPickerViews::SizeToContents() {
   gfx::Size client_size = contents_->GetPreferredSize();
   gfx::Rect client_bounds(client_size);
   gfx::Rect new_window_bounds = window_->non_client_view()->frame_view()->
       GetWindowBoundsForClientBounds(client_bounds);
   // TODO(binji): figure out how to get the constrained dialog centered...
   window_->SetSize(new_window_bounds.size());
 }