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

Side by Side Diff: ash/touch/touch_hud_projection.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/touch/touch_hud_debug.cc ('k') | ash/touch/touch_hud_projection.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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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_TOUCH_TOUCH_HUD_PROJECTION_H_ 5 #ifndef ASH_TOUCH_TOUCH_HUD_PROJECTION_H_
6 #define ASH_TOUCH_TOUCH_HUD_PROJECTION_H_ 6 #define ASH_TOUCH_TOUCH_HUD_PROJECTION_H_
7 7
8 #include <map> 8 #include <map>
9 9
10 #include "ash/touch/touch_observer_hud.h" 10 #include "ash/touch/touch_observer_hud.h"
11 11
12 namespace ash { 12 namespace ash {
13 class TouchPointView; 13 class TouchPointView;
14 14
15 // A heads-up display to show active touch points on the screen. As a derivative 15 // A heads-up display to show active touch points on the screen. As a derivative
16 // of TouchObserverHUD, objects of this class manage their own lifetime. 16 // of TouchObserverHUD, objects of this class manage their own lifetime.
17 class TouchHudProjection : public TouchObserverHUD { 17 class TouchHudProjection : public TouchObserverHUD {
18 public: 18 public:
19 explicit TouchHudProjection(aura::Window* initial_root); 19 explicit TouchHudProjection(aura::Window* initial_root);
20 20
21 // Overriden from TouchObserverHUD. 21 // Overriden from TouchObserverHUD.
22 virtual void Clear() OVERRIDE; 22 virtual void Clear() override;
23 23
24 private: 24 private:
25 friend class TouchHudProjectionTest; 25 friend class TouchHudProjectionTest;
26 26
27 virtual ~TouchHudProjection(); 27 virtual ~TouchHudProjection();
28 28
29 // Overriden from TouchObserverHUD. 29 // Overriden from TouchObserverHUD.
30 virtual void OnTouchEvent(ui::TouchEvent* event) OVERRIDE; 30 virtual void OnTouchEvent(ui::TouchEvent* event) override;
31 virtual void SetHudForRootWindowController( 31 virtual void SetHudForRootWindowController(
32 RootWindowController* controller) OVERRIDE; 32 RootWindowController* controller) override;
33 virtual void UnsetHudForRootWindowController( 33 virtual void UnsetHudForRootWindowController(
34 RootWindowController* controller) OVERRIDE; 34 RootWindowController* controller) override;
35 35
36 std::map<int, TouchPointView*> points_; 36 std::map<int, TouchPointView*> points_;
37 37
38 DISALLOW_COPY_AND_ASSIGN(TouchHudProjection); 38 DISALLOW_COPY_AND_ASSIGN(TouchHudProjection);
39 }; 39 };
40 40
41 } // namespace ash 41 } // namespace ash
42 42
43 #endif // ASH_TOUCH_TOUCH_HUD_PROJECTION_H_ 43 #endif // ASH_TOUCH_TOUCH_HUD_PROJECTION_H_
OLDNEW
« no previous file with comments | « ash/touch/touch_hud_debug.cc ('k') | ash/touch/touch_hud_projection.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698