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 7bd09571b9d20c1ca7bd00a92a100f12514355ff..f476f3574d554debeb8213168a47d4fa44bc1407 100644
--- a/chrome/browser/ui/BUILD.gn
+++ b/chrome/browser/ui/BUILD.gn
@@ -1520,8 +1520,6 @@ split_static_library("ui") {
       sources += [
         "external_protocol_dialog_delegate.cc",
         "external_protocol_dialog_delegate.h",
-        "views/chrome_browser_main_extra_parts_views_linux.cc",
-        "views/chrome_browser_main_extra_parts_views_linux.h",
         "views/external_protocol_dialog.cc",
         "views/external_protocol_dialog.h",
         "views/frame/opaque_browser_frame_view.cc",
@@ -1541,6 +1539,14 @@ split_static_library("ui") {
         "views/sync/profile_signin_confirmation_dialog_views.cc",
         "views/sync/profile_signin_confirmation_dialog_views.h",
       ]
+
+      # These files rely on Gtk+ calls, which is not available on Ozone builds.

[fwang, 2016/10/11 09:34:12]

GTK+ calls, which are not...

[tonikitoo, 2016/10/11 12:59:03]

Done.

+      if (!use_ozone) {
+        sources += [
+          "views/chrome_browser_main_extra_parts_views_linux.cc",
+          "views/chrome_browser_main_extra_parts_views_linux.h",
+        ]
+      }
     }
     if (enable_extensions && (!is_mac || mac_views_browser)) {
       sources += [
@@ -2997,15 +3003,21 @@ split_static_library("ui") {
       "views/apps/chrome_app_window_client_views_linux.cc",
       "views/first_run_dialog.cc",
       "views/first_run_dialog.h",
-      "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",
       "webui/help/version_updater_basic.h",
     ]
+
+    if (!use_ozone) {
+      sources += [
+        "views/frame/browser_desktop_window_tree_host.h",
+        "views/frame/desktop_browser_frame_auralinux.cc",
+        "views/frame/desktop_browser_frame_auralinux.h",
+      ]
+    }
+
     deps += [
       "//ui/base/ime",
       "//ui/events:dom_keycode_converter",
@@ -3054,6 +3066,10 @@ split_static_library("ui") {
         sources -= [ "views/tabs/window_finder_x11.cc" ]
       }
     }
+
+    if (use_ozone) {
+      sources += [ "views/tabs/window_finder_ozone.cc" ]
+    }
   }
 
   if (use_udev) {