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

Unified 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/intents/web_intent_picker_model.cc
diff --git a/chrome/browser/ui/intents/web_intent_picker_model.cc b/chrome/browser/ui/intents/web_intent_picker_model.cc
index 6a0a4598358a617265e3b59eef1fb67dc0b41ef9..997c4e846c7df8eab519da8b3c6c49b85b69ee9a 100644
--- a/chrome/browser/ui/intents/web_intent_picker_model.cc
+++ b/chrome/browser/ui/intents/web_intent_picker_model.cc
@@ -29,9 +29,10 @@ WebIntentPickerModel::~WebIntentPickerModel() {
DestroyAll();
}
-void WebIntentPickerModel::AddInstalledService(const string16& title,
- const GURL& url,
- Disposition disposition) {
+void WebIntentPickerModel::AddInstalledService(
+ const string16& title,
+ const GURL& url,
+ webkit_glue::WebIntentServiceData::Disposition disposition) {
// TODO(groby): Revisit to remove O(n^2) complexity.
for (size_t i = 0; i < installed_services_.size(); ++i) {
InstalledService* service = installed_services_[i];
@@ -163,7 +164,7 @@ void WebIntentPickerModel::DestroyAll() {
WebIntentPickerModel::InstalledService::InstalledService(
const string16& title,
const GURL& url,
- Disposition disposition)
+ webkit_glue::WebIntentServiceData::Disposition disposition)
: title(title),
url(url),
favicon(ui::ResourceBundle::GetSharedInstance().GetNativeImageNamed(

Powered by Google App Engine
This is Rietveld 408576698