Merge 173933

ui/aura/root_window_host_win.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/aura/root_window_host_win.h"
 
 #include <windows.h>
 
 #include <algorithm>
 
 #include "base/message_loop.h"
 #include "ui/aura/client/capture_client.h"
+#include "ui/aura/client/cursor_client.h"
 #include "ui/aura/root_window.h"
 #include "ui/base/cursor/cursor_loader_win.h"
 #include "ui/base/events/event.h"
 #include "ui/base/view_prop.h"
 #include "ui/gfx/display.h"
 #include "ui/gfx/screen.h"
 
 using std::max;
 using std::min;
 
@@ skipping 147 matching lines @@
 }
 
 void RootWindowHostWin::ReleaseCapture() {
   if (has_capture_) {
     has_capture_ = false;
     ::ReleaseCapture();
   }
 }
 
 bool RootWindowHostWin::QueryMouseLocation(gfx::Point* location_return) {
+  client::CursorClient* cursor_client =
+      client::GetCursorClient(GetRootWindow());
+  if (cursor_client && !cursor_client->IsMouseEventsEnabled()) {
+    *location_return = gfx::Point(0, 0);
+    return false;
+  }
+
   POINT pt;
   GetCursorPos(&pt);
   ScreenToClient(hwnd(), &pt);
   const gfx::Size size = GetBounds().size();
   *location_return =
       gfx::Point(max(0, min(size.width(), static_cast<int>(pt.x))),
                  max(0, min(size.height(), static_cast<int>(pt.y))));
   return (pt.x >= 0 && static_cast<int>(pt.x) < size.width() &&
           pt.y >= 0 && static_cast<int>(pt.y) < size.height());
 }
@@ skipping 113 matching lines @@
 namespace test {
 
 // static
 void SetUsePopupAsRootWindowForTest(bool use) {
   use_popup_as_root_window_for_test = use;
 }
 
 }  // namespace test
 
 }  // namespace aura