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

Unified Diff: ash/wm/resize_handle_window_targeter.cc

Issue 2172363002: Created min size for print preview dialog and modified to allow the Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix Mac compile error. Created 4 years, 4 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/wm/resize_handle_window_targeter.cc
diff --git a/ash/wm/resize_handle_window_targeter.cc b/ash/wm/resize_handle_window_targeter.cc
index 358369a94c1a56c09c81889cc3a8f3beed6e896f..84743fbaf8af2c53f4edb7a0bda52dbecb32fc9e 100644
--- a/ash/wm/resize_handle_window_targeter.cc
+++ b/ash/wm/resize_handle_window_targeter.cc
@@ -9,6 +9,7 @@
#include "ash/wm/immersive_fullscreen_controller.h"
#include "ash/wm/window_state_aura.h"
#include "ui/aura/window.h"
+#include "ui/aura/window_targeter.h"
#include "ui/events/event.h"
namespace ash {
@@ -70,8 +71,10 @@ aura::Window* ResizeHandleWindowTargeter::FindTargetForLocatedEvent(
if (!insets.IsEmpty()) {
gfx::Rect bounds = gfx::Rect(window_->bounds().size());
- bounds.Inset(insets);
- if (!bounds.Contains(event->location()))
+ gfx::Rect insetBounds(bounds);
+ insetBounds.Inset(insets);
+ if (!insetBounds.Contains(event->location()) &&
+ !HasIndependentChildWithEvent(window, event->location(), false))
return window_;
}
}

Powered by Google App Engine
This is Rietveld 408576698