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

Unified Diff: ash/laser/laser_pointer_view.h

Issue 2311393004: Laser tool blocks events from propagating. (Closed)
Patch Set: Created 4 years, 3 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 side-by-side diff with in-line comments
Download patch
Index: ash/laser/laser_pointer_view.h
diff --git a/ash/common/system/chromeos/palette/tools/laser_pointer_view.h b/ash/laser/laser_pointer_view.h
similarity index 69%
rename from ash/common/system/chromeos/palette/tools/laser_pointer_view.h
rename to ash/laser/laser_pointer_view.h
index 1024467f01a5b66966bf8bcccfb3af6366a7e6b5..ee3c1b9a8d96b762a32d46dcdbc71102a7665e4e 100644
--- a/ash/common/system/chromeos/palette/tools/laser_pointer_view.h
+++ b/ash/laser/laser_pointer_view.h
@@ -2,15 +2,19 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef ASH_COMMON_SYSTEM_CHROMEOS_PALETTE_TOOLS_LASER_POINTER_VIEW_H_
-#define ASH_COMMON_SYSTEM_CHROMEOS_PALETTE_TOOLS_LASER_POINTER_VIEW_H_
+#ifndef ASH_LASER_LASER_POINTER_VIEW_H_
+#define ASH_LASER_LASER_POINTER_VIEW_H_
#include <memory>
-#include "ash/common/system/chromeos/palette/tools/laser_pointer_points.h"
+#include "ash/laser/laser_pointer_points.h"
#include "base/macros.h"
#include "ui/views/view.h"
+namespace aura {
+class Window;
+}
+
namespace gfx {
class Point;
}
@@ -26,14 +30,16 @@ namespace ash {
// trail of lines to help users track.
class LaserPointerView : public views::View {
public:
- explicit LaserPointerView(base::TimeDelta life_duration);
+ explicit LaserPointerView(base::TimeDelta life_duration,
+ aura::Window* root_window);
~LaserPointerView() override;
void AddNewPoint(const gfx::Point& new_point);
void Stop();
+ aura::Window* GetRootWindow();
private:
- friend class LaserPointerModeTestApi;
+ friend class LaserPointerControllerTestApi;
// view::View:
void OnPaint(gfx::Canvas* canvas) override;
@@ -43,7 +49,6 @@ class LaserPointerView : public views::View {
DISALLOW_COPY_AND_ASSIGN(LaserPointerView);
};
-
} // namespace ash
-#endif // ASH_COMMON_SYSTEM_CHROMEOS_PALETTE_TOOLS_LASER_POINTER_VIEW_H_
+#endif // ASH_LASER_LASER_POINTER_VIEW_H_

Powered by Google App Engine
This is Rietveld 408576698