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

Side by Side Diff: ash/touch/touch_hud_debug.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/tooltips/tooltip_controller_unittest.cc ('k') | ash/touch/touch_hud_debug.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_DEBUG_H_ 5 #ifndef ASH_TOUCH_TOUCH_HUD_DEBUG_H_
6 #define ASH_TOUCH_TOUCH_HUD_DEBUG_H_ 6 #define ASH_TOUCH_TOUCH_HUD_DEBUG_H_
7 7
8 #include <map> 8 #include <map>
9 9
10 #include "ash/ash_export.h" 10 #include "ash/ash_export.h"
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
42 // cycles between a fixed number of display modes. 42 // cycles between a fixed number of display modes.
43 void ChangeToNextMode(); 43 void ChangeToNextMode();
44 44
45 // Returns log of touch events as a list value. Each item in the list is a 45 // Returns log of touch events as a list value. Each item in the list is a
46 // trace of one touch point. 46 // trace of one touch point.
47 scoped_ptr<base::ListValue> GetLogAsList() const; 47 scoped_ptr<base::ListValue> GetLogAsList() const;
48 48
49 Mode mode() const { return mode_; } 49 Mode mode() const { return mode_; }
50 50
51 // Overriden from TouchObserverHUD. 51 // Overriden from TouchObserverHUD.
52 virtual void Clear() OVERRIDE; 52 virtual void Clear() override;
53 53
54 private: 54 private:
55 virtual ~TouchHudDebug(); 55 virtual ~TouchHudDebug();
56 56
57 void SetMode(Mode mode); 57 void SetMode(Mode mode);
58 58
59 void UpdateTouchPointLabel(int index); 59 void UpdateTouchPointLabel(int index);
60 60
61 // Overriden from TouchObserverHUD. 61 // Overriden from TouchObserverHUD.
62 virtual void OnTouchEvent(ui::TouchEvent* event) OVERRIDE; 62 virtual void OnTouchEvent(ui::TouchEvent* event) override;
63 virtual void OnDisplayMetricsChanged(const gfx::Display& display, 63 virtual void OnDisplayMetricsChanged(const gfx::Display& display,
64 uint32_t metrics) OVERRIDE; 64 uint32_t metrics) override;
65 virtual void SetHudForRootWindowController( 65 virtual void SetHudForRootWindowController(
66 RootWindowController* controller) OVERRIDE; 66 RootWindowController* controller) override;
67 virtual void UnsetHudForRootWindowController( 67 virtual void UnsetHudForRootWindowController(
68 RootWindowController* controller) OVERRIDE; 68 RootWindowController* controller) override;
69 69
70 static const int kMaxTouchPoints = 32; 70 static const int kMaxTouchPoints = 32;
71 71
72 Mode mode_; 72 Mode mode_;
73 73
74 scoped_ptr<TouchLog> touch_log_; 74 scoped_ptr<TouchLog> touch_log_;
75 75
76 TouchHudCanvas* canvas_; 76 TouchHudCanvas* canvas_;
77 views::View* label_container_; 77 views::View* label_container_;
78 views::Label* touch_labels_[kMaxTouchPoints]; 78 views::Label* touch_labels_[kMaxTouchPoints];
79 79
80 DISALLOW_COPY_AND_ASSIGN(TouchHudDebug); 80 DISALLOW_COPY_AND_ASSIGN(TouchHudDebug);
81 }; 81 };
82 82
83 } // namespace ash 83 } // namespace ash
84 84
85 #endif // ASH_TOUCH_TOUCH_HUD_DEBUG_H_ 85 #endif // ASH_TOUCH_TOUCH_HUD_DEBUG_H_
OLDNEW
« no previous file with comments | « ash/tooltips/tooltip_controller_unittest.cc ('k') | ash/touch/touch_hud_debug.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698