diff options
author | rsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-06 20:35:53 +0000 |
---|---|---|
committer | rsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-06 20:35:53 +0000 |
commit | 7a4d60f7dae474e3108dfea842775fdedcd4b3e8 (patch) | |
tree | 2bb05ca0fe0c451db12f603354b2b16eec4e9ffd | |
parent | 28ddddab7d832001495f9f6d3607cbcc95e2bebc (diff) | |
download | chromium_src-7a4d60f7dae474e3108dfea842775fdedcd4b3e8.zip chromium_src-7a4d60f7dae474e3108dfea842775fdedcd4b3e8.tar.gz chromium_src-7a4d60f7dae474e3108dfea842775fdedcd4b3e8.tar.bz2 |
Linux/ChromeOS Chromium style checker cleanup, chromeos edition.
Automated clean up of style checker errors that were missed due to the plugin
not being executed on implementation files.
BUG=115047
Review URL: https://chromiumcodereview.appspot.com/12217030
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@181043 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r-- | chromeos/dbus/ibus/ibus_panel_service.cc | 8 | ||||
-rw-r--r-- | chromeos/dbus/session_manager_client.cc | 2 | ||||
-rw-r--r-- | chromeos/dbus/shill_device_client.cc | 4 | ||||
-rw-r--r-- | chromeos/dbus/shill_service_client.cc | 2 | ||||
-rw-r--r-- | chromeos/ime/ibus_daemon_controller.cc | 17 | ||||
-rw-r--r-- | chromeos/network/cros_network_functions.cc | 6 | ||||
-rw-r--r-- | chromeos/network/onc/onc_utils_unittest.cc | 2 |
7 files changed, 21 insertions, 20 deletions
diff --git a/chromeos/dbus/ibus/ibus_panel_service.cc b/chromeos/dbus/ibus/ibus_panel_service.cc index adc6fad..765318b 100644 --- a/chromeos/dbus/ibus/ibus_panel_service.cc +++ b/chromeos/dbus/ibus/ibus_panel_service.cc @@ -137,14 +137,14 @@ class IBusPanelServiceImpl : public IBusPanelService { // IBusPanelService override. virtual void SetUpCandidateWindowHandler( - IBusPanelCandidateWindowHandlerInterface* handler) { + IBusPanelCandidateWindowHandlerInterface* handler) OVERRIDE { DCHECK(handler); candidate_window_handler_ = handler; } // IBusPanelService override. virtual void SetUpPropertyHandler( - IBusPanelPropertyHandlerInterface* handler) { + IBusPanelPropertyHandlerInterface* handler) OVERRIDE { DCHECK(handler); property_handler_ = handler; } @@ -399,13 +399,13 @@ class IBusPanelServiceDaemonlessImpl : public IBusPanelService { // IBusPanelService override. virtual void SetUpCandidateWindowHandler( - IBusPanelCandidateWindowHandlerInterface* handler) { + IBusPanelCandidateWindowHandlerInterface* handler) OVERRIDE { // TODO(nona): Implement this. } // IBusPanelService override. virtual void SetUpPropertyHandler( - IBusPanelPropertyHandlerInterface* handler) { + IBusPanelPropertyHandlerInterface* handler) OVERRIDE { // TODO(nona): Implement this. } diff --git a/chromeos/dbus/session_manager_client.cc b/chromeos/dbus/session_manager_client.cc index fd84214..f2c36d5f 100644 --- a/chromeos/dbus/session_manager_client.cc +++ b/chromeos/dbus/session_manager_client.cc @@ -191,7 +191,7 @@ class SessionManagerClientImpl : public SessionManagerClient { virtual void RetrieveDeviceLocalAccountPolicy( const std::string& account_name, - const RetrievePolicyCallback& callback) { + const RetrievePolicyCallback& callback) OVERRIDE { dbus::MethodCall method_call( login_manager::kSessionManagerInterface, login_manager::kSessionManagerRetrieveDeviceLocalAccountPolicy); diff --git a/chromeos/dbus/shill_device_client.cc b/chromeos/dbus/shill_device_client.cc index 986789c..8055ba6 100644 --- a/chromeos/dbus/shill_device_client.cc +++ b/chromeos/dbus/shill_device_client.cc @@ -27,7 +27,7 @@ class ShillDeviceClientImpl : public ShillDeviceClient { : bus_(bus) { } - ~ShillDeviceClientImpl() { + virtual ~ShillDeviceClientImpl() { for (HelperMap::iterator iter = helpers_.begin(); iter != helpers_.end(); ++iter) { // This *should* never happen, yet we're getting crash reports that @@ -429,7 +429,7 @@ class ShillDeviceClientStubImpl : public ShillDeviceClient, virtual void SetDeviceProperty(const std::string& device_path, const std::string& name, - const base::Value& value) { + const base::Value& value) OVERRIDE { SetProperty(dbus::ObjectPath(device_path), name, value, base::Bind(&base::DoNothing), base::Bind(&ShillDeviceClientStubImpl::ErrorFunction)); diff --git a/chromeos/dbus/shill_service_client.cc b/chromeos/dbus/shill_service_client.cc index 8e0ede0..f0ed08f 100644 --- a/chromeos/dbus/shill_service_client.cc +++ b/chromeos/dbus/shill_service_client.cc @@ -402,7 +402,7 @@ class ShillServiceClientStubImpl : public ShillServiceClient, base::Value::CreateStringValue(state)); } - virtual void RemoveService(const std::string& service_path) { + virtual void RemoveService(const std::string& service_path) OVERRIDE { stub_services_.RemoveWithoutPathExpansion(service_path, NULL); } diff --git a/chromeos/ime/ibus_daemon_controller.cc b/chromeos/ime/ibus_daemon_controller.cc index 925bdf7..bdbf7ba 100644 --- a/chromeos/ime/ibus_daemon_controller.cc +++ b/chromeos/ime/ibus_daemon_controller.cc @@ -19,37 +19,38 @@ class IBusDaemonControllerImpl : public IBusDaemonController { public: IBusDaemonControllerImpl() {} - ~IBusDaemonControllerImpl() {} + virtual ~IBusDaemonControllerImpl() {} // IBusDaemonController override: - void Initialize( + virtual void Initialize( const scoped_refptr<base::SequencedTaskRunner>& ui_task_runner, - const scoped_refptr<base::SequencedTaskRunner>& file_task_runner) { + const scoped_refptr<base::SequencedTaskRunner>& file_task_runner) + OVERRIDE { DCHECK(thread_checker_.CalledOnValidThread()); // TODO(nona): Implement this. } // IBusDaemonController override: - void AddObserver(Observer* observer) { + virtual void AddObserver(Observer* observer) OVERRIDE { DCHECK(thread_checker_.CalledOnValidThread()); // TODO(nona): Implement this. } // IBusDaemonController override: - void RemoveObserver(Observer* observer) { + virtual void RemoveObserver(Observer* observer) OVERRIDE { DCHECK(thread_checker_.CalledOnValidThread()); // TODO(nona): Implement this. } // IBusDaemonController override: - bool Start() OVERRIDE { + virtual bool Start() OVERRIDE { DCHECK(thread_checker_.CalledOnValidThread()); // TODO(nona): Implement this. return true; } // IBusDaemonController override: - bool Stop() OVERRIDE { + virtual bool Stop() OVERRIDE { DCHECK(thread_checker_.CalledOnValidThread()); // TODO(nona): Implement this. return true; @@ -67,7 +68,7 @@ class IBusDaemonControllerStubImpl : public IBusDaemonController { virtual ~IBusDaemonControllerStubImpl() {} // IBusDaemonController overrides: - void Initialize( + virtual void Initialize( const scoped_refptr<base::SequencedTaskRunner>& ui_runner, const scoped_refptr<base::SequencedTaskRunner>& file_runner) OVERRIDE {} virtual void AddObserver(Observer* observer) OVERRIDE {} diff --git a/chromeos/network/cros_network_functions.cc b/chromeos/network/cros_network_functions.cc index 3dad29b..c38c5e0 100644 --- a/chromeos/network/cros_network_functions.cc +++ b/chromeos/network/cros_network_functions.cc @@ -44,7 +44,7 @@ class NetworkManagerPropertiesWatcher } virtual void OnPropertyChanged(const std::string& name, - const base::Value& value) { + const base::Value& value) OVERRIDE { callback_.Run(flimflam::kFlimflamServicePath, name, value); } private: @@ -70,7 +70,7 @@ class NetworkServicePropertiesWatcher } virtual void OnPropertyChanged(const std::string& name, - const base::Value& value) { + const base::Value& value) OVERRIDE { callback_.Run(service_path_, name, value); } @@ -98,7 +98,7 @@ class NetworkDevicePropertiesWatcher } virtual void OnPropertyChanged(const std::string& name, - const base::Value& value) { + const base::Value& value) OVERRIDE { callback_.Run(device_path_, name, value); } diff --git a/chromeos/network/onc/onc_utils_unittest.cc b/chromeos/network/onc/onc_utils_unittest.cc index f2226b1..98ef4df 100644 --- a/chromeos/network/onc/onc_utils_unittest.cc +++ b/chromeos/network/onc/onc_utils_unittest.cc @@ -58,7 +58,7 @@ class StringSubstitutionStub : public StringSubstitution { public: StringSubstitutionStub() {} virtual bool GetSubstitute(std::string placeholder, - std::string* substitute) const { + std::string* substitute) const OVERRIDE { if (placeholder == substitutes::kLoginIDField) *substitute = kLoginId; else if (placeholder == substitutes::kEmailField) |