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

Unified Diff: ash/magnifier/partial_magnification_controller.cc

Issue 2311393004: Laser tool blocks events from propagating. (Closed)
Patch Set: Fixed patch set 2 errors. 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/magnifier/partial_magnification_controller.cc
diff --git a/ash/magnifier/partial_magnification_controller.cc b/ash/magnifier/partial_magnification_controller.cc
index 5b51928eb434836f45a8fe10a500f85ce0b54272..bb6e6a3911e60a472b4a313a325799d073078dbe 100644
--- a/ash/magnifier/partial_magnification_controller.cc
+++ b/ash/magnifier/partial_magnification_controller.cc
@@ -4,6 +4,7 @@
#include "ash/magnifier/partial_magnification_controller.h"
+#include "ash/common/system/chromeos/palette/palette_utils.h"
#include "ash/shell.h"
#include "ui/aura/window_event_dispatcher.h"
#include "ui/aura/window_tree_host.h"
@@ -14,10 +15,6 @@
#include "ui/views/widget/widget.h"
#include "ui/wm/core/coordinate_conversion.h"
-#if defined(OS_CHROMEOS)
-#include "ash/common/system/chromeos/palette/palette_utils.h"
-#endif
-
namespace ash {
namespace {
@@ -61,11 +58,7 @@ aura::Window* GetCurrentRootWindow() {
// Returns true if the event should be processed normally, ie, the stylus is
// over the palette icon or widget.
bool ShouldSkipEventFiltering(const gfx::Point& point) {
James Cook 2016/09/14 22:53:38 you can eliminate this function too
sammiequon 2016/09/16 17:35:26 Done.
-#if defined(OS_CHROMEOS)
return PaletteContainsPointInScreen(point);
-#else
- return false;
-#endif
}
} // namespace

Powered by Google App Engine
This is Rietveld 408576698