diff options
| author | dcheng <dcheng@chromium.org> | 2015-01-22 17:43:37 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-01-23 01:45:34 +0000 |
| commit | 6c4f4ee156220fa7b058456d536d4e6e7f9b5d61 (patch) | |
| tree | 08a5c2c9ce5ebb5950a8c69084c438ae901cfc54 /extensions/shell | |
| parent | 57e53d315e9cc18680580c9249486ae8f9d888e3 (diff) | |
| download | chromium_src-6c4f4ee156220fa7b058456d536d4e6e7f9b5d61.zip chromium_src-6c4f4ee156220fa7b058456d536d4e6e7f9b5d61.tar.gz chromium_src-6c4f4ee156220fa7b058456d536d4e6e7f9b5d61.tar.bz2 | |
Update {virtual,override,final} to follow C++11 style in extensions, round 2.
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 automatically generated with a ChromeOS build using a
variation of https://codereview.chromium.org/598073004.
BUG=417463
Review URL: https://codereview.chromium.org/873473003
Cr-Commit-Position: refs/heads/master@{#312737}
Diffstat (limited to 'extensions/shell')
3 files changed, 5 insertions, 5 deletions
diff --git a/extensions/shell/browser/shell_audio_controller_chromeos.h b/extensions/shell/browser/shell_audio_controller_chromeos.h index 4edeff8..c8b9646 100644 --- a/extensions/shell/browser/shell_audio_controller_chromeos.h +++ b/extensions/shell/browser/shell_audio_controller_chromeos.h @@ -14,7 +14,7 @@ namespace extensions { class ShellAudioController : public chromeos::CrasAudioHandler::AudioObserver { public: ShellAudioController(); - virtual ~ShellAudioController(); + ~ShellAudioController() override; // chromeos::CrasAudioHandler::Observer implementation: void OnOutputVolumeChanged() override; diff --git a/extensions/shell/browser/shell_audio_controller_chromeos_unittest.cc b/extensions/shell/browser/shell_audio_controller_chromeos_unittest.cc index 95d54f5..a1563c7 100644 --- a/extensions/shell/browser/shell_audio_controller_chromeos_unittest.cc +++ b/extensions/shell/browser/shell_audio_controller_chromeos_unittest.cc @@ -36,7 +36,7 @@ class ShellAudioControllerTest : public testing::Test { controller_.reset(new ShellAudioController()); } - virtual ~ShellAudioControllerTest() { + ~ShellAudioControllerTest() override { controller_.reset(); chromeos::CrasAudioHandler::Shutdown(); chromeos::DBusThreadManager::Shutdown(); diff --git a/extensions/shell/browser/shell_network_controller_chromeos.h b/extensions/shell/browser/shell_network_controller_chromeos.h index 385de90..1f36a74 100644 --- a/extensions/shell/browser/shell_network_controller_chromeos.h +++ b/extensions/shell/browser/shell_network_controller_chromeos.h @@ -23,11 +23,11 @@ class ShellNetworkController : public chromeos::NetworkStateHandlerObserver { // This class must be instantiated after chromeos::DBusThreadManager and // destroyed before it. explicit ShellNetworkController(const std::string& preferred_network_name); - virtual ~ShellNetworkController(); + ~ShellNetworkController() override; // chromeos::NetworkStateHandlerObserver overrides: - virtual void NetworkListChanged() override; - virtual void NetworkConnectionStateChanged( + void NetworkListChanged() override; + void NetworkConnectionStateChanged( const chromeos::NetworkState* state) override; private: |