third_party/WebKit/Source/modules/geolocation/Geolocation.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/geolocation/Geolocation.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:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « third_party/WebKit/Source/modules/broadcastchannel/BroadcastChannel.cpp ('k') | third_party/WebKit/Source/modules/imagecapture/ImageCapture.cpp » ('j') | third_party/WebKit/Source/modules/notifications/NotificationManager.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/modules/geolocation/Geolocation.cpp

diff --git a/third_party/WebKit/Source/modules/geolocation/Geolocation.cpp b/third_party/WebKit/Source/modules/geolocation/Geolocation.cpp

index bccab75711e7d38917d779f3e005a81f1487e61a..f034d18833a9699255aac5c5b3036c8ec3d10783 100644

--- a/third_party/WebKit/Source/modules/geolocation/Geolocation.cpp

+++ b/third_party/WebKit/Source/modules/geolocation/Geolocation.cpp

@@ -35,7 +35,7 @@

#include "modules/geolocation/GeolocationError.h"

#include "platform/UserGestureIndicator.h"

#include "platform/mojo/MojoHelper.h"

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

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

#include "wtf/Assertions.h"

#include "wtf/CurrentTime.h"

@@ -421,8 +421,7 @@ void Geolocation::requestPermission()

return;

m_geolocationPermission = PermissionRequested;

- frame->serviceRegistry()->connectToRemoteService(

- mojo::GetProxy(&m_permissionService));

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

m_permissionService.set_connection_error_handler(convertToBaseCallback(WTF::bind(&Geolocation::onPermissionConnectionError, wrapWeakPersistent(this))));

// Ask the embedder: it maintains the geolocation challenge policy itself.

@@ -494,7 +493,7 @@ void Geolocation::updateGeolocationServiceConnection()

if (m_geolocationService)

return;

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

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

m_geolocationService.set_connection_error_handler(convertToBaseCallback(WTF::bind(&Geolocation::onGeolocationConnectionError, wrapWeakPersistent(this))));

if (m_enableHighAccuracy)

m_geolocationService->SetHighAccuracy(true);