From 6c4f4ee156220fa7b058456d536d4e6e7f9b5d61 Mon Sep 17 00:00:00 2001
From: dcheng <dcheng@chromium.org>
Date: Thu, 22 Jan 2015 17:43:37 -0800
Subject: 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}
---
 extensions/shell/browser/shell_audio_controller_chromeos.h          | 2 +-
 .../shell/browser/shell_audio_controller_chromeos_unittest.cc       | 2 +-
 extensions/shell/browser/shell_network_controller_chromeos.h        | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'extensions/shell')

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:
-- 
cgit v1.1