From 846b7985fcb118a36f9b44679bc02488f3019d94 Mon Sep 17 00:00:00 2001 From: danakj Date: Thu, 25 Feb 2016 20:44:01 -0800 Subject: Rename enums/functions that collide in chromium style. This fixes cases in: core/editing/ core/events/ core/fetch/ core/fileapi/ core/frame/ TBR=esprehn, Nico, sievers, haraken R=esprehn@chromium.org, pdr BUG=582312 Review URL: https://codereview.chromium.org/1738623004 Cr-Commit-Position: refs/heads/master@{#377812} --- third_party/WebKit/public/platform/WebURLRequest.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'third_party/WebKit/public/platform/WebURLRequest.h') diff --git a/third_party/WebKit/public/platform/WebURLRequest.h b/third_party/WebKit/public/platform/WebURLRequest.h index 906b47d..f493a31 100644 --- a/third_party/WebKit/public/platform/WebURLRequest.h +++ b/third_party/WebKit/public/platform/WebURLRequest.h @@ -190,7 +190,7 @@ public: BLINK_PLATFORM_EXPORT bool allowStoredCredentials() const; BLINK_PLATFORM_EXPORT void setAllowStoredCredentials(bool); - BLINK_PLATFORM_EXPORT CachePolicy cachePolicy() const; + BLINK_PLATFORM_EXPORT CachePolicy getCachePolicy() const; BLINK_PLATFORM_EXPORT void setCachePolicy(CachePolicy); BLINK_PLATFORM_EXPORT WebString httpMethod() const; -- cgit v1.1