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

Unified Diff: content/child/web_url_request_util.cc

Issue 2714423002: Rename SkipServiceWorker to ServiceWorkerMode (Closed)
Patch Set: typos-- Created 3 years, 10 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/child/web_url_request_util.h ('k') | content/common/resource_messages.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/child/web_url_request_util.cc
diff --git a/content/child/web_url_request_util.cc b/content/child/web_url_request_util.cc
index 51faca131d31156c97fa965ee2749359d9dafacc..a8eb8682ed634b00a542baf22af62c7c9c942c1e 100644
--- a/content/child/web_url_request_util.cc
+++ b/content/child/web_url_request_util.cc
@@ -485,16 +485,16 @@ blink::WebMixedContentContextType GetMixedContentContextTypeForWebURLRequest(
request.getRequestContext(), block_mixed_plugin_content);
}
-STATIC_ASSERT_ENUM(SkipServiceWorker::NONE,
- WebURLRequest::SkipServiceWorker::None);
-STATIC_ASSERT_ENUM(SkipServiceWorker::CONTROLLING,
- WebURLRequest::SkipServiceWorker::Controlling);
-STATIC_ASSERT_ENUM(SkipServiceWorker::ALL,
- WebURLRequest::SkipServiceWorker::All);
-
-SkipServiceWorker GetSkipServiceWorkerForWebURLRequest(
+STATIC_ASSERT_ENUM(ServiceWorkerMode::NONE,
+ WebURLRequest::ServiceWorkerMode::None);
+STATIC_ASSERT_ENUM(ServiceWorkerMode::FOREIGN,
+ WebURLRequest::ServiceWorkerMode::Foreign);
+STATIC_ASSERT_ENUM(ServiceWorkerMode::ALL,
+ WebURLRequest::ServiceWorkerMode::All);
+
+ServiceWorkerMode GetServiceWorkerModeForWebURLRequest(
const blink::WebURLRequest& request) {
- return static_cast<SkipServiceWorker>(request.skipServiceWorker());
+ return static_cast<ServiceWorkerMode>(request.getServiceWorkerMode());
}
blink::WebURLError CreateWebURLError(const blink::WebURL& unreachable_url,
« no previous file with comments | « content/child/web_url_request_util.h ('k') | content/common/resource_messages.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698