Commit e5324c52 authored by mek@chromium.org's avatar mek@chromium.org

Cleanup after http://crrev.com/623813002/ now the chrome side has landed.

BUG=383125

Review URL: https://codereview.chromium.org/680503004

git-svn-id: svn://svn.chromium.org/blink/trunk@184375 bbb929c8-8fbe-4397-9dbb-9b2b20218538
parent 64fc75b6
......@@ -61,8 +61,6 @@ ScriptPromise Geofencing::registerRegion(ScriptState* scriptState, GeofencingReg
RefPtr<ScriptPromiseResolver> resolver = ScriptPromiseResolver::create(scriptState);
ScriptPromise promise = resolver->promise();
WebGeofencingCallbacks* callbacks = new CallbackPromiseAdapter<void, GeofencingError>(resolver);
// FIXME: remove this call once chromium is updated to implement the other registerRegion.
provider->registerRegion(region->id(), toCircularGeofencingRegion(region)->webRegion(), callbacks);
WebServiceWorkerRegistration* serviceWorkerRegistration = nullptr;
if (m_registration)
serviceWorkerRegistration = m_registration->webRegistration();
......@@ -79,8 +77,6 @@ ScriptPromise Geofencing::unregisterRegion(ScriptState* scriptState, const Strin
RefPtr<ScriptPromiseResolver> resolver = ScriptPromiseResolver::create(scriptState);
ScriptPromise promise = resolver->promise();
WebGeofencingCallbacks* callbacks = new CallbackPromiseAdapter<void, GeofencingError>(resolver);
// FIXME: remove this call once chromium is updated to implement the other unregisterRegion.
provider->unregisterRegion(regionId, callbacks);
WebServiceWorkerRegistration* serviceWorkerRegistration = nullptr;
if (m_registration)
serviceWorkerRegistration = m_registration->webRegistration();
......@@ -97,8 +93,6 @@ ScriptPromise Geofencing::getRegisteredRegions(ScriptState* scriptState) const
RefPtr<ScriptPromiseResolver> resolver = ScriptPromiseResolver::create(scriptState);
ScriptPromise promise = resolver->promise();
WebGeofencingRegionsCallbacks* callbacks = new CallbackPromiseAdapter<RegionArray, GeofencingError>(resolver);
// FIXME: remove this call once chromium is updated to implement the other getRegisteredRegions.
provider->getRegisteredRegions(callbacks);
WebServiceWorkerRegistration* serviceWorkerRegistration = nullptr;
if (m_registration)
serviceWorkerRegistration = m_registration->webRegistration();
......
......@@ -25,17 +25,14 @@ public:
// Registers a region.
// Ownership of the WebGeofencingCallbacks is transferred to the client.
virtual void registerRegion(const WebString& regionId, const WebCircularGeofencingRegion&, WebGeofencingCallbacks*) { }
virtual void registerRegion(const WebString& regionId, const WebCircularGeofencingRegion&, WebServiceWorkerRegistration*, WebGeofencingCallbacks*) { }
// Unregisters a region.
// Ownership of the WebGeofencingCallbacks is transferred to the client.
virtual void unregisterRegion(const WebString& regionId, WebGeofencingCallbacks*) { }
virtual void unregisterRegion(const WebString& regionId, WebServiceWorkerRegistration*, WebGeofencingCallbacks*) { }
// Returns all the currently registered regions.
// Ownership of the WebGeofencingRegionsCallbacks is transferred to the client.
virtual void getRegisteredRegions(WebGeofencingRegionsCallbacks*) { }
virtual void getRegisteredRegions(WebServiceWorkerRegistration*, WebGeofencingRegionsCallbacks*) { }
};
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment