| 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 40f8e5b63e904b707aa94b523c2f101a6b7b8667..0052c3185ccaccd8156342f43f603e053a8907d5 100644
|
| --- a/third_party/WebKit/Source/modules/geolocation/Geolocation.cpp
|
| +++ b/third_party/WebKit/Source/modules/geolocation/Geolocation.cpp
|
| @@ -423,14 +423,14 @@ void Geolocation::requestPermission()
|
| m_geolocationPermission = PermissionRequested;
|
| frame->serviceRegistry()->connectToRemoteService(
|
| mojo::GetProxy(&m_permissionService));
|
| - m_permissionService.set_connection_error_handler(createBaseCallback(bind(&Geolocation::onPermissionConnectionError, wrapWeakPersistent(this))));
|
| + m_permissionService.set_connection_error_handler(createBaseCallback(WTF::bind(&Geolocation::onPermissionConnectionError, wrapWeakPersistent(this))));
|
|
|
| // Ask the embedder: it maintains the geolocation challenge policy itself.
|
| m_permissionService->RequestPermission(
|
| mojom::blink::PermissionName::GEOLOCATION,
|
| getExecutionContext()->getSecurityOrigin()->toString(),
|
| UserGestureIndicator::processingUserGesture(),
|
| - createBaseCallback(bind(&Geolocation::onGeolocationPermissionUpdated, wrapPersistent(this))));
|
| + createBaseCallback(WTF::bind(&Geolocation::onGeolocationPermissionUpdated, wrapPersistent(this))));
|
| }
|
|
|
| void Geolocation::makeSuccessCallbacks()
|
| @@ -495,7 +495,7 @@ void Geolocation::updateGeolocationServiceConnection()
|
| return;
|
|
|
| frame()->serviceRegistry()->connectToRemoteService(mojo::GetProxy(&m_geolocationService));
|
| - m_geolocationService.set_connection_error_handler(createBaseCallback(bind(&Geolocation::onGeolocationConnectionError, wrapWeakPersistent(this))));
|
| + m_geolocationService.set_connection_error_handler(createBaseCallback(WTF::bind(&Geolocation::onGeolocationConnectionError, wrapWeakPersistent(this))));
|
| if (m_enableHighAccuracy)
|
| m_geolocationService->SetHighAccuracy(true);
|
| queryNextPosition();
|
| @@ -503,7 +503,7 @@ void Geolocation::updateGeolocationServiceConnection()
|
|
|
| void Geolocation::queryNextPosition()
|
| {
|
| - m_geolocationService->QueryNextPosition(createBaseCallback(bind(&Geolocation::onPositionUpdated, wrapPersistent(this))));
|
| + m_geolocationService->QueryNextPosition(createBaseCallback(WTF::bind(&Geolocation::onPositionUpdated, wrapPersistent(this))));
|
| }
|
|
|
| void Geolocation::onPositionUpdated(mojom::blink::GeopositionPtr position)
|
|
|