Change picker model API to allow less notification messages

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 <algorithm>
 
 #include "base/logging.h"
 #include "base/stl_util.h"
@@ skipping 72 matching lines @@
 }
 
 void WebIntentPickerModel::UpdateFaviconAt(size_t index,
                                            const gfx::Image& image) {
   DCHECK_LT(index, installed_services_.size());
   installed_services_[index]->favicon = image;
   if (observer_)
     observer_->OnFaviconChanged(this, index);
 }
 
-void WebIntentPickerModel::AddSuggestedExtension(const string16& title,
-                                                 const string16& id,
-                                                 double average_rating) {
-  suggested_extensions_.push_back(
-      new SuggestedExtension(title, id, average_rating));
+void WebIntentPickerModel::AddSuggestedExtensions(
+    const std::vector<SuggestedExtension>& suggestions) {
+  suggested_extensions_.insert(suggested_extensions_.end(),

[Greg Billock, 2012/08/15 17:05:07]

Should we call it "set" and just replace them?

+                               suggestions.begin(),
+                               suggestions.end());
   if (observer_)
     observer_->OnModelChanged(this);
 }
-
-void WebIntentPickerModel::RemoveSuggestedExtensionAt(size_t index) {
-  DCHECK_LT(index, suggested_extensions_.size());
-  SuggestedExtension* extension = suggested_extensions_[index];
-  suggested_extensions_.erase(suggested_extensions_.begin() + index);
-  delete extension;
-  if (observer_)
-    observer_->OnModelChanged(this);
-}
 
 const WebIntentPickerModel::SuggestedExtension&
     WebIntentPickerModel::GetSuggestedExtensionAt(size_t index) const {
   DCHECK_LT(index, suggested_extensions_.size());
-  return *suggested_extensions_[index];
+  return suggested_extensions_[index];
 }
 
 size_t WebIntentPickerModel::GetSuggestedExtensionCount() const {
   return std::min(suggested_extensions_.size(), kMaxSuggestionCount);
 }
 
 string16 WebIntentPickerModel::GetSuggestionsLinkText() const {
   if (suggested_extensions_.size() <= kMaxSuggestionCount)
     return string16();
 
   return l10n_util::GetStringUTF16(GetInstalledServiceCount() == 0 ?
       IDS_INTENT_PICKER_GET_MORE_SERVICES_NONE_INSTALLED :
       IDS_INTENT_PICKER_GET_MORE_SERVICES);
 }
 
 void WebIntentPickerModel::SetSuggestedExtensionIconWithId(
     const string16& id,
     const gfx::Image& image) {
   for (size_t i = 0; i < suggested_extensions_.size(); ++i) {
-    SuggestedExtension* extension = suggested_extensions_[i];
-    if (extension->id == id) {
-      extension->icon = image;
+    SuggestedExtension& extension = suggested_extensions_[i];
+    if (extension.id == id) {
+      extension.icon = image;
 
       if (observer_)
-        observer_->OnExtensionIconChanged(this, extension->id);
+        observer_->OnExtensionIconChanged(this, extension.id);
       break;
     }
   }
 }
 
 void WebIntentPickerModel::SetInlineDisposition(const GURL& url) {
   inline_disposition_url_ = url;
   if (observer_) {
     const InstalledService* service = GetInstalledServiceWithURL(url);
     DCHECK(service);
     observer_->OnInlineDisposition(service->title, url);
   }
 }
 
 bool WebIntentPickerModel::IsInlineDisposition() const {
   return !inline_disposition_url_.is_empty();
 }
 
 void WebIntentPickerModel::DestroyAll() {
   STLDeleteElements(&installed_services_);
-  STLDeleteElements(&suggested_extensions_);
 }
 
 WebIntentPickerModel::InstalledService::InstalledService(
     const string16& title,
     const GURL& url,
     Disposition disposition)
     : title(title),
       url(url),
       favicon(ui::ResourceBundle::GetSharedInstance().GetNativeImageNamed(
           IDR_DEFAULT_FAVICON)),
       disposition(disposition) {
 }
 
 WebIntentPickerModel::InstalledService::~InstalledService() {
 }
 
 WebIntentPickerModel::SuggestedExtension::SuggestedExtension(
     const string16& title,
     const string16& id,
     double average_rating)
     : title(title),
       id(id),
       average_rating(average_rating),
       icon(ui::ResourceBundle::GetSharedInstance().GetNativeImageNamed(
           IDR_DEFAULT_FAVICON)) {
 }
 
 WebIntentPickerModel::SuggestedExtension::~SuggestedExtension() {
 }