Separate projection mode from rest of touch HUD

ash/touch/touch_hud_debugging.h

Index: ash/touch/touch_hud_debugging.h
diff --git a/ash/touch/touch_hud_debugging.h b/ash/touch/touch_hud_debugging.h
new file mode 100644
index 0000000000000000000000000000000000000000..bc60706264c702ae5321f587cd688a16452af2f7
--- /dev/null
+++ b/ash/touch/touch_hud_debugging.h
@@ -0,0 +1,88 @@
+// Copyright (c) 2013 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef ASH_TOUCH_TOUCH_HUD_DEBUGGING_H_

[sadrul, 2013/06/26 17:26:21]

I would call this TouchHudDebug

[mohsen, 2013/06/26 19:15:49]

Done.

+#define ASH_TOUCH_TOUCH_HUD_DEBUGGING_H_
+
+#include <map>
+
+#include "ash/ash_export.h"
+#include "ash/touch/touch_observer_hud.h"
+#include "base/memory/scoped_ptr.h"
+#include "base/values.h"
+
+namespace views {
+class Label;
+class View;
+}
+
+namespace ash {
+namespace internal {
+
+class TouchHudCanvas;
+class TouchLog;
+
+// A heads-up display to show touch traces on the screen and log touch events.
+// As a derivative of TouchObserverHUD, objects of this class manage their own
+// lifetime.
+class ASH_EXPORT TouchHudDebugging : public TouchObserverHUD {
+ public:
+  enum Mode {
+    FULLSCREEN,
+    REDUCED_SCALE,
+    INVISIBLE,
+  };
+
+  explicit TouchHudDebugging(aura::RootWindow* initial_root);
+
+  // Returns the log of touch events for all displays as a dictionary mapping id
+  // of each display to its touch log.
+  static scoped_ptr<DictionaryValue> GetAllAsDictionary();
+
+  // Changes the display mode (e.g. scale, visibility). Calling this repeatedly
+  // cycles between a fixed number of display modes.
+  void ChangeToNextMode();
+
+  // Removes all existing touch traces from the screen (only if the HUD is
+  // visible).
+  virtual void Clear() OVERRIDE;

[sadrul, 2013/06/26 17:26:21]

Replace the comment with: // Overridden from ..., and move at the end of
non-override methods

[mohsen, 2013/06/26 19:15:49]

Done.

+
+  // Returns log of touch events as a list value. Each item in the list is a
+  // trace of one touch point.
+  scoped_ptr<ListValue> GetLogAsList() const;
+
+  Mode mode() const { return mode_; }
+
+ private:
+  virtual ~TouchHudDebugging();
+
+  void SetMode(Mode mode);
+
+  void UpdateTouchPointLabel(int index);
+
+  // Overriden from TouchObserverHUD.
+  virtual void OnTouchEvent(ui::TouchEvent* event) OVERRIDE;
+  virtual void OnDisplayBoundsChanged(const gfx::Display& display) OVERRIDE;
+  virtual void SetHudForRootWindowController(
+      RootWindowController* controller) OVERRIDE;
+  virtual void UnsetHudForRootWindowController(
+      RootWindowController* controller) OVERRIDE;
+
+  static const int kMaxTouchPoints = 32;
+
+  Mode mode_;
+
+  scoped_ptr<TouchLog> touch_log_;
+
+  TouchHudCanvas* canvas_;
+  views::View* label_container_;
+  views::Label* touch_labels_[kMaxTouchPoints];
+
+  DISALLOW_COPY_AND_ASSIGN(TouchHudDebugging);
+};
+
+}  // namespace internal
+}  // namespace ash
+
+#endif  // ASH_TOUCH_TOUCH_HUD_DEBUGGING_H_