components/dom_distiller/content/renderer/distiller_native_javascript.cc - Issue 2079943002: Change RenderFrame to use InterfaceRegistry et al.

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: components/dom_distiller/content/renderer/distiller_native_javascript.cc

Issue 2079943002: Change RenderFrame to use InterfaceRegistry et al. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@a2

Patch Set: . Created 4 years, 6 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 | « components/dom_distiller/content/renderer/distiller_js_render_frame_observer.cc ('k') | components/password_manager/content/renderer/BUILD.gn » ('j') | content/browser/frame_host/frame_mojo_shell.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/dom_distiller/content/renderer/distiller_native_javascript.cc

diff --git a/components/dom_distiller/content/renderer/distiller_native_javascript.cc b/components/dom_distiller/content/renderer/distiller_native_javascript.cc

index e74c955938dd9f97bbf2e087af0c4f2f571c720c..be1af3de17abf6f8c71b7cea88ad84ee235b1662 100644

--- a/components/dom_distiller/content/renderer/distiller_native_javascript.cc

+++ b/components/dom_distiller/content/renderer/distiller_native_javascript.cc

@@ -9,10 +9,10 @@

#include "base/bind.h"

#include "base/strings/utf_string_conversions.h"

#include "components/dom_distiller/content/common/distiller_javascript_service.mojom.h"

-#include "content/public/common/service_registry.h"

#include "content/public/renderer/render_frame.h"

#include "gin/arguments.h"

#include "gin/function_template.h"

+#include "services/shell/public/cpp/interface_provider.h"

#include "third_party/WebKit/public/web/WebKit.h"

#include "third_party/WebKit/public/web/WebLocalFrame.h"

#include "v8/include/v8.h"

@@ -85,8 +85,8 @@ void DistillerNativeJavaScript::BindFunctionToObject(

void DistillerNativeJavaScript::EnsureServiceConnected() {

if (!distiller_js_service_ || !distiller_js_service_.is_bound()) {

- render_frame_->GetServiceRegistry()->ConnectToRemoteService(

- mojo::GetProxy(&distiller_js_service_));

+ render_frame_->GetRemoteInterfaces()->GetInterface(

+ &distiller_js_service_);

}