Refactor WindowFinder definition

chrome/browser/ui/BUILD.gn

 # Copyright 2014 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.
 
 import("//build/config/chromecast_build.gni")
 import("//build/config/crypto.gni")
 import("//build/config/features.gni")
 import("//build/config/ui.gni")
 import("//build/split_static_library.gni")
 import("//chrome/common/features.gni")
@@ skipping 1785 matching lines @@
         "views/tabs/tab.cc",
         "views/tabs/tab.h",
         "views/tabs/tab_controller.h",
         "views/tabs/tab_drag_controller.cc",
         "views/tabs/tab_drag_controller.h",
         "views/tabs/tab_strip.cc",
         "views/tabs/tab_strip.h",
         "views/tabs/tab_strip_controller.h",
         "views/tabs/tab_strip_layout.cc",
         "views/tabs/tab_strip_layout.h",
-        "views/tabs/window_finder.cc",
-        "views/tabs/window_finder.h",
-        "views/tabs/window_finder_chromeos.cc",
-        "views/tabs/window_finder_win.cc",
         "views/theme_copying_widget.cc",
         "views/theme_copying_widget.h",
         "views/toolbar/app_menu.cc",
         "views/toolbar/app_menu.h",
         "views/toolbar/app_menu_button.cc",
         "views/toolbar/app_menu_button.h",
         "views/toolbar/app_menu_observer.h",
         "views/toolbar/back_button.cc",
         "views/toolbar/back_button.h",
         "views/toolbar/browser_actions_container.cc",
@@ skipping 25 matching lines @@
         "views/website_settings/chooser_bubble_ui_view.cc",
         "views/website_settings/chooser_bubble_ui_view.h",
         "views/website_settings/permission_prompt_impl_views.cc",
       ]
       if (use_aura) {
         deps += [
           "//services/ui/public/cpp",
           "//services/ui/public/interfaces",
         ]
       }
-
-      # TODO(ellyjones): Mus is not supported on Mac (there is no ui::Window
-      # apart from aura::Window, which is also not supported).
-      if (!is_mac) {
-        sources += [
-          "views/tabs/window_finder_mus.cc",
-          "views/tabs/window_finder_mus.h",
-        ]
-
-        deps += [ "//ui/views/mus" ]
-      }
     }
     if (use_ash) {
       sources += [
         "views/frame/browser_frame_ash.cc",
         "views/frame/browser_frame_ash.h",
         "views/frame/browser_header_painter_ash.cc",
         "views/frame/browser_header_painter_ash.h",
         "views/frame/browser_non_client_frame_view_ash.cc",
         "views/frame/browser_non_client_frame_view_ash.h",
         "views/frame/immersive_context_mus.cc",
         "views/frame/immersive_context_mus.h",
         "views/frame/immersive_handler_factory_mus.cc",
         "views/frame/immersive_handler_factory_mus.h",
         "views/frame/immersive_mode_controller_ash.cc",
         "views/frame/immersive_mode_controller_ash.h",
         "views/frame/web_app_left_header_view_ash.cc",
         "views/frame/web_app_left_header_view_ash.h",
-        "views/tabs/window_finder_ash.cc",
       ]
     }
   }
   if (use_gio) {
     deps += [ "//build/linux/libgio" ]
   }
   if (use_aura && !use_ozone && is_desktop_linux) {
     # These are the only components that can interact with gtk.
     if (use_gtk3) {
       deps += [ "//chrome/browser/ui/libgtkui:libgtk3ui" ]
@@ skipping 450 matching lines @@
         "views/apps/chrome_app_window_client_views_mac.mm",
         "views/certificate_viewer_mac_views.mm",
         "views/dropdown_bar_host_mac.mm",
         "views/frame/browser_frame_mac.h",
         "views/frame/browser_frame_mac.mm",
         "views/frame/browser_non_client_frame_view_factory_mac.mm",
         "views/frame/browser_non_client_frame_view_mac.h",
         "views/frame/browser_non_client_frame_view_mac.mm",
         "views/frame/native_browser_frame_factory_mac.mm",
         "views/infobars/legacy_infobars_mac.cc",
-        "views/tabs/window_finder_mac.mm",
       ]
       deps += [ "//extensions/components/native_app_window" ]
     } else {
       sources += [
         "cocoa/animatable_image.h",
         "cocoa/animatable_image.mm",
         "cocoa/animatable_view.h",
         "cocoa/animatable_view.mm",
         "cocoa/app_menu/app_menu_button_cell.h",
         "cocoa/app_menu/app_menu_button_cell.mm",
@@ skipping 673 matching lines @@
     if (use_aura) {
       deps += [ "//build/linux:fontconfig" ]
       if (use_dbus) {
         deps += [ "//dbus" ]
       }
     }
     if (use_x11) {
       sources += [
         "views/javascript_app_modal_event_blocker_x11.cc",
         "views/javascript_app_modal_event_blocker_x11.h",
-        "views/tabs/window_finder_x11.cc",
       ]
       configs += [ "//build/config/linux:x11" ]
       deps += [
         "//ui/events/devices",
         "//ui/events/devices/x11",
       ]
-      if (is_chromeos) {
-        sources -= [ "views/tabs/window_finder_x11.cc" ]
-      }
     }
   }
 
+  # Group window_finder* pick up logic as following:
+  # - Mus is not support on Mac, so skip window_finder_mus.cc.

[fwang, 2016/10/31 11:46:06]

*supported*

[tonikitoo, 2016/10/31 14:20:29]

Done locally. will reupload with further review remarks, if any.

+  # - Other platforms (except Android) build window_finder.h/cc as well
+  #   as a platform specific associated file, window_finder_{win,chromeos,etc}.
+  if (toolkit_views) {
+    if (!is_mac) {
+      sources += [
+        "views/tabs/window_finder.cc",
+        "views/tabs/window_finder.h",
+
+        # TODO(ellyjones): Mus is not supported on Mac (there is no ui::Window
+        # apart from aura::Window, which is also not supported).
+        "views/tabs/window_finder_mus.cc",
+        "views/tabs/window_finder_mus.h",
+      ]
+      deps += [ "//ui/views/mus" ]
+    }
+    if (is_chromeos) {
+      sources += [ "views/tabs/window_finder_chromeos.cc" ]
+    }
+    if (is_win) {
+      sources += [ "views/tabs/window_finder_win.cc" ]
+    }
+    if (is_desktop_linux && use_x11) {
+      sources += [ "views/tabs/window_finder_x11.cc" ]
+    }
+    if (use_ash) {
+      sources += [ "views/tabs/window_finder_ash.cc" ]
+    }
+  }
+  if (is_mac && mac_views_browser) {
+    sources += [
+      "views/tabs/window_finder.h",
+      "views/tabs/window_finder_mac.mm",
+    ]
+  }
+
   if (use_udev) {
     deps += [ "//device/udev_linux" ]
   }
 
   if (enable_app_list) {
     sources += [
       "app_list/app_context_menu.cc",
       "app_list/app_context_menu.h",
       "app_list/app_context_menu_delegate.h",
       "app_list/app_list_controller_delegate.cc",
@@ skipping 348 matching lines @@
       "test/test_confirm_bubble_model.cc",
       "test/test_confirm_bubble_model.h",
     ]
     deps += [ "//chrome/test:test_support_ui" ]
   }
 
   if (enable_extensions) {
     deps += [ "//extensions/browser" ]
   }
 }