Introduces window_finder_android.cc

chrome/browser/ui/views/tabs/window_finder_ash.cc

Index: chrome/browser/ui/views/tabs/window_finder_ash.cc
diff --git a/chrome/browser/ui/views/tabs/window_finder_ash.cc b/chrome/browser/ui/views/tabs/window_finder_ash.cc
index 1628a82d49f01dfa0ae962ce5d8efced3b7fa7da..04e1209eeaa8cb2e3d9c0a373f6f6a2afb431eb8 100644
--- a/chrome/browser/ui/views/tabs/window_finder_ash.cc
+++ b/chrome/browser/ui/views/tabs/window_finder_ash.cc
@@ -6,55 +6,24 @@
 
 #include "ash/shell_window_ids.h"
 #include "ash/wm/coordinate_conversion.h"
-#include "ui/aura/client/screen_position_client.h"
 #include "ui/aura/window.h"
-#include "ui/aura/window_event_dispatcher.h"
-#include "ui/wm/core/window_util.h"
-
-namespace {
 
 gfx::NativeWindow GetLocalProcessWindowAtPointImpl(
     const gfx::Point& screen_point,
     const std::set<gfx::NativeWindow>& ignore,
-    gfx::NativeWindow window) {
-  if (ignore.find(window) != ignore.end())
-    return NULL;
-
-  if (!window->IsVisible())
-    return NULL;
-
-  if (window->id() == ash::kShellWindowId_PhantomWindow ||
-      window->id() == ash::kShellWindowId_OverlayContainer ||
-      window->id() == ash::kShellWindowId_MouseCursorContainer)
-    return NULL;
-
-  if (window->layer()->type() == ui::LAYER_TEXTURED) {
-    // Returns the window that has visible layer and can hit the
-    // |screen_point|, because we want to detach the tab as soon as
-    // the dragging mouse moved over to the window that can hide the
-    // moving tab.
-    aura::client::ScreenPositionClient* client =
-        aura::client::GetScreenPositionClient(window->GetRootWindow());
-    gfx::Point local_point = screen_point;
-    client->ConvertPointFromScreen(window, &local_point);
-    return window->GetEventHandlerForPoint(local_point) ? window : nullptr;
-  }
+    gfx::NativeWindow window);
 
+gfx::NativeWindow GetLocalProcessWindowAtPointAsh(
+    const gfx::Point& screen_point,
+    const std::set<gfx::NativeWindow>& ignore) {
+  gfx::NativeWindow window = ::ash::wm::GetRootWindowAt(screen_point);
   for (aura::Window::Windows::const_reverse_iterator i =

[mfomitchev, 2015/10/30 17:04:42]

It doesn't seem like this is the same functionality we had before. E.g.
previously we'd only go though children if window->layer()->type() wasn't
ui::LAYER_TEXTURED.

[bshe, 2015/10/30 19:56:23]

Good catch. I assumed it is OK to skip the layer type check as the windows with
these IDs are window
containers which should be contained in NOT_DRAW layers. But as some tests
failed, so it is apparently not the case.
I have changed the code so that we pass these IDs to the recursive function as
parameter. So we dont need
to duplicate the logic here.

            window->children().rbegin(); i != window->children().rend(); ++i) {
-    gfx::NativeWindow result =
-        GetLocalProcessWindowAtPointImpl(screen_point, ignore, *i);
-    if (result)
-      return result;
+    if ((*i)->id() == ash::kShellWindowId_PhantomWindow ||
+        (*i)->id() == ash::kShellWindowId_OverlayContainer ||
+        (*i)->id() == ash::kShellWindowId_MouseCursorContainer)
+      return nullptr;
   }
-  return NULL;
-}
-
-}  // namespace
 
-gfx::NativeWindow GetLocalProcessWindowAtPointAsh(
-    const gfx::Point& screen_point,
-    const std::set<gfx::NativeWindow>& ignore) {
-  return GetLocalProcessWindowAtPointImpl(
-      screen_point, ignore, ::ash::wm::GetRootWindowAt(screen_point));
+  return GetLocalProcessWindowAtPointImpl(screen_point, ignore, window);
 }