Clean up chrome/browser/ui/views/tabs/window_finder

Since Mash / WS is gone, the window finder class can be significantly
simplified. This CL does this simplification.

Also moves ash/wm/window_finder.h to ash/public/cpp; this file
would be helpful for others.

Bug: none
Test: trybot
Change-Id: I0dc745c3f5b5ae8d09afbea6930e6203dac29e73
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1645178Reviewed-by: Scott Violet <sky@chromium.org>
Commit-Queue: Jun Mukai <mukai@chromium.org>
Cr-Commit-Position: refs/heads/master@{#666607}

ash/BUILD.gn

@@ -55,6 +55,7 @@ component("ash") {
     "public/cpp/multi_user_window_manager.h",
     "public/cpp/multi_user_window_manager_delegate.h",
     "public/cpp/multi_user_window_manager_observer.h",
+    "public/cpp/window_finder.h",
     "public/cpp/window_tree_host_lookup.h",
     "root_window_controller.h",
     "screenshot_delegate.h",
@@ -83,7 +84,6 @@ component("ash") {
     "wm/tablet_mode/tablet_mode_observer.h",
     "wm/tablet_mode/tablet_mode_window_drag_controller.h",
     "wm/tablet_mode/tablet_mode_window_drag_delegate.h",
-    "wm/window_finder.h",
     "wm/window_positioner.h",
     "wm/window_positioning_utils.h",
     "wm/window_properties.h",

ash/wm/window_finder.h → ash/public/cpp/window_finder.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef ASH_WM_WINDOW_FINDER_H_
-#define ASH_WM_WINDOW_FINDER_H_
+#ifndef ASH_PUBLIC_CPP_WINDOW_FINDER_H_
+#define ASH_PUBLIC_CPP_WINDOW_FINDER_H_
 
 #include <set>
 
@@ -18,7 +18,6 @@ class Point;
 }
 
 namespace ash {
-namespace wm {
 
 // Finds the topmost window at |screen_point| with ignoring |ignore|. If
 // |real_topmost| is not nullptr, it will be updated to the topmost visible
@@ -31,7 +30,6 @@ ASH_EXPORT aura::Window* GetTopmostWindowAtPoint(
     const std::set<aura::Window*>& ignore,
     aura::Window** real_topmost);
 
-}  // namespace wm
 }  // namespace ash
 
-#endif  // ASH_WM_WINDOW_FINDER_H_
+#endif  // ASH_PUBLIC_CPP_WINDOW_FINDER_H_

ash/wm/window_finder.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ash/wm/window_finder.h"
+#include "ash/public/cpp/window_finder.h"
 
 #include "ash/public/cpp/shell_window_ids.h"
 #include "ash/shell.h"
@@ -113,14 +113,13 @@ aura::Window* GetToplevelWindowInOverviewAtPoint(
 }  // namespace
 
 namespace ash {
-namespace wm {
 
 aura::Window* GetTopmostWindowAtPoint(const gfx::Point& screen_point,
                                       const std::set<aura::Window*>& ignore,
                                       aura::Window** real_topmost) {
   if (real_topmost)
     *real_topmost = nullptr;
-  aura::Window* root = GetRootWindowAt(screen_point);
+  aura::Window* root = wm::GetRootWindowAt(screen_point);
   // GetTopmostWindowAtPointWithinWindow() always needs to be called to update
   // |real_topmost| correctly.
   aura::Window* topmost_window = GetTopmostWindowAtPointWithinWindow(
@@ -130,5 +129,4 @@ aura::Window* GetTopmostWindowAtPoint(const gfx::Point& screen_point,
   return overview_window ? overview_window : topmost_window;
 }
 
-}  // namespace wm
 }  // namespace ash

ash/wm/window_finder_unittest.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ash/wm/window_finder.h"
+#include "ash/public/cpp/window_finder.h"
 
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
@@ -15,7 +15,6 @@
 #include "ui/gfx/geometry/insets.h"
 
 namespace ash {
-namespace wm {
 
 using WindowFinderTest = AshTestBase;
 
@@ -106,5 +105,4 @@ TEST_F(WindowFinderTest, TopmostWindowWithOverviewActive) {
                                                    ignore, &real_topmost));
 }
 
-}  // namespace wm
 }  // namespace ash

chrome/browser/ui/BUILD.gn

@@ -3184,7 +3184,6 @@ jumbo_split_static_library("ui") {
         "views/sync/dice_signin_button_view.h",
         "views/sync/one_click_signin_dialog_view.cc",
         "views/sync/one_click_signin_dialog_view.h",
-        "views/tabs/window_finder.cc",
       ]
       deps += [ "//ui/views/window/vector_icons" ]
     }

chrome/browser/ui/views/tabs/DEPS

 specific_include_rules = {
-  # mash-ok
-  "window_finder_chromeos\.cc": [
-    "+ash/wm/window_finder.h",
-  ],
   # mash-ok
   "tab_drag_controller_interactive_uitest\.cc": [
     "+ash/shell.h",

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

@@ -485,8 +485,7 @@ void TabDragController::Init(TabDragContext* source_context,
   if (event_source == EVENT_SOURCE_TOUCH)
     SetCapture(source_context_);
 
-  window_finder_ = WindowFinder::Create(
-      event_source, source_context->AsView()->GetWidget()->GetNativeWindow());
+  window_finder_ = std::make_unique<WindowFinder>();
 }
 
 // static

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

-// Copyright 2016 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/views/tabs/window_finder.h"
-
-#include "base/memory/ptr_util.h"
-
-// static
-std::unique_ptr<WindowFinder> WindowFinder::Create(
-    TabDragController::EventSource source,
-    gfx::NativeWindow window) {
-  return base::WrapUnique(new WindowFinder());
-}

chrome/browser/ui/views/tabs/window_finder.h

@@ -5,10 +5,9 @@
 #ifndef CHROME_BROWSER_UI_VIEWS_TABS_WINDOW_FINDER_H_
 #define CHROME_BROWSER_UI_VIEWS_TABS_WINDOW_FINDER_H_
 
-#include <memory>
 #include <set>
 
-#include "chrome/browser/ui/views/tabs/tab_drag_controller.h"
+#include "base/macros.h"
 #include "ui/gfx/native_widget_types.h"
 
 namespace gfx {
@@ -18,13 +17,9 @@ class Point;
 // Class used by the tabstrip to find chrome windows that we can attach tabs to.
 class WindowFinder {
  public:
+  WindowFinder() = default;
   virtual ~WindowFinder() = default;
 
-  // Creates the default implementation of WindowFinder.
-  static std::unique_ptr<WindowFinder> Create(
-      TabDragController::EventSource source,
-      gfx::NativeWindow window);
-
   // Finds the topmost visible chrome window at |screen_point|. This should
   // return nullptr if |screen_point| is in another program's window which
   // occludes the topmost chrome window. Ignores the windows in |ignore|, which
@@ -33,9 +28,6 @@ class WindowFinder {
       const gfx::Point& screen_point,
       const std::set<gfx::NativeWindow>& ignore);
 
- protected:
-  WindowFinder() = default;
-
  private:
   DISALLOW_COPY_AND_ASSIGN(WindowFinder);
 };

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

@@ -4,38 +4,10 @@
 
 #include "chrome/browser/ui/views/tabs/window_finder.h"
 
-#include "ash/wm/window_finder.h"
-#include "ui/aura/window.h"
-
-namespace {
-
-// The class to be used by ash to find an eligible chrome window that we can
-// attach the dragged tabs into.
-class AshWindowFinder : public WindowFinder {
- public:
-  AshWindowFinder() = default;
-
-  gfx::NativeWindow GetLocalProcessWindowAtPoint(
-      const gfx::Point& screen_point,
-      const std::set<gfx::NativeWindow>& ignore) override {
-    return ash::wm::GetTopmostWindowAtPoint(screen_point, ignore, nullptr);
-  }
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(AshWindowFinder);
-};
-
-}  // namespace
-
-std::unique_ptr<WindowFinder> WindowFinder::Create(
-    TabDragController::EventSource source,
-    gfx::NativeWindow window) {
-  return std::make_unique<AshWindowFinder>();
-}
+#include "ash/public/cpp/window_finder.h"
 
 gfx::NativeWindow WindowFinder::GetLocalProcessWindowAtPoint(
     const gfx::Point& screen_point,
     const std::set<gfx::NativeWindow>& ignore) {
-  NOTREACHED();
-  return nullptr;
+  return ash::GetTopmostWindowAtPoint(screen_point, ignore, nullptr);
 }