content/renderer/render_view_impl.cc - Issue 9186021: Update chromium code to use WebIntentRequest.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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:

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 ------------------------------