| Index: android_webview/native/android_protocol_handler.cc
|
| diff --git a/android_webview/native/android_protocol_handler.cc b/android_webview/native/android_protocol_handler.cc
|
| index bc25e3662a20a2612268bbc3e43501d89c1930a6..f09e4f54fb71589bb3e63ae7078ee4e3b354cb69 100644
|
| --- a/android_webview/native/android_protocol_handler.cc
|
| +++ b/android_webview/native/android_protocol_handler.cc
|
| @@ -62,24 +62,24 @@ class AndroidStreamReaderURLRequestJobDelegateImpl
|
|
|
| virtual scoped_ptr<InputStream> OpenInputStream(
|
| JNIEnv* env,
|
| - const GURL& url) OVERRIDE;
|
| + const GURL& url) override;
|
|
|
| virtual void OnInputStreamOpenFailed(net::URLRequest* request,
|
| - bool* restart) OVERRIDE;
|
| + bool* restart) override;
|
|
|
| virtual bool GetMimeType(JNIEnv* env,
|
| net::URLRequest* request,
|
| InputStream* stream,
|
| - std::string* mime_type) OVERRIDE;
|
| + std::string* mime_type) override;
|
|
|
| virtual bool GetCharset(JNIEnv* env,
|
| net::URLRequest* request,
|
| InputStream* stream,
|
| - std::string* charset) OVERRIDE;
|
| + std::string* charset) override;
|
|
|
| virtual void AppendResponseHeaders(
|
| JNIEnv* env,
|
| - net::HttpResponseHeaders* headers) OVERRIDE;
|
| + net::HttpResponseHeaders* headers) override;
|
|
|
| virtual ~AndroidStreamReaderURLRequestJobDelegateImpl();
|
| };
|
| @@ -88,7 +88,7 @@ class AndroidRequestInterceptorBase : public net::URLRequestInterceptor {
|
| public:
|
| virtual net::URLRequestJob* MaybeInterceptRequest(
|
| net::URLRequest* request,
|
| - net::NetworkDelegate* network_delegate) const OVERRIDE;
|
| + net::NetworkDelegate* network_delegate) const override;
|
|
|
| virtual bool ShouldHandleRequest(const net::URLRequest* request) const = 0;
|
| };
|
| @@ -97,9 +97,9 @@ class AssetFileRequestInterceptor : public AndroidRequestInterceptorBase {
|
| public:
|
| AssetFileRequestInterceptor();
|
|
|
| - virtual ~AssetFileRequestInterceptor() OVERRIDE;
|
| + virtual ~AssetFileRequestInterceptor() override;
|
| virtual bool ShouldHandleRequest(
|
| - const net::URLRequest* request) const OVERRIDE;
|
| + const net::URLRequest* request) const override;
|
|
|
| private:
|
| // file:///android_asset/
|
| @@ -113,7 +113,7 @@ class ContentSchemeRequestInterceptor : public AndroidRequestInterceptorBase {
|
| public:
|
| ContentSchemeRequestInterceptor();
|
| virtual bool ShouldHandleRequest(
|
| - const net::URLRequest* request) const OVERRIDE;
|
| + const net::URLRequest* request) const override;
|
| };
|
|
|
| static ScopedJavaLocalRef<jobject> GetResourceContext(JNIEnv* env) {
|
|
|