Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(162)

Unified Diff: third_party/WebKit/Source/modules/payments/PaymentAppManager.cpp

Issue 2586203003: PaymentApp: Remove scope_url parameter from Get/SetManifest methods. (Closed)
Patch Set: rebased Created 4 years 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 | « content/browser/payments/payment_app_manager_unittest.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/modules/payments/PaymentAppManager.cpp
diff --git a/third_party/WebKit/Source/modules/payments/PaymentAppManager.cpp b/third_party/WebKit/Source/modules/payments/PaymentAppManager.cpp
index 501f479d317e9a8f8b7fe4a2db97539ce1169209..5c82c2eb1e504094b80b5a33ad290428f695651b 100644
--- a/third_party/WebKit/Source/modules/payments/PaymentAppManager.cpp
+++ b/third_party/WebKit/Source/modules/payments/PaymentAppManager.cpp
@@ -101,7 +101,6 @@ ScriptPromise PaymentAppManager::setManifest(
ScriptPromise promise = resolver->promise();
m_manager->SetManifest(
- m_registration->scope(),
payments::mojom::blink::PaymentAppManifest::From(manifest),
convertToBaseCallback(WTF::bind(&PaymentAppManager::onSetManifest,
wrapPersistent(this),
@@ -120,10 +119,9 @@ ScriptPromise PaymentAppManager::getManifest(ScriptState* scriptState) {
ScriptPromiseResolver* resolver = ScriptPromiseResolver::create(scriptState);
ScriptPromise promise = resolver->promise();
- m_manager->GetManifest(m_registration->scope(),
- convertToBaseCallback(WTF::bind(
- &PaymentAppManager::onGetManifest,
- wrapPersistent(this), wrapPersistent(resolver))));
+ m_manager->GetManifest(convertToBaseCallback(
+ WTF::bind(&PaymentAppManager::onGetManifest, wrapPersistent(this),
+ wrapPersistent(resolver))));
return promise;
}
@@ -140,6 +138,8 @@ PaymentAppManager::PaymentAppManager(ServiceWorkerRegistration* registration)
m_manager.set_connection_error_handler(convertToBaseCallback(WTF::bind(
&PaymentAppManager::onServiceConnectionError, wrapWeakPersistent(this))));
+
+ m_manager->Init(m_registration->scope());
}
void PaymentAppManager::onSetManifest(
« no previous file with comments | « content/browser/payments/payment_app_manager_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698