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

Side by Side Diff: chrome/browser/ui/ash/volume_controller_chromeos.h

Issue 627043002: replace OVERRIDE and FINAL with override and final in chrome/browser/ui/[a-s]* (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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CHROME_BROWSER_UI_ASH_VOLUME_CONTROLLER_CHROMEOS_H_ 5 #ifndef CHROME_BROWSER_UI_ASH_VOLUME_CONTROLLER_CHROMEOS_H_
6 #define CHROME_BROWSER_UI_ASH_VOLUME_CONTROLLER_CHROMEOS_H_ 6 #define CHROME_BROWSER_UI_ASH_VOLUME_CONTROLLER_CHROMEOS_H_
7 7
8 #include "ash/volume_control_delegate.h" 8 #include "ash/volume_control_delegate.h"
9 #include "base/basictypes.h" 9 #include "base/basictypes.h"
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
11 #include "chromeos/audio/cras_audio_handler.h" 11 #include "chromeos/audio/cras_audio_handler.h"
12 12
13 // A class which controls volume when F8-10 or a multimedia key for volume is 13 // A class which controls volume when F8-10 or a multimedia key for volume is
14 // pressed. 14 // pressed.
15 class VolumeController : public ash::VolumeControlDelegate, 15 class VolumeController : public ash::VolumeControlDelegate,
16 public chromeos::CrasAudioHandler::AudioObserver { 16 public chromeos::CrasAudioHandler::AudioObserver {
17 public: 17 public:
18 VolumeController(); 18 VolumeController();
19 virtual ~VolumeController(); 19 virtual ~VolumeController();
20 20
21 // Overridden from ash::VolumeControlDelegate: 21 // Overridden from ash::VolumeControlDelegate:
22 virtual bool HandleVolumeMute(const ui::Accelerator& accelerator) OVERRIDE; 22 virtual bool HandleVolumeMute(const ui::Accelerator& accelerator) override;
23 virtual bool HandleVolumeDown(const ui::Accelerator& accelerator) OVERRIDE; 23 virtual bool HandleVolumeDown(const ui::Accelerator& accelerator) override;
24 virtual bool HandleVolumeUp(const ui::Accelerator& accelerator) OVERRIDE; 24 virtual bool HandleVolumeUp(const ui::Accelerator& accelerator) override;
25 25
26 // Overridden from chromeos::CrasAudioHandler::AudioObserver. 26 // Overridden from chromeos::CrasAudioHandler::AudioObserver.
27 virtual void OnOutputVolumeChanged() OVERRIDE; 27 virtual void OnOutputVolumeChanged() override;
28 virtual void OnOutputMuteChanged() OVERRIDE; 28 virtual void OnOutputMuteChanged() override;
29 29
30 private: 30 private:
31 31
32 DISALLOW_COPY_AND_ASSIGN(VolumeController); 32 DISALLOW_COPY_AND_ASSIGN(VolumeController);
33 }; 33 };
34 34
35 #endif // CHROME_BROWSER_UI_ASH_VOLUME_CONTROLLER_CHROMEOS_H_ 35 #endif // CHROME_BROWSER_UI_ASH_VOLUME_CONTROLLER_CHROMEOS_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/ash/volume_controller_browsertest_chromeos.cc ('k') | chrome/browser/ui/ash/window_positioner_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698