diff options
| author | Kristian Monsen <kristianm@google.com> | 2011-06-29 07:02:28 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-06-29 07:02:28 -0700 |
| commit | c19571f3ec3bec025fa05e8d81ffd1998324e844 (patch) | |
| tree | 374ce2e6a2869bd21299c765aff7bb2ec8f67941 /Source/WebKit | |
| parent | 2facab8e2bfadc4b9028b267b9596981bfb6cc8a (diff) | |
| parent | cd7afe28242b14a5401477499c7f5b7251cfc08d (diff) | |
| download | external_webkit-c19571f3ec3bec025fa05e8d81ffd1998324e844.zip external_webkit-c19571f3ec3bec025fa05e8d81ffd1998324e844.tar.gz external_webkit-c19571f3ec3bec025fa05e8d81ffd1998324e844.tar.bz2 | |
Merge "Revert Android specific method name"
Diffstat (limited to 'Source/WebKit')
| -rw-r--r-- | Source/WebKit/android/WebCoreSupport/WebRequestContext.cpp | 2 | ||||
| -rw-r--r-- | Source/WebKit/android/WebCoreSupport/WebRequestContext.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Source/WebKit/android/WebCoreSupport/WebRequestContext.cpp b/Source/WebKit/android/WebCoreSupport/WebRequestContext.cpp index 78c3501..f51ba53 100644 --- a/Source/WebKit/android/WebCoreSupport/WebRequestContext.cpp +++ b/Source/WebKit/android/WebCoreSupport/WebRequestContext.cpp @@ -115,7 +115,7 @@ void WebRequestContext::setAcceptLanguage(const String& string) acceptLanguageWtfString = string; } -const std::string& WebRequestContext::GetAcceptLanguage() const +const std::string& WebRequestContext::accept_language() const { MutexLocker lock(acceptLanguageMutex); return acceptLanguageStdString; diff --git a/Source/WebKit/android/WebCoreSupport/WebRequestContext.h b/Source/WebKit/android/WebCoreSupport/WebRequestContext.h index 9286127..c254ad6 100644 --- a/Source/WebKit/android/WebCoreSupport/WebRequestContext.h +++ b/Source/WebKit/android/WebCoreSupport/WebRequestContext.h @@ -38,7 +38,7 @@ class WebRequestContext : public net::URLRequestContext { public: // URLRequestContext overrides. virtual const std::string& GetUserAgent(const GURL&) const; - virtual const std::string& GetAcceptLanguage() const; + virtual const std::string& accept_language() const; WebRequestContext(bool isPrivateBrowsing); |