diff options
author | nick <nick@chromium.org> | 2015-04-23 08:12:01 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-04-23 15:12:03 +0000 |
commit | 9c7fbb29354afcaf0d2afbd1659128f7706f86fe (patch) | |
tree | 162af18203cb0577b7f0e97dafb91a8930f870d9 /google_apis | |
parent | 2931c1a0862594e2f6e1bdcfb1f73f6139fff146 (diff) | |
download | chromium_src-9c7fbb29354afcaf0d2afbd1659128f7706f86fe.zip chromium_src-9c7fbb29354afcaf0d2afbd1659128f7706f86fe.tar.gz chromium_src-9c7fbb29354afcaf0d2afbd1659128f7706f86fe.tar.bz2 |
Update {virtual,override} to follow C++11 style in google_apis.
The Google style guide states that only one of {virtual,override,final} should be used for each declaration, since override implies virtual and final implies both virtual and override.
This patch was manually generated using a regex and a text editor.
BUG=417463
Review URL: https://codereview.chromium.org/1086453003
Cr-Commit-Position: refs/heads/master@{#326521}
Diffstat (limited to 'google_apis')
-rw-r--r-- | google_apis/drive/drive_api_requests.h | 6 | ||||
-rw-r--r-- | google_apis/gaia/gaia_oauth_client_unittest.cc | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/google_apis/drive/drive_api_requests.h b/google_apis/drive/drive_api_requests.h index 0c587ec..3aaee36 100644 --- a/google_apis/drive/drive_api_requests.h +++ b/google_apis/drive/drive_api_requests.h @@ -113,11 +113,11 @@ class DriveApiDataRequest : public DriveApiPartialFieldRequest { weak_ptr_factory_(this) { DCHECK(!callback_.is_null()); } - virtual ~DriveApiDataRequest() {} + ~DriveApiDataRequest() override {} protected: // UrlFetchRequestBase overrides. - virtual void ProcessURLFetchResults(const net::URLFetcher* source) override { + void ProcessURLFetchResults(const net::URLFetcher* source) override { DriveApiErrorCode error = GetErrorCode(); switch (error) { case HTTP_SUCCESS: @@ -136,7 +136,7 @@ class DriveApiDataRequest : public DriveApiPartialFieldRequest { } } - virtual void RunCallbackOnPrematureFailure(DriveApiErrorCode error) override { + void RunCallbackOnPrematureFailure(DriveApiErrorCode error) override { callback_.Run(error, scoped_ptr<DataType>()); } diff --git a/google_apis/gaia/gaia_oauth_client_unittest.cc b/google_apis/gaia/gaia_oauth_client_unittest.cc index 6197b89..56fdc916 100644 --- a/google_apis/gaia/gaia_oauth_client_unittest.cc +++ b/google_apis/gaia/gaia_oauth_client_unittest.cc @@ -218,14 +218,14 @@ class MockGaiaOAuthClientDelegate : public gaia::GaiaOAuthClient::Delegate { // https://groups.google.com/a/chromium.org/d/msg/chromium-dev/01sDxsJ1OYw/I_S0xCBRF2oJ MOCK_METHOD1(OnGetUserInfoResponsePtr, void(const base::DictionaryValue* user_info)); - virtual void OnGetUserInfoResponse( + void OnGetUserInfoResponse( scoped_ptr<base::DictionaryValue> user_info) override { user_info_.reset(user_info.release()); OnGetUserInfoResponsePtr(user_info_.get()); } MOCK_METHOD1(OnGetTokenInfoResponsePtr, void(const base::DictionaryValue* token_info)); - virtual void OnGetTokenInfoResponse( + void OnGetTokenInfoResponse( scoped_ptr<base::DictionaryValue> token_info) override { token_info_.reset(token_info.release()); OnGetTokenInfoResponsePtr(token_info_.get()); |