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

Unified Diff: chrome/browser/ui/views/apps/native_app_window_views.cc

Issue 48113014: Adjust app windows to play nice with NVHA fast resize CL (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixing failure on linux_aura Created 7 years, 2 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/apps/native_app_window_views.cc
diff --git a/chrome/browser/ui/views/apps/native_app_window_views.cc b/chrome/browser/ui/views/apps/native_app_window_views.cc
index d5d39fd972f89ea464974c3224b1967934312c08..42a543b0a8b66321e456cfe772163b26465d8f38 100644
--- a/chrome/browser/ui/views/apps/native_app_window_views.cc
+++ b/chrome/browser/ui/views/apps/native_app_window_views.cc
@@ -52,6 +52,10 @@
#include "ui/aura/window.h"
#endif
+#if defined(USE_AURA)
+#include "ui/aura/window.h"
+#endif
+
using apps::ShellWindow;
namespace {
@@ -651,7 +655,7 @@ bool NativeAppWindowViews::ShouldDescendIntoChildForEventHandling(
gfx::NativeView child,
const gfx::Point& location) {
#if defined(USE_AURA)
- if (child == web_view_->web_contents()->GetView()->GetNativeView()) {
+ if (child->Contains(web_view_->web_contents()->GetView()->GetNativeView())) {
// Shell window should claim mouse events that fall within the draggable
// region.
return !draggable_region_.get() ||
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698