Index: extensions/browser/extension_protocols.cc |
diff --git a/extensions/browser/extension_protocols.cc b/extensions/browser/extension_protocols.cc |
index e781915ff1b873a0f045595ca627ceb20be9e577..151fa8fb2de5d5a27ec8819ec50e1d03bfe90f83 100644 |
--- a/extensions/browser/extension_protocols.cc |
+++ b/extensions/browser/extension_protocols.cc |
@@ -84,10 +84,10 @@ class GeneratedBackgroundPageJob : public net::URLRequestSimpleJob { |
} |
// Overridden from URLRequestSimpleJob: |
- virtual int GetData(std::string* mime_type, |
- std::string* charset, |
- std::string* data, |
- const net::CompletionCallback& callback) const override { |
+ int GetData(std::string* mime_type, |
+ std::string* charset, |
+ std::string* data, |
+ const net::CompletionCallback& callback) const override { |
// TODO(vadimt): Remove ScopedProfile below once crbug.com/422489 is fixed. |
tracked_objects::ScopedProfile tracking_profile( |
FROM_HERE_WITH_EXPLICIT_FUNCTION( |
@@ -108,12 +108,12 @@ class GeneratedBackgroundPageJob : public net::URLRequestSimpleJob { |
return net::OK; |
} |
- virtual void GetResponseInfo(net::HttpResponseInfo* info) override { |
+ void GetResponseInfo(net::HttpResponseInfo* info) override { |
*info = response_info_; |
} |
private: |
- virtual ~GeneratedBackgroundPageJob() {} |
+ ~GeneratedBackgroundPageJob() override {} |
scoped_refptr<const Extension> extension_; |
net::HttpResponseInfo response_info_; |
@@ -198,11 +198,11 @@ class URLRequestExtensionJob : public net::URLRequestFileJob { |
} |
} |
- virtual void GetResponseInfo(net::HttpResponseInfo* info) override { |
+ void GetResponseInfo(net::HttpResponseInfo* info) override { |
*info = response_info_; |
} |
- virtual void Start() override { |
+ void Start() override { |
request_timer_.reset(new base::ElapsedTimer()); |
base::FilePath* read_file_path = new base::FilePath; |
base::Time* last_modified_time = new base::Time(); |
@@ -220,13 +220,11 @@ class URLRequestExtensionJob : public net::URLRequestFileJob { |
DCHECK(posted); |
} |
- virtual bool IsRedirectResponse(GURL* location, |
- int* http_status_code) override { |
+ bool IsRedirectResponse(GURL* location, int* http_status_code) override { |
return false; |
} |
- virtual void SetExtraRequestHeaders( |
- const net::HttpRequestHeaders& headers) override { |
+ void SetExtraRequestHeaders(const net::HttpRequestHeaders& headers) override { |
// TODO(asargent) - we'll need to add proper support for range headers. |
// crbug.com/369895. |
std::string range_header; |
@@ -237,7 +235,7 @@ class URLRequestExtensionJob : public net::URLRequestFileJob { |
URLRequestFileJob::SetExtraRequestHeaders(headers); |
} |
- virtual void OnSeekComplete(int64 result) override { |
+ void OnSeekComplete(int64 result) override { |
DCHECK_EQ(seek_position_, 0); |
seek_position_ = result; |
// TODO(asargent) - we'll need to add proper support for range headers. |
@@ -246,7 +244,7 @@ class URLRequestExtensionJob : public net::URLRequestFileJob { |
verify_job_ = NULL; |
} |
- virtual void OnReadComplete(net::IOBuffer* buffer, int result) override { |
+ void OnReadComplete(net::IOBuffer* buffer, int result) override { |
if (result >= 0) |
UMA_HISTOGRAM_COUNTS("ExtensionUrlRequest.OnReadCompleteResult", result); |
else |
@@ -263,7 +261,7 @@ class URLRequestExtensionJob : public net::URLRequestFileJob { |
} |
private: |
- virtual ~URLRequestExtensionJob() { |
+ ~URLRequestExtensionJob() override { |
UMA_HISTOGRAM_COUNTS("ExtensionUrlRequest.TotalKbRead", bytes_read_ / 1024); |
UMA_HISTOGRAM_COUNTS("ExtensionUrlRequest.SeekPosition", seek_position_); |
if (request_timer_.get()) |
@@ -390,9 +388,9 @@ class ExtensionProtocolHandler |
extensions::InfoMap* extension_info_map) |
: is_incognito_(is_incognito), extension_info_map_(extension_info_map) {} |
- virtual ~ExtensionProtocolHandler() {} |
+ ~ExtensionProtocolHandler() override {} |
- virtual net::URLRequestJob* MaybeCreateJob( |
+ net::URLRequestJob* MaybeCreateJob( |
net::URLRequest* request, |
net::NetworkDelegate* network_delegate) const override; |