diff options
Diffstat (limited to 'chromeos/dbus/services')
6 files changed, 11 insertions, 15 deletions
diff --git a/chromeos/dbus/services/cros_dbus_service.cc b/chromeos/dbus/services/cros_dbus_service.cc index 3e04416..bfcd405 100644 --- a/chromeos/dbus/services/cros_dbus_service.cc +++ b/chromeos/dbus/services/cros_dbus_service.cc @@ -98,8 +98,7 @@ class CrosDBusServiceStubImpl : public CrosDBusService { CrosDBusServiceStubImpl() { } - virtual ~CrosDBusServiceStubImpl() { - } + ~CrosDBusServiceStubImpl() override {} }; // static diff --git a/chromeos/dbus/services/cros_dbus_service_unittest.cc b/chromeos/dbus/services/cros_dbus_service_unittest.cc index fa4a0df..1a0a25f 100644 --- a/chromeos/dbus/services/cros_dbus_service_unittest.cc +++ b/chromeos/dbus/services/cros_dbus_service_unittest.cc @@ -35,7 +35,7 @@ class CrosDBusServiceTest : public testing::Test { } // Creates an instance of CrosDBusService with mocks injected. - virtual void SetUp() { + void SetUp() override { // Create a mock bus. dbus::Bus::Options options; options.bus_type = dbus::Bus::SYSTEM; @@ -70,7 +70,7 @@ class CrosDBusServiceTest : public testing::Test { mock_bus_.get(), service_providers.Pass()); } - virtual void TearDown() { + void TearDown() override { // Shutdown the cros service. CrosDBusService::Shutdown(); diff --git a/chromeos/dbus/services/display_power_service_provider.h b/chromeos/dbus/services/display_power_service_provider.h index 68e1e67..132c45d 100644 --- a/chromeos/dbus/services/display_power_service_provider.h +++ b/chromeos/dbus/services/display_power_service_provider.h @@ -41,11 +41,10 @@ class CHROMEOS_EXPORT DisplayPowerServiceProvider }; explicit DisplayPowerServiceProvider(scoped_ptr<Delegate> delegate); - virtual ~DisplayPowerServiceProvider(); + ~DisplayPowerServiceProvider() override; // CrosDBusService::ServiceProviderInterface overrides: - virtual void Start( - scoped_refptr<dbus::ExportedObject> exported_object) override; + void Start(scoped_refptr<dbus::ExportedObject> exported_object) override; private: // Called from ExportedObject when a handler is exported as a D-Bus diff --git a/chromeos/dbus/services/liveness_service_provider.h b/chromeos/dbus/services/liveness_service_provider.h index 559d071..a261ff2 100644 --- a/chromeos/dbus/services/liveness_service_provider.h +++ b/chromeos/dbus/services/liveness_service_provider.h @@ -38,11 +38,10 @@ class CHROMEOS_EXPORT LivenessServiceProvider : public CrosDBusService::ServiceProviderInterface { public: LivenessServiceProvider(); - virtual ~LivenessServiceProvider(); + ~LivenessServiceProvider() override; // CrosDBusService::ServiceProviderInterface overrides: - virtual void Start( - scoped_refptr<dbus::ExportedObject> exported_object) override; + void Start(scoped_refptr<dbus::ExportedObject> exported_object) override; private: // Called from ExportedObject when CheckLiveness() is exported as a D-Bus diff --git a/chromeos/dbus/services/proxy_resolution_service_provider.cc b/chromeos/dbus/services/proxy_resolution_service_provider.cc index 749ea08..fcdcf97 100644 --- a/chromeos/dbus/services/proxy_resolution_service_provider.cc +++ b/chromeos/dbus/services/proxy_resolution_service_provider.cc @@ -56,7 +56,7 @@ class ProxyResolverImpl : public ProxyResolverInterface { weak_ptr_factory_(this) { } - virtual ~ProxyResolverImpl() { + ~ProxyResolverImpl() override { DCHECK(OnOriginThread()); for (std::set<Request*>::iterator iter = all_requests_.begin(); @@ -68,7 +68,7 @@ class ProxyResolverImpl : public ProxyResolverInterface { } // ProxyResolverInterface override. - virtual void ResolveProxy( + void ResolveProxy( const std::string& source_url, const std::string& signal_interface, const std::string& signal_name, diff --git a/chromeos/dbus/services/proxy_resolution_service_provider.h b/chromeos/dbus/services/proxy_resolution_service_provider.h index daef7b5..acc25c2 100644 --- a/chromeos/dbus/services/proxy_resolution_service_provider.h +++ b/chromeos/dbus/services/proxy_resolution_service_provider.h @@ -84,11 +84,10 @@ class ProxyResolverInterface; class CHROMEOS_EXPORT ProxyResolutionServiceProvider : public CrosDBusService::ServiceProviderInterface { public: - virtual ~ProxyResolutionServiceProvider(); + ~ProxyResolutionServiceProvider() override; // CrosDBusService::ServiceProviderInterface override. - virtual void Start( - scoped_refptr<dbus::ExportedObject> exported_object) override; + void Start(scoped_refptr<dbus::ExportedObject> exported_object) override; // Creates the instance. static ProxyResolutionServiceProvider* Create( |