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

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: Adjust to pass-by-value for WebIntentRequest 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
Index: content/renderer/render_view_impl.cc
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
index c5f1fc6b7d0647c9c600b804335b2990f7519653..28086f0eb4f75e7582ff18a78c3bef8aceeaa153 100644
--- a/content/renderer/render_view_impl.cc
+++ b/content/renderer/render_view_impl.cc
@@ -103,6 +103,7 @@
#include "third_party/WebKit/Source/WebKit/chromium/public/WebInputElement.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebIntent.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/WebIntentRequest.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebIntentServiceInfo.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebMediaPlayerAction.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebNodeList.h"
@@ -3164,11 +3165,13 @@ void RenderViewImpl::registerIntentService(
service.disposition()));
}
-void RenderViewImpl::dispatchIntent(WebKit::WebFrame* frame,
- const WebKit::WebIntent& intent) {
- webkit_glue::WebIntentData intent_data(intent);
+void RenderViewImpl::dispatchIntent(
+ WebKit::WebFrame* frame, const WebKit::WebIntentRequest& intentRequest) {
+ WebKit::WebIntentRequest request(intentRequest);
+ webkit_glue::WebIntentData intent_data(request.intent());
+ int id = intents_host_->RegisterWebIntent(request);
Send(new IntentsHostMsg_WebIntentDispatch(
- routing_id_, intent_data, intent.identifier()));
+ routing_id_, intent_data, id));
}
// WebKit::WebPageSerializerClient implementation ------------------------------

Powered by Google App Engine
This is Rietveld 408576698