diff options
author | dcheng <dcheng@chromium.org> | 2014-10-27 14:48:33 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2014-10-27 21:48:55 +0000 |
commit | 578ab408a9a10b59297b8364a50987a8dd088cdf (patch) | |
tree | 157fdfba308a708c7a1b2c62e5599aac8243003e /extensions/shell/browser/shell_network_delegate.h | |
parent | 67be2b1f8dbb8fe664365ce33cd6ccf2832e0663 (diff) | |
download | chromium_src-578ab408a9a10b59297b8364a50987a8dd088cdf.zip chromium_src-578ab408a9a10b59297b8364a50987a8dd088cdf.tar.gz chromium_src-578ab408a9a10b59297b8364a50987a8dd088cdf.tar.bz2 |
Standardize usage of virtual/override/final specifiers.
The Google C++ style guide states:
Explicitly annotate overrides of virtual functions or virtual
destructors with an override or (less frequently) final specifier.
Older (pre-C++11) code will use the virtual keyword as an inferior
alternative annotation. For clarity, use exactly one of override,
final, or virtual when declaring an override.
To better conform to these guidelines, the following constructs have
been rewritten:
- if a base class has a virtual destructor, then:
virtual ~Foo(); -> ~Foo() override;
- virtual void Foo() override; -> void Foo() override;
- virtual void Foo() override final; -> void Foo() final;
This patch was automatically generated. The clang plugin can generate
fixit hints, which are suggested edits when it is 100% sure it knows how
to fix a problem. The hints from the clang plugin were applied to the
source tree using the tool in https://codereview.chromium.org/598073004.
BUG=417463
R=yoz@chromium.org
Review URL: https://codereview.chromium.org/667153007
Cr-Commit-Position: refs/heads/master@{#301453}
Diffstat (limited to 'extensions/shell/browser/shell_network_delegate.h')
-rw-r--r-- | extensions/shell/browser/shell_network_delegate.h | 35 |
1 files changed, 17 insertions, 18 deletions
diff --git a/extensions/shell/browser/shell_network_delegate.h b/extensions/shell/browser/shell_network_delegate.h index 5d8635a..7b60bab 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, |