third_party/WebKit/Source/modules/webusb/USB.cpp - Issue 2196843003: Blink ServiceRegistry -> InterfaceProvider

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: third_party/WebKit/Source/modules/webusb/USB.cpp

Issue 2196843003: Blink ServiceRegistry -> InterfaceProvider (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: . Created 4 years, 5 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: third_party/WebKit/Source/modules/webusb/USB.cpp

diff --git a/third_party/WebKit/Source/modules/webusb/USB.cpp b/third_party/WebKit/Source/modules/webusb/USB.cpp

index 5bc70682942c40d9c71ce453c96651a8be7f6fbb..8bb6283642f28298a87d165fdd479f2c563b09d7 100644

--- a/third_party/WebKit/Source/modules/webusb/USB.cpp

+++ b/third_party/WebKit/Source/modules/webusb/USB.cpp

@@ -17,7 +17,7 @@

#include "modules/webusb/USBDeviceRequestOptions.h"

#include "platform/UserGestureIndicator.h"

#include "platform/mojo/MojoHelper.h"

-#include "public/platform/ServiceRegistry.h"

+#include "public/platform/InterfaceProvider.h"

#include "wtf/Functional.h"

namespace usb = device::usb::blink;

@@ -55,7 +55,7 @@ USB::USB(LocalFrame& frame)

, m_clientBinding(this)

{

ThreadState::current()->registerPreFinalizer(this);

- frame.serviceRegistry()->connectToRemoteService(mojo::GetProxy(&m_deviceManager));

+ frame.interfaceProvider()->getInterface(mojo::GetProxy(&m_deviceManager));

m_deviceManager.set_connection_error_handler(convertToBaseCallback(WTF::bind(&USB::onDeviceManagerConnectionError, wrapWeakPersistent(this))));

m_deviceManager->SetClient(m_clientBinding.CreateInterfacePtrAndBind());

}

@@ -105,7 +105,7 @@ ScriptPromise USB::requestDevice(ScriptState* scriptState, const USBDeviceReques

resolver->reject(DOMException::create(NotSupportedError));

return promise;

}

- frame->serviceRegistry()->connectToRemoteService(mojo::GetProxy(&m_chooserService));

+ frame->interfaceProvider()->getInterface(mojo::GetProxy(&m_chooserService));

m_chooserService.set_connection_error_handler(convertToBaseCallback(WTF::bind(&USB::onChooserServiceConnectionError, wrapWeakPersistent(this))));

}