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

Unified Diff: content/renderer/render_frame_impl.cc

Issue 1221643014: Service Worker: Migrate to version_uuid and surface ServiceWorker.id. (Chromium 2/3) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 6 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 | « content/renderer/render_frame_impl.h ('k') | content/renderer/service_worker/embedded_worker_dispatcher.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/render_frame_impl.cc
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
index 2e7d77a987884907027c9592b092779f2be946ff..7637ceaab2a987f249f5c1f21d2fdb0df693aaf5 100644
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -3696,13 +3696,13 @@ bool RenderFrameImpl::isControlledByServiceWorker(WebDataSource& data_source) {
kInvalidServiceWorkerHandleId;
}
-int64_t RenderFrameImpl::serviceWorkerID(WebDataSource& data_source) {
+std::string RenderFrameImpl::serviceWorkerID(WebDataSource& data_source) {
ServiceWorkerNetworkProvider* provider =
ServiceWorkerNetworkProvider::FromDocumentState(
DocumentState::FromDataSource(&data_source));
if (provider->context() && provider->context()->controller())
- return provider->context()->controller()->version_id();
- return kInvalidServiceWorkerVersionId;
+ return provider->context()->controller()->version_uuid();
+ return std::string();
}
void RenderFrameImpl::postAccessibilityEvent(const blink::WebAXObject& obj,
« no previous file with comments | « content/renderer/render_frame_impl.h ('k') | content/renderer/service_worker/embedded_worker_dispatcher.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698