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

Unified Diff: chrome/browser/ui/gtk/web_intent_picker_gtk.cc

Issue 9649020: [Web Intents] WebIntentPickerModel uses URL instead of index to reference registered services. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: mac fix Created 8 years, 9 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/gtk/web_intent_picker_gtk.cc
diff --git a/chrome/browser/ui/gtk/web_intent_picker_gtk.cc b/chrome/browser/ui/gtk/web_intent_picker_gtk.cc
index f96687db048ae4a78f2782728d2eaa75892bec09..a1e609bd4b9415fe03fbe153084964ff9c6cc90a 100644
--- a/chrome/browser/ui/gtk/web_intent_picker_gtk.cc
+++ b/chrome/browser/ui/gtk/web_intent_picker_gtk.cc
@@ -151,11 +151,8 @@ void WebIntentPickerGtk::OnExtensionIconChanged(WebIntentPickerModel* model,
UpdateSuggestedExtensions();
}
-void WebIntentPickerGtk::OnInlineDisposition(WebIntentPickerModel* model) {
- const WebIntentPickerModel::InstalledService& installed_service =
- model->GetInstalledServiceAt(model->inline_disposition_index());
- const GURL& url = installed_service.url;
-
+void WebIntentPickerGtk::OnInlineDisposition(WebIntentPickerModel* model,
+ const GURL& url) {
content::WebContents* web_contents = content::WebContents::Create(
browser_->profile(), NULL, MSG_ROUTING_NONE, NULL, NULL);
inline_disposition_tab_contents_.reset(new TabContentsWrapper(web_contents));
@@ -286,7 +283,7 @@ void WebIntentPickerGtk::OnServiceButtonClick(GtkWidget* button) {
const WebIntentPickerModel::InstalledService& installed_service =
model_->GetInstalledServiceAt(index);
- delegate_->OnServiceChosen(static_cast<size_t>(index),
+ delegate_->OnServiceChosen(installed_service.url,
installed_service.disposition);
}
« no previous file with comments | « chrome/browser/ui/gtk/web_intent_picker_gtk.h ('k') | chrome/browser/ui/intents/web_intent_picker_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698