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

Side by Side Diff: ash/touch/touch_hud_projection.h

Issue 2153493002: Revert of ash: Refactor touch hud drawing to ash/touch_hud. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 5 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/ash_touch_hud.gyp ('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 #include "base/macros.h" 11 #include "base/macros.h"
12 12
13 namespace ash { 13 namespace ash {
14 class TouchHudRenderer; 14 class TouchPointView;
15 15
16 // A heads-up display to show active touch points on the screen. As a derivative 16 // A heads-up display to show active touch points on the screen. As a derivative
17 // of TouchObserverHUD, objects of this class manage their own lifetime. 17 // of TouchObserverHUD, objects of this class manage their own lifetime.
18 class TouchHudProjection : public TouchObserverHUD { 18 class TouchHudProjection : public TouchObserverHUD {
19 public: 19 public:
20 explicit TouchHudProjection(aura::Window* initial_root); 20 explicit TouchHudProjection(aura::Window* initial_root);
21 21
22 // Overriden from TouchObserverHUD. 22 // Overriden from TouchObserverHUD.
23 void Clear() override; 23 void Clear() override;
24 24
25 private: 25 private:
26 friend class TouchHudProjectionTest; 26 friend class TouchHudProjectionTest;
27 27
28 ~TouchHudProjection() override; 28 ~TouchHudProjection() override;
29 29
30 // Overriden from TouchObserverHUD. 30 // Overriden from TouchObserverHUD.
31 void OnTouchEvent(ui::TouchEvent* event) override; 31 void OnTouchEvent(ui::TouchEvent* event) override;
32 void SetHudForRootWindowController(RootWindowController* controller) override; 32 void SetHudForRootWindowController(RootWindowController* controller) override;
33 void UnsetHudForRootWindowController( 33 void UnsetHudForRootWindowController(
34 RootWindowController* controller) override; 34 RootWindowController* controller) override;
35 35
36 // TouchHudRenderer draws out the touch points. 36 std::map<int, TouchPointView*> points_;
37 std::unique_ptr<TouchHudRenderer> touch_hud_renderer_;
38 37
39 DISALLOW_COPY_AND_ASSIGN(TouchHudProjection); 38 DISALLOW_COPY_AND_ASSIGN(TouchHudProjection);
40 }; 39 };
41 40
42 } // namespace ash 41 } // namespace ash
43 42
44 #endif // ASH_TOUCH_TOUCH_HUD_PROJECTION_H_ 43 #endif // ASH_TOUCH_TOUCH_HUD_PROJECTION_H_
OLDNEW
« no previous file with comments | « ash/ash_touch_hud.gyp ('k') | ash/touch/touch_hud_projection.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698