Fix tab dragging in unity2d

chrome/browser/ui/aura/tabs/dock_info_aurax11.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 "chrome/browser/ui/tabs/dock_info.h"
 
 #include "ui/aura/root_window.h"
 #include "ui/aura/window.h"
 #include "ui/base/x/x11_util.h"
 #include "ui/views/widget/desktop_native_widget_helper_aura.h"
@@ skipping 61 matching lines @@
       // Window is topmost, stop iterating.
       is_top_most_ = true;
       return true;
     }
 
     if (!ui::IsWindowVisible(window)) {
       // The window isn't visible, keep iterating.
       return false;
     }
 
-    gfx::Rect rect;
-    if (ui::GetWindowRect(window, &rect) && rect.Contains(screen_loc_)) {
-      // At this point we haven't found our target window, so this window is
-      // higher in the z-order than the target window.  If this window contains
-      // the point, then we can stop the search now because this window is
-      // obscuring the target window at this point.
-      return true;
-    }
-
-    return false;
+    // At this point we haven't found our target window, so this window is
+    // higher in the z-order than the target window.  If this window contains
+    // the point, then we can stop the search now because this window is
+    // obscuring the target window at this point.
+    return ui::WindowContainsPoint(window, screen_loc_);
   }
 
  private:
   TopMostFinder(XID window,
                 const gfx::Point& screen_loc,
                 const std::set<aura::Window*>& ignore)
     : BaseWindowFinder(ignore),
       target_(window),
       screen_loc_(screen_loc),
       is_top_most_(false) {
@@ skipping 38 matching lines @@
     if (BaseWindowFinder::ShouldIgnoreWindow(window))
       return false;
 
     // Check if this window is in our process.
     if (!aura::RootWindow::GetForAcceleratedWidget(window))
       return false;
 
     if (!ui::IsWindowVisible(window))
       return false;
 
-    gfx::Rect rect;
-    if (ui::GetWindowRect(window, &rect) && rect.Contains(screen_loc_)) {
+    if (ui::WindowContainsPoint(window, screen_loc_)) {
       result_ = window;
       return true;
     }
 
     return false;
   }
 
  private:
   LocalProcessWindowFinder(const gfx::Point& screen_loc,
                            const std::set<aura::Window*>& ignore)
@@ skipping 49 matching lines @@
     return false;
   *bounds = window_->bounds();
   return true;
 }
 
 void DockInfo::SizeOtherWindowTo(const gfx::Rect& bounds) const {
   window_->SetBounds(bounds);
 }
 
 #endif