content/browser/service_worker/service_worker_registration_status.cc - Issue 845313004: Service Worker: Improve error messages from register().

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: content/browser/service_worker/service_worker_registration_status.cc

Issue 845313004: Service Worker: Improve error messages from register(). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: git-cl format Created 5 years, 11 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/browser/service_worker/service_worker_registration_status.h ('k') | content/browser/service_worker/service_worker_script_cache_map.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/service_worker/service_worker_registration_status.cc

diff --git a/content/browser/service_worker/service_worker_registration_status.cc b/content/browser/service_worker/service_worker_registration_status.cc

index 250fb3b5034b976302cf8c1ad162ac5078a5f18b..548ec5f3f4560b2bea0a8e147e78cd291ca0d097 100644

--- a/content/browser/service_worker/service_worker_registration_status.cc

+++ b/content/browser/service_worker/service_worker_registration_status.cc

@@ -13,10 +13,14 @@ using blink::WebServiceWorkerError;

void GetServiceWorkerRegistrationStatusResponse(

ServiceWorkerStatusCode status,

+ const std::string& status_message,

blink::WebServiceWorkerError::ErrorType* error_type,

base::string16* message) {

*error_type = WebServiceWorkerError::ErrorTypeUnknown;

- *message = base::ASCIIToUTF16(ServiceWorkerStatusToString(status));

+ if (!status_message.empty())

+ *message = base::UTF8ToUTF16(status_message);

+ else

+ *message = base::ASCIIToUTF16(ServiceWorkerStatusToString(status));

switch (status) {

case SERVICE_WORKER_OK:

NOTREACHED() << "Calling this when status == OK is not allowed";