| Index: android_webview/browser/net/aw_network_delegate.h
|
| diff --git a/android_webview/browser/net/aw_network_delegate.h b/android_webview/browser/net/aw_network_delegate.h
|
| index c925db9924cdac8b95004d26d14a84ab5dd75a42..da6723b8b05a53eb6927b92d209665abf3177af4 100644
|
| --- a/android_webview/browser/net/aw_network_delegate.h
|
| +++ b/android_webview/browser/net/aw_network_delegate.h
|
| @@ -19,47 +19,44 @@ namespace android_webview {
|
| class AwNetworkDelegate : public net::NetworkDelegateImpl {
|
| public:
|
| AwNetworkDelegate();
|
| - virtual ~AwNetworkDelegate();
|
| + ~AwNetworkDelegate() override;
|
|
|
| private:
|
| // NetworkDelegate implementation.
|
| - virtual int OnBeforeURLRequest(net::URLRequest* request,
|
| - const net::CompletionCallback& callback,
|
| - GURL* new_url) override;
|
| - virtual int OnBeforeSendHeaders(net::URLRequest* request,
|
| - const net::CompletionCallback& callback,
|
| - net::HttpRequestHeaders* headers) override;
|
| - virtual void OnSendHeaders(net::URLRequest* request,
|
| - const net::HttpRequestHeaders& headers) override;
|
| - virtual int OnHeadersReceived(
|
| + int OnBeforeURLRequest(net::URLRequest* request,
|
| + const net::CompletionCallback& callback,
|
| + GURL* new_url) override;
|
| + int OnBeforeSendHeaders(net::URLRequest* request,
|
| + const net::CompletionCallback& callback,
|
| + net::HttpRequestHeaders* headers) override;
|
| + void OnSendHeaders(net::URLRequest* request,
|
| + const net::HttpRequestHeaders& headers) override;
|
| + int OnHeadersReceived(
|
| net::URLRequest* request,
|
| const net::CompletionCallback& callback,
|
| const net::HttpResponseHeaders* original_response_headers,
|
| scoped_refptr<net::HttpResponseHeaders>* override_response_headers,
|
| GURL* allowed_unsafe_redirect_url) override;
|
| - virtual void OnBeforeRedirect(net::URLRequest* request,
|
| - const GURL& new_location) override;
|
| - virtual void OnResponseStarted(net::URLRequest* request) override;
|
| - virtual void OnRawBytesRead(const net::URLRequest& request,
|
| - int bytes_read) override;
|
| - virtual void OnCompleted(net::URLRequest* request, bool started) override;
|
| - virtual void OnURLRequestDestroyed(net::URLRequest* request) override;
|
| - virtual void OnPACScriptError(int line_number,
|
| - const base::string16& error) override;
|
| - virtual net::NetworkDelegate::AuthRequiredResponse OnAuthRequired(
|
| + void OnBeforeRedirect(net::URLRequest* request,
|
| + const GURL& new_location) override;
|
| + void OnResponseStarted(net::URLRequest* request) override;
|
| + void OnRawBytesRead(const net::URLRequest& request, int bytes_read) override;
|
| + void OnCompleted(net::URLRequest* request, bool started) override;
|
| + void OnURLRequestDestroyed(net::URLRequest* request) override;
|
| + void OnPACScriptError(int line_number, const base::string16& error) override;
|
| + net::NetworkDelegate::AuthRequiredResponse OnAuthRequired(
|
| net::URLRequest* request,
|
| const net::AuthChallengeInfo& auth_info,
|
| const AuthCallback& callback,
|
| net::AuthCredentials* credentials) override;
|
| - virtual bool OnCanGetCookies(const net::URLRequest& request,
|
| - const net::CookieList& cookie_list) override;
|
| - virtual bool OnCanSetCookie(const net::URLRequest& request,
|
| - const std::string& cookie_line,
|
| - net::CookieOptions* options) override;
|
| - virtual bool OnCanAccessFile(const net::URLRequest& request,
|
| - const base::FilePath& path) const override;
|
| - virtual bool OnCanThrottleRequest(
|
| - const net::URLRequest& request) const override;
|
| + bool OnCanGetCookies(const net::URLRequest& request,
|
| + const net::CookieList& cookie_list) override;
|
| + bool OnCanSetCookie(const net::URLRequest& request,
|
| + const std::string& cookie_line,
|
| + net::CookieOptions* options) override;
|
| + bool OnCanAccessFile(const net::URLRequest& request,
|
| + const base::FilePath& path) const override;
|
| + bool OnCanThrottleRequest(const net::URLRequest& request) const override;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(AwNetworkDelegate);
|
| };
|
|
|