Make it possible to launch chrome --mash with ozone_platform={wayland|x11}, chromeos=0

chrome/browser/ui/BUILD.gn

Index: chrome/browser/ui/BUILD.gn
diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn
index 02339684fb32fa451f581096863aec7c7ce9bca3..8afcfafb9cbd83bbca8a8a21bb9357c0fe2160f4 100644
--- a/chrome/browser/ui/BUILD.gn
+++ b/chrome/browser/ui/BUILD.gn
@@ -3034,7 +3034,6 @@ split_static_library("ui") {
       "views/frame/browser_desktop_window_tree_host.h",
       "views/frame/desktop_browser_frame_auralinux.cc",
       "views/frame/desktop_browser_frame_auralinux.h",
-      "views/frame/native_browser_frame_factory_auralinux.cc",
       "views/status_icons/status_icon_linux_wrapper.cc",
       "views/status_icons/status_icon_linux_wrapper.h",
       "webui/help/version_updater_basic.cc",
@@ -3053,10 +3052,14 @@ split_static_library("ui") {
         "views/frame/global_menu_bar_registrar_x11.h",
         "views/frame/global_menu_bar_x11.cc",
         "views/frame/global_menu_bar_x11.h",
+        "views/frame/native_browser_frame_factory_auralinux.cc",

[sky, 2016/11/07 21:48:10]

For clarity this should be renamed to x11, but that can happen later.

         "views/javascript_app_modal_dialog_views_x11.cc",
         "views/javascript_app_modal_dialog_views_x11.h",
       ]
     }
+    if (use_ozone) {
+      sources += [ "views/frame/native_browser_frame_factory_ozone.cc" ]
+    }
   }
   if (is_linux) {  # Both desktop Linux and ChromeOS.
     sources += [
@@ -3077,17 +3080,19 @@ split_static_library("ui") {
       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" ]
+      if (is_desktop_linux) {
+        sources += [ "views/tabs/window_finder_x11.cc" ]
       }
     }
+    if (use_ozone) {
+      sources += [ "views/tabs/window_finder_ozone.cc" ]
+    }
   }
 
   if (use_udev) {