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

Unified Diff: ash/magnifier/partial_magnification_controller.cc

Issue 2644713002: cros: Use runtime stylus detection for ash palette. (Closed)
Patch Set: Fix test Created 3 years, 10 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
« no previous file with comments | « ash/laser/laser_pointer_controller.cc ('k') | ash/shell/shell_delegate_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/magnifier/partial_magnification_controller.cc
diff --git a/ash/magnifier/partial_magnification_controller.cc b/ash/magnifier/partial_magnification_controller.cc
index b4fc5c022fa22ba89eddc2c6587d629a0516d287..8cd64f62ce1015162d50d746e494f245f6520c06 100644
--- a/ash/magnifier/partial_magnification_controller.cc
+++ b/ash/magnifier/partial_magnification_controller.cc
@@ -283,7 +283,7 @@ void PartialMagnificationController::OnLocatedEvent(
// If the stylus is pressed on the palette icon or widget, do not activate.
if (event->type() == ui::ET_TOUCH_PRESSED &&
- !PaletteContainsPointInScreen(screen_point)) {
+ !palette_utils::PaletteContainsPointInScreen(screen_point)) {
SetActive(true);
}
@@ -311,7 +311,7 @@ void PartialMagnificationController::OnLocatedEvent(
host_widget_->SetBounds(GetBounds(point));
// If the stylus is over the palette icon or widget, do not consume the event.
- if (!PaletteContainsPointInScreen(screen_point))
+ if (!palette_utils::PaletteContainsPointInScreen(screen_point))
event->StopPropagation();
}
« no previous file with comments | « ash/laser/laser_pointer_controller.cc ('k') | ash/shell/shell_delegate_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698