diff options
author | dcheng <dcheng@chromium.org> | 2014-12-28 12:31:56 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2014-12-28 20:32:43 +0000 |
commit | afa7602b2e8b0f3640ab681b8132a970bd133933 (patch) | |
tree | be7be10435fffc7bdcf49466769151c56612cc95 | |
parent | f13c491db505994d71f7c2c4e11b93f726e9933a (diff) | |
download | chromium_src-afa7602b2e8b0f3640ab681b8132a970bd133933.zip chromium_src-afa7602b2e8b0f3640ab681b8132a970bd133933.tar.gz chromium_src-afa7602b2e8b0f3640ab681b8132a970bd133933.tar.bz2 |
Standardize usage of virtual/override/final specifiers in extensions/.
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.
Several formatting edits by clang-format were manually reverted, due to
mangling of some of the more complicate IPC macros.
BUG=417463
Review URL: https://codereview.chromium.org/815503004
Cr-Commit-Position: refs/heads/master@{#309690}
11 files changed, 38 insertions, 38 deletions
diff --git a/extensions/browser/api/app_current_window_internal/app_current_window_internal_api.h b/extensions/browser/api/app_current_window_internal/app_current_window_internal_api.h index bdde8e4..f0314c8 100644 --- a/extensions/browser/api/app_current_window_internal/app_current_window_internal_api.h +++ b/extensions/browser/api/app_current_window_internal/app_current_window_internal_api.h @@ -215,8 +215,8 @@ class AppCurrentWindowInternalSetInterceptAllKeysFunction APP_CURRENTWINDOWINTERNAL_SETINTERCEPTALLKEYS) protected: - virtual ~AppCurrentWindowInternalSetInterceptAllKeysFunction() {} - virtual bool RunWithWindow(AppWindow* window) override; + ~AppCurrentWindowInternalSetInterceptAllKeysFunction() override {} + bool RunWithWindow(AppWindow* window) override; }; } // namespace extensions diff --git a/extensions/browser/api/cast_channel/cast_auth_ica_unittest.cc b/extensions/browser/api/cast_channel/cast_auth_ica_unittest.cc index 419aa57..8e1b6a5 100644 --- a/extensions/browser/api/cast_channel/cast_auth_ica_unittest.cc +++ b/extensions/browser/api/cast_channel/cast_auth_ica_unittest.cc @@ -40,7 +40,7 @@ static const net::SHA256HashValue kFingerprintInvalid = {{ class CastChannelAuthorityKeysTest : public testing::Test { public: CastChannelAuthorityKeysTest() {} - virtual ~CastChannelAuthorityKeysTest() {} + ~CastChannelAuthorityKeysTest() override {} protected: void ExpectKeysLoaded(); diff --git a/extensions/browser/api/cast_channel/cast_channel_api.h b/extensions/browser/api/cast_channel/cast_channel_api.h index 65ec35b..c343811 100644 --- a/extensions/browser/api/cast_channel/cast_channel_api.h +++ b/extensions/browser/api/cast_channel/cast_channel_api.h @@ -252,11 +252,11 @@ class CastChannelSetAuthorityKeysFunction : public CastChannelAsyncApiFunction { CastChannelSetAuthorityKeysFunction(); protected: - virtual ~CastChannelSetAuthorityKeysFunction(); + ~CastChannelSetAuthorityKeysFunction() override; // AsyncApiFunction: - virtual bool Prepare() override; - virtual void AsyncWorkStart() override; + bool Prepare() override; + void AsyncWorkStart() override; private: DECLARE_EXTENSION_FUNCTION("cast.channel.setAuthorityKeys", diff --git a/extensions/browser/api/cast_channel/cast_socket.h b/extensions/browser/api/cast_channel/cast_socket.h index b96fd8d..2cb56a6 100644 --- a/extensions/browser/api/cast_channel/cast_socket.h +++ b/extensions/browser/api/cast_channel/cast_socket.h @@ -46,7 +46,7 @@ class MessageFramer; class CastSocket : public ApiResource { public: explicit CastSocket(const std::string& owner_extension_id); - virtual ~CastSocket() {} + ~CastSocket() override {} // Used by BrowserContextKeyedAPIFactory. static const char* service_name() { return "CastSocketImplManager"; } @@ -128,20 +128,20 @@ class CastSocketImpl : public CastSocket { const scoped_refptr<Logger>& logger); // Ensures that the socket is closed. - virtual ~CastSocketImpl(); + ~CastSocketImpl() override; // CastSocket interface. - virtual void Connect(scoped_ptr<CastTransport::Delegate> delegate, - base::Callback<void(ChannelError)> callback) override; - virtual CastTransport* transport() const override; - virtual void Close(const net::CompletionCallback& callback) override; - const virtual net::IPEndPoint& ip_endpoint() const override; - virtual int id() const override; - virtual void set_id(int channel_id) override; - virtual ChannelAuthType channel_auth() const override; - virtual std::string cast_url() const override; - virtual ReadyState ready_state() const override; - virtual ChannelError error_state() const override; + void Connect(scoped_ptr<CastTransport::Delegate> delegate, + base::Callback<void(ChannelError)> callback) override; + CastTransport* transport() const override; + void Close(const net::CompletionCallback& callback) override; + const net::IPEndPoint& ip_endpoint() const override; + int id() const override; + void set_id(int channel_id) override; + ChannelAuthType channel_auth() const override; + std::string cast_url() const override; + ReadyState ready_state() const override; + ChannelError error_state() const override; // Required by ApiResourceManager. static const char* service_name() { return "CastSocketManager"; } @@ -153,9 +153,9 @@ class CastSocketImpl : public CastSocket { AuthTransportDelegate(CastSocketImpl* socket); // CastTransport::Delegate interface. - virtual void OnError(ChannelError error_state, - const LastErrors& last_errors) override; - virtual void OnMessage(const CastMessage& message) override; + void OnError(ChannelError error_state, + const LastErrors& last_errors) override; + void OnMessage(const CastMessage& message) override; private: CastSocketImpl* socket_; @@ -179,7 +179,7 @@ class CastSocketImpl : public CastSocket { friend class CastSocketTest; friend class TestCastSocket; - virtual void SetErrorState(ChannelError error_state) override; + void SetErrorState(ChannelError error_state) override; // Frees resources and cancels pending callbacks. |ready_state_| will be set // READY_STATE_CLOSED on completion. A no-op if |ready_state_| is already diff --git a/extensions/browser/api/cast_channel/cast_socket_unittest.cc b/extensions/browser/api/cast_channel/cast_socket_unittest.cc index 9c1156c..95d6ed1 100644 --- a/extensions/browser/api/cast_channel/cast_socket_unittest.cc +++ b/extensions/browser/api/cast_channel/cast_socket_unittest.cc @@ -339,9 +339,9 @@ class CastSocketTest : public testing::Test { scoped_ptr<base::TickClock>(new base::SimpleTestTickClock), base::TimeTicks())), read_delegate_(new MockDelegate) {} - virtual ~CastSocketTest() {} + ~CastSocketTest() override {} - virtual void SetUp() override { + void SetUp() override { EXPECT_CALL(*read_delegate_, OnMessage(_)).Times(0); EXPECT_CALL(*read_delegate_, OnError(_, _)).Times(0); } diff --git a/extensions/browser/api/cast_channel/cast_transport.h b/extensions/browser/api/cast_channel/cast_transport.h index 3d6cc6c..7b8cdaf 100644 --- a/extensions/browser/api/cast_channel/cast_transport.h +++ b/extensions/browser/api/cast_channel/cast_transport.h @@ -83,13 +83,13 @@ class CastTransportImpl : public CastTransport, public base::NonThreadSafe { ChannelAuthType channel_auth_, scoped_refptr<Logger> logger); - virtual ~CastTransportImpl(); + ~CastTransportImpl() override; // CastTransport interface. - virtual void SendMessage(const CastMessage& message, - const net::CompletionCallback& callback) override; - virtual void StartReading() override; - virtual void SetReadDelegate(Delegate* delegate) override; + void SendMessage(const CastMessage& message, + const net::CompletionCallback& callback) override; + void StartReading() override; + void SetReadDelegate(Delegate* delegate) override; private: // Internal write states. diff --git a/extensions/browser/api/hid/hid_apitest.cc b/extensions/browser/api/hid/hid_apitest.cc index 3863881..e30457c 100644 --- a/extensions/browser/api/hid/hid_apitest.cc +++ b/extensions/browser/api/hid/hid_apitest.cc @@ -94,7 +94,7 @@ class MockHidConnection : public HidConnection { } private: - ~MockHidConnection() {} + ~MockHidConnection() override {} }; class MockHidService : public HidService { diff --git a/extensions/browser/api/serial/serial_apitest.cc b/extensions/browser/api/serial/serial_apitest.cc index f951a20..a756b89 100644 --- a/extensions/browser/api/serial/serial_apitest.cc +++ b/extensions/browser/api/serial/serial_apitest.cc @@ -40,7 +40,7 @@ class FakeSerialGetDevicesFunction : public AsyncExtensionFunction { } protected: - ~FakeSerialGetDevicesFunction() {} + ~FakeSerialGetDevicesFunction() override {} }; class FakeSerialDeviceEnumerator : public device::SerialDeviceEnumerator { @@ -97,7 +97,7 @@ class FakeSerialConnectFunction : public core_api::SerialConnectFunction { } protected: - ~FakeSerialConnectFunction() {} + ~FakeSerialConnectFunction() override {} }; class SerialApiTest : public ExtensionApiTest, diff --git a/extensions/browser/lazy_background_task_queue_unittest.cc b/extensions/browser/lazy_background_task_queue_unittest.cc index 1b28912..dbe0794 100644 --- a/extensions/browser/lazy_background_task_queue_unittest.cc +++ b/extensions/browser/lazy_background_task_queue_unittest.cc @@ -106,7 +106,7 @@ class LazyBackgroundTaskQueueTest : public ExtensionsTest { } protected: - virtual void SetUp() override { + void SetUp() override { user_prefs::UserPrefs::Set(browser_context(), &testing_pref_service_); } diff --git a/extensions/browser/process_manager_factory.h b/extensions/browser/process_manager_factory.h index 0e04500..5773b4f 100644 --- a/extensions/browser/process_manager_factory.h +++ b/extensions/browser/process_manager_factory.h @@ -24,12 +24,12 @@ class ProcessManagerFactory : public BrowserContextKeyedServiceFactory { friend struct DefaultSingletonTraits<ProcessManagerFactory>; ProcessManagerFactory(); - virtual ~ProcessManagerFactory(); + ~ProcessManagerFactory() override; // BrowserContextKeyedServiceFactory - virtual KeyedService* BuildServiceInstanceFor( + KeyedService* BuildServiceInstanceFor( content::BrowserContext* context) const override; - virtual content::BrowserContext* GetBrowserContextToUse( + content::BrowserContext* GetBrowserContextToUse( content::BrowserContext* context) const override; DISALLOW_COPY_AND_ASSIGN(ProcessManagerFactory); diff --git a/extensions/shell/browser/shell_oauth2_token_service_unittest.cc b/extensions/shell/browser/shell_oauth2_token_service_unittest.cc index 71e9c3a..8b9dc72 100644 --- a/extensions/shell/browser/shell_oauth2_token_service_unittest.cc +++ b/extensions/shell/browser/shell_oauth2_token_service_unittest.cc @@ -12,7 +12,7 @@ namespace extensions { class ShellOAuth2TokenServiceTest : public ExtensionsTest { public: ShellOAuth2TokenServiceTest() {} - virtual ~ShellOAuth2TokenServiceTest() {} + ~ShellOAuth2TokenServiceTest() override {} private: content::TestBrowserThreadBundle thread_bundle_; |