Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(125)

Side by Side Diff: chrome/browser/ui/intents/web_intent_picker_model.cc

Issue 10855066: intents: Remove the disposition enum in web intents model. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge to head Created 8 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/ui/intents/web_intent_picker_model.h" 5 #include "chrome/browser/ui/intents/web_intent_picker_model.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/stl_util.h" 10 #include "base/stl_util.h"
(...skipping 11 matching lines...) Expand all
22 } // namespace 22 } // namespace
23 23
24 WebIntentPickerModel::WebIntentPickerModel() 24 WebIntentPickerModel::WebIntentPickerModel()
25 : observer_(NULL) { 25 : observer_(NULL) {
26 } 26 }
27 27
28 WebIntentPickerModel::~WebIntentPickerModel() { 28 WebIntentPickerModel::~WebIntentPickerModel() {
29 DestroyAll(); 29 DestroyAll();
30 } 30 }
31 31
32 void WebIntentPickerModel::AddInstalledService(const string16& title, 32 void WebIntentPickerModel::AddInstalledService(
33 const GURL& url, 33 const string16& title,
34 Disposition disposition) { 34 const GURL& url,
35 webkit_glue::WebIntentServiceData::Disposition disposition) {
35 // TODO(groby): Revisit to remove O(n^2) complexity. 36 // TODO(groby): Revisit to remove O(n^2) complexity.
36 for (size_t i = 0; i < installed_services_.size(); ++i) { 37 for (size_t i = 0; i < installed_services_.size(); ++i) {
37 InstalledService* service = installed_services_[i]; 38 InstalledService* service = installed_services_[i];
38 if (service->title == title && service->url == url && 39 if (service->title == title && service->url == url &&
39 service->disposition == disposition) 40 service->disposition == disposition)
40 return; 41 return;
41 } 42 }
42 installed_services_.push_back(new InstalledService(title, url, disposition)); 43 installed_services_.push_back(new InstalledService(title, url, disposition));
43 if (observer_) 44 if (observer_)
44 observer_->OnModelChanged(this); 45 observer_->OnModelChanged(this);
(...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after
156 } 157 }
157 158
158 void WebIntentPickerModel::DestroyAll() { 159 void WebIntentPickerModel::DestroyAll() {
159 STLDeleteElements(&installed_services_); 160 STLDeleteElements(&installed_services_);
160 STLDeleteElements(&suggested_extensions_); 161 STLDeleteElements(&suggested_extensions_);
161 } 162 }
162 163
163 WebIntentPickerModel::InstalledService::InstalledService( 164 WebIntentPickerModel::InstalledService::InstalledService(
164 const string16& title, 165 const string16& title,
165 const GURL& url, 166 const GURL& url,
166 Disposition disposition) 167 webkit_glue::WebIntentServiceData::Disposition disposition)
167 : title(title), 168 : title(title),
168 url(url), 169 url(url),
169 favicon(ui::ResourceBundle::GetSharedInstance().GetNativeImageNamed( 170 favicon(ui::ResourceBundle::GetSharedInstance().GetNativeImageNamed(
170 IDR_DEFAULT_FAVICON)), 171 IDR_DEFAULT_FAVICON)),
171 disposition(disposition) { 172 disposition(disposition) {
172 } 173 }
173 174
174 WebIntentPickerModel::InstalledService::~InstalledService() { 175 WebIntentPickerModel::InstalledService::~InstalledService() {
175 } 176 }
176 177
177 WebIntentPickerModel::SuggestedExtension::SuggestedExtension( 178 WebIntentPickerModel::SuggestedExtension::SuggestedExtension(
178 const string16& title, 179 const string16& title,
179 const string16& id, 180 const string16& id,
180 double average_rating) 181 double average_rating)
181 : title(title), 182 : title(title),
182 id(id), 183 id(id),
183 average_rating(average_rating), 184 average_rating(average_rating),
184 icon(ui::ResourceBundle::GetSharedInstance().GetNativeImageNamed( 185 icon(ui::ResourceBundle::GetSharedInstance().GetNativeImageNamed(
185 IDR_DEFAULT_FAVICON)) { 186 IDR_DEFAULT_FAVICON)) {
186 } 187 }
187 188
188 WebIntentPickerModel::SuggestedExtension::~SuggestedExtension() { 189 WebIntentPickerModel::SuggestedExtension::~SuggestedExtension() {
189 } 190 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698