chromeos/dbus/fake_shill_service_client.h - Issue 628883002: replace OVERRIDE and FINAL with override and final in chromeos/ - Code Review

Chromium Code Reviews

chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out

(80)

My Issues | Starred Open | Closed | All

Unified Diff: chromeos/dbus/fake_shill_service_client.h

Issue 628883002: replace OVERRIDE and FINAL with override and final in chromeos/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 years, 2 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

« no previous file with comments | « chromeos/dbus/fake_shill_profile_client.h ('k') | chromeos/dbus/fake_sms_client.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chromeos/dbus/fake_shill_service_client.h

diff --git a/chromeos/dbus/fake_shill_service_client.h b/chromeos/dbus/fake_shill_service_client.h

index b2692a41b28dc6c4bdf1979256ad1cd92c0ee18f..51bf55e24f93cd24b537fab14044c44a29dc35dc 100644

--- a/chromeos/dbus/fake_shill_service_client.h

+++ b/chromeos/dbus/fake_shill_service_client.h

@@ -26,54 +26,54 @@ class CHROMEOS_EXPORT FakeShillServiceClient

virtual ~FakeShillServiceClient();

// ShillServiceClient overrides

- virtual void Init(dbus::Bus* bus) OVERRIDE;

+ virtual void Init(dbus::Bus* bus) override;

virtual void AddPropertyChangedObserver(

const dbus::ObjectPath& service_path,

- ShillPropertyChangedObserver* observer) OVERRIDE;

+ ShillPropertyChangedObserver* observer) override;

virtual void RemovePropertyChangedObserver(

const dbus::ObjectPath& service_path,

- ShillPropertyChangedObserver* observer) OVERRIDE;

+ ShillPropertyChangedObserver* observer) override;

virtual void GetProperties(const dbus::ObjectPath& service_path,

- const DictionaryValueCallback& callback) OVERRIDE;

+ const DictionaryValueCallback& callback) override;

virtual void SetProperty(const dbus::ObjectPath& service_path,

const std::string& name,

const base::Value& value,

const base::Closure& callback,

- const ErrorCallback& error_callback) OVERRIDE;

+ const ErrorCallback& error_callback) override;

virtual void SetProperties(const dbus::ObjectPath& service_path,

const base::DictionaryValue& properties,

const base::Closure& callback,

- const ErrorCallback& error_callback) OVERRIDE;

+ const ErrorCallback& error_callback) override;

virtual void ClearProperty(const dbus::ObjectPath& service_path,

const std::string& name,

const base::Closure& callback,

- const ErrorCallback& error_callback) OVERRIDE;

+ const ErrorCallback& error_callback) override;

virtual void ClearProperties(const dbus::ObjectPath& service_path,

const std::vector<std::string>& names,

const ListValueCallback& callback,

- const ErrorCallback& error_callback) OVERRIDE;

+ const ErrorCallback& error_callback) override;

virtual void Connect(const dbus::ObjectPath& service_path,

const base::Closure& callback,

- const ErrorCallback& error_callback) OVERRIDE;

+ const ErrorCallback& error_callback) override;

virtual void Disconnect(const dbus::ObjectPath& service_path,

const base::Closure& callback,

- const ErrorCallback& error_callback) OVERRIDE;

+ const ErrorCallback& error_callback) override;

virtual void Remove(const dbus::ObjectPath& service_path,

const base::Closure& callback,

- const ErrorCallback& error_callback) OVERRIDE;

+ const ErrorCallback& error_callback) override;

virtual void ActivateCellularModem(

const dbus::ObjectPath& service_path,

const std::string& carrier,

const base::Closure& callback,

- const ErrorCallback& error_callback) OVERRIDE;

+ const ErrorCallback& error_callback) override;

virtual void CompleteCellularActivation(

const dbus::ObjectPath& service_path,

const base::Closure& callback,

- const ErrorCallback& error_callback) OVERRIDE;

+ const ErrorCallback& error_callback) override;

virtual void GetLoadableProfileEntries(

const dbus::ObjectPath& service_path,

- const DictionaryValueCallback& callback) OVERRIDE;

- virtual ShillServiceClient::TestInterface* GetTestInterface() OVERRIDE;

+ const DictionaryValueCallback& callback) override;

+ virtual ShillServiceClient::TestInterface* GetTestInterface() override;

// ShillServiceClient::TestInterface overrides.

virtual void AddService(const std::string& service_path,

@@ -81,30 +81,30 @@ class CHROMEOS_EXPORT FakeShillServiceClient

const std::string& name,

const std::string& type,

const std::string& state,

- bool visible) OVERRIDE;

+ bool visible) override;

virtual void AddServiceWithIPConfig(const std::string& service_path,

const std::string& guid,

const std::string& name,

const std::string& type,

const std::string& state,

const std::string& ipconfig_path,

- bool visible) OVERRIDE;

+ bool visible) override;

virtual base::DictionaryValue* SetServiceProperties(

const std::string& service_path,

const std::string& guid,

const std::string& name,

const std::string& type,

const std::string& state,

- bool visible) OVERRIDE;

- virtual void RemoveService(const std::string& service_path) OVERRIDE;

+ bool visible) override;

+ virtual void RemoveService(const std::string& service_path) override;

virtual bool SetServiceProperty(const std::string& service_path,

const std::string& property,

- const base::Value& value) OVERRIDE;

+ const base::Value& value) override;

virtual const base::DictionaryValue* GetServiceProperties(

- const std::string& service_path) const OVERRIDE;

- virtual void ClearServices() OVERRIDE;

+ const std::string& service_path) const override;

+ virtual void ClearServices() override;

virtual void SetConnectBehavior(const std::string& service_path,

- const base::Closure& behavior) OVERRIDE;

+ const base::Closure& behavior) override;

private:

typedef ObserverList<ShillPropertyChangedObserver> PropertyObserverList;

« no previous file with comments | « chromeos/dbus/fake_shill_profile_client.h ('k') | chromeos/dbus/fake_sms_client.h » ('j') | no next file with comments »

Powered by Google App Engine

This is Rietveld 408576698