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

Side by Side Diff: ash/accelerometer/accelerometer_controller.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
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_ACCELEROMETER_ACCELEROMETER_CONTROLLER_H_ 5 #ifndef ASH_ACCELEROMETER_ACCELEROMETER_CONTROLLER_H_
6 #define ASH_ACCELEROMETER_ACCELEROMETER_CONTROLLER_H_ 6 #define ASH_ACCELEROMETER_ACCELEROMETER_CONTROLLER_H_
7 7
8 #include "ash/ash_export.h" 8 #include "ash/ash_export.h"
9 #include "base/memory/ref_counted.h" 9 #include "base/memory/ref_counted.h"
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
(...skipping 29 matching lines...) Expand all
40 40
41 // Add/remove observer. 41 // Add/remove observer.
42 void AddObserver(AccelerometerObserver* observer); 42 void AddObserver(AccelerometerObserver* observer);
43 void RemoveObserver(AccelerometerObserver* observer); 43 void RemoveObserver(AccelerometerObserver* observer);
44 44
45 #if defined(OS_CHROMEOS) 45 #if defined(OS_CHROMEOS)
46 // This needs to be CHROMEOS only as on other platforms it does not actually 46 // This needs to be CHROMEOS only as on other platforms it does not actually
47 // override a method. 47 // override a method.
48 // chromeos::AccelerometerReader::Delegate: 48 // chromeos::AccelerometerReader::Delegate:
49 virtual void HandleAccelerometerUpdate( 49 virtual void HandleAccelerometerUpdate(
50 const ui::AccelerometerUpdate& update) OVERRIDE; 50 const ui::AccelerometerUpdate& update) override;
51 #endif 51 #endif
52 52
53 private: 53 private:
54 #if defined(OS_CHROMEOS) 54 #if defined(OS_CHROMEOS)
55 // The AccelerometerReader which directly triggers and reads from the 55 // The AccelerometerReader which directly triggers and reads from the
56 // accelerometer device. 56 // accelerometer device.
57 scoped_ptr<chromeos::AccelerometerReader> reader_; 57 scoped_ptr<chromeos::AccelerometerReader> reader_;
58 #endif 58 #endif
59 59
60 ObserverList<AccelerometerObserver, true> observers_; 60 ObserverList<AccelerometerObserver, true> observers_;
61 61
62 DISALLOW_COPY_AND_ASSIGN(AccelerometerController); 62 DISALLOW_COPY_AND_ASSIGN(AccelerometerController);
63 }; 63 };
64 64
65 } // namespace ash 65 } // namespace ash
66 66
67 #endif // ASH_ACCELEROMETER_ACCELEROMETER_CONTROLLER_H_ 67 #endif // ASH_ACCELEROMETER_ACCELEROMETER_CONTROLLER_H_
OLDNEW
« no previous file with comments | « ash/accelerators/spoken_feedback_toggler.h ('k') | ash/ash_touch_exploration_manager_chromeos.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698