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

Side by Side Diff: ash/test/test_volume_control_delegate.h

Issue 621133002: replace OVERRIDE and FINAL with override and final in ash/ (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
« no previous file with comments | « ash/test/test_user_wallpaper_delegate.h ('k') | ash/test/ui_controls_factory_ash.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 ASH_TEST_TEST_VOLUME_CONTROL_DELEGATE_H_ 5 #ifndef ASH_TEST_TEST_VOLUME_CONTROL_DELEGATE_H_
6 #define ASH_TEST_TEST_VOLUME_CONTROL_DELEGATE_H_ 6 #define ASH_TEST_TEST_VOLUME_CONTROL_DELEGATE_H_
7 7
8 #include "ash/volume_control_delegate.h" 8 #include "ash/volume_control_delegate.h"
9 #include "ui/base/accelerators/accelerator.h" 9 #include "ui/base/accelerators/accelerator.h"
10 10
(...skipping 17 matching lines...) Expand all
28 28
29 int handle_volume_up_count() const { 29 int handle_volume_up_count() const {
30 return handle_volume_up_count_; 30 return handle_volume_up_count_;
31 } 31 }
32 32
33 const ui::Accelerator& last_accelerator() const { 33 const ui::Accelerator& last_accelerator() const {
34 return last_accelerator_; 34 return last_accelerator_;
35 } 35 }
36 36
37 // ash::VolumeControlDelegate: 37 // ash::VolumeControlDelegate:
38 virtual bool HandleVolumeMute(const ui::Accelerator& accelerator) OVERRIDE; 38 virtual bool HandleVolumeMute(const ui::Accelerator& accelerator) override;
39 virtual bool HandleVolumeDown(const ui::Accelerator& accelerator) OVERRIDE; 39 virtual bool HandleVolumeDown(const ui::Accelerator& accelerator) override;
40 virtual bool HandleVolumeUp(const ui::Accelerator& accelerator) OVERRIDE; 40 virtual bool HandleVolumeUp(const ui::Accelerator& accelerator) override;
41 41
42 private: 42 private:
43 // Keeps track of the return value that should be used for the methods 43 // Keeps track of the return value that should be used for the methods
44 // inherited from VolumeControlDelegate 44 // inherited from VolumeControlDelegate
45 bool consume_; 45 bool consume_;
46 int handle_volume_mute_count_; 46 int handle_volume_mute_count_;
47 int handle_volume_down_count_; 47 int handle_volume_down_count_;
48 int handle_volume_up_count_; 48 int handle_volume_up_count_;
49 ui::Accelerator last_accelerator_; 49 ui::Accelerator last_accelerator_;
50 50
51 DISALLOW_COPY_AND_ASSIGN(TestVolumeControlDelegate); 51 DISALLOW_COPY_AND_ASSIGN(TestVolumeControlDelegate);
52 }; 52 };
53 53
54 } // namespace ash 54 } // namespace ash
55 55
56 #endif // ASH_TEST_TEST_VOLUME_CONTROL_DELEGATE_H_ 56 #endif // ASH_TEST_TEST_VOLUME_CONTROL_DELEGATE_H_
OLDNEW
« no previous file with comments | « ash/test/test_user_wallpaper_delegate.h ('k') | ash/test/ui_controls_factory_ash.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698