| Index: extensions/shell/browser/shell_network_delegate.h
|
| diff --git a/extensions/shell/browser/shell_network_delegate.h b/extensions/shell/browser/shell_network_delegate.h
|
| index 5d8635ade4eb4ab9d7244460cae40fd41944bdd5..7b60bab3c34af60a7a8a7533b60186d282e5a0c2 100644
|
| --- a/extensions/shell/browser/shell_network_delegate.h
|
| +++ b/extensions/shell/browser/shell_network_delegate.h
|
| @@ -15,34 +15,33 @@ class InfoMap;
|
| class ShellNetworkDelegate : public net::NetworkDelegate {
|
| public:
|
| ShellNetworkDelegate(void* browser_context, InfoMap* extension_info_map);
|
| - virtual ~ShellNetworkDelegate();
|
| + ~ShellNetworkDelegate() override;
|
|
|
| static void SetAcceptAllCookies(bool accept);
|
|
|
| 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 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 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,
|
|
|