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

Unified Diff: content/renderer/render_view_impl.cc

Issue 9186021: Update chromium code to use WebIntentRequest. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge to head Created 8 years, 11 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
« no previous file with comments | « content/renderer/render_view_impl.h ('k') | content/renderer/web_intents_host.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/render_view_impl.cc
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
index 4e4759d65c03b8d230f9563c85d6a4de75b94f87..0d83539157d37d2a50bc3304f4c339d7476bb192 100644
--- a/content/renderer/render_view_impl.cc
+++ b/content/renderer/render_view_impl.cc
@@ -206,6 +206,8 @@ using WebKit::WebHistoryItem;
using WebKit::WebIconURL;
using WebKit::WebImage;
using WebKit::WebInputElement;
+using WebKit::WebIntentRequest;
+using WebKit::WebIntentServiceInfo;
using WebKit::WebMediaPlayer;
using WebKit::WebMediaPlayerAction;
using WebKit::WebMediaPlayerClient;
@@ -3159,7 +3161,7 @@ void RenderViewImpl::requestStorageQuota(
}
void RenderViewImpl::registerIntentService(
- WebKit::WebFrame* frame, const WebKit::WebIntentServiceInfo& service) {
+ WebFrame* frame, const WebIntentServiceInfo& service) {
string16 title = service.title();
if (title.empty())
title = webview()->mainFrame()->document().title();
@@ -3172,12 +3174,12 @@ void RenderViewImpl::registerIntentService(
service.disposition()));
}
-void RenderViewImpl::dispatchIntent(WebKit::WebFrame* frame,
- const WebKit::WebIntentRequest& request) {
- WebKit::WebIntent intent(request.intent());
- webkit_glue::WebIntentData intent_data(intent);
+void RenderViewImpl::dispatchIntent(
+ WebFrame* frame, const WebIntentRequest& intentRequest) {
+ webkit_glue::WebIntentData intent_data(intentRequest.intent());
+ int id = intents_host_->RegisterWebIntent(intentRequest);
Send(new IntentsHostMsg_WebIntentDispatch(
- routing_id_, intent_data, intent.identifier()));
+ routing_id_, intent_data, id));
}
// WebKit::WebPageSerializerClient implementation ------------------------------
« no previous file with comments | « content/renderer/render_view_impl.h ('k') | content/renderer/web_intents_host.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698