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

Unified Diff: ash/magnifier/partial_magnification_controller.cc

Issue 2303963002: cros/ash: If the partial magnifier is active, do not consume input events if over palette views. (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/magnifier/partial_magnification_controller.cc
diff --git a/ash/magnifier/partial_magnification_controller.cc b/ash/magnifier/partial_magnification_controller.cc
index 3dcdd38448fdee2f915ab2b7949c43dbda4e68ff..0f7d6e085c621235ffa6ed475bfc410b9d44797f 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"
@@ -208,7 +209,8 @@ void PartialMagnificationController::OnLocatedEvent(
host_widget_->SetBounds(GetBounds(point));
- event->StopPropagation();
+ if (!PaletteContainsEvent(event))
+ event->StopPropagation();
}
void PartialMagnificationController::CreateMagnifierWindow(

Powered by Google App Engine
This is Rietveld 408576698