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

chrome/browser/ui/intents/web_intent_picker_model.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_model.h"
 
 #include "base/logging.h"
 #include "base/stl_util.h"
 #include "chrome/browser/ui/intents/web_intent_picker_model_observer.h"
 #include "grit/ui_resources.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/image/image.h"
 
 WebIntentPickerModel::WebIntentPickerModel()
-    : observer_(NULL),
-      inline_disposition_index_(std::string::npos) {
+    : observer_(NULL) {
 }
 
 WebIntentPickerModel::~WebIntentPickerModel() {
   DestroyAll();
 }
 
 void WebIntentPickerModel::AddInstalledService(const string16& title,
                                                const GURL& url,
                                                Disposition disposition) {
   installed_services_.push_back(new InstalledService(title, url, disposition));
   if (observer_)
     observer_->OnModelChanged(this);
 }
 
 void WebIntentPickerModel::RemoveInstalledServiceAt(size_t index) {
   DCHECK(index < installed_services_.size());
   std::vector<InstalledService*>::iterator iter =
       installed_services_.begin() + index;
   delete *iter;
   installed_services_.erase(iter);
   if (observer_)
     observer_->OnModelChanged(this);
 }
 
 void WebIntentPickerModel::Clear() {
   DestroyAll();
-  inline_disposition_index_ = std::string::npos;
+  inline_disposition_url_ = GURL::EmptyGURL();
   if (observer_)
     observer_->OnModelChanged(this);
 }
 
 const WebIntentPickerModel::InstalledService&
     WebIntentPickerModel::GetInstalledServiceAt(size_t index) const {
   DCHECK(index < installed_services_.size());
   return *installed_services_[index];
 }
 
@@ skipping 46 matching lines @@
     if (extension->id == id) {
       extension->icon = image;
 
       if (observer_)
         observer_->OnExtensionIconChanged(this, extension->id);
       break;
     }
   }
 }
 
-void WebIntentPickerModel::SetInlineDisposition(size_t index) {
-  DCHECK(index < installed_services_.size());
-  inline_disposition_index_ = index;
+void WebIntentPickerModel::SetInlineDisposition(const GURL& url) {
+  inline_disposition_url_ = url;
   if (observer_)
-    observer_->OnInlineDisposition(this);
+    observer_->OnInlineDisposition(this, url);
 }
 
 bool WebIntentPickerModel::IsInlineDisposition() const {
-  return inline_disposition_index_ != std::string::npos;
+  return !inline_disposition_url_.is_empty();
 }
 
 void WebIntentPickerModel::DestroyAll() {
   STLDeleteElements(&installed_services_);
   STLDeleteElements(&suggested_extensions_);
 }
 
 WebIntentPickerModel::InstalledService::InstalledService(
     const string16& title,
     const GURL& url,
@@ skipping 14 matching lines @@
     double average_rating)
     : title(title),
       id(id),
       average_rating(average_rating),
       icon(ui::ResourceBundle::GetSharedInstance().GetNativeImageNamed(
           IDR_DEFAULT_FAVICON)) {
 }
 
 WebIntentPickerModel::SuggestedExtension::~SuggestedExtension() {
 }