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

chrome/chrome_repack_locales.gni

 # 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/chrome_build.gni")
 import("//build/config/features.gni")
 import("//build/config/ui.gni")
 import("//tools/grit/repack.gni")
 
 # Wraps repack_locales(), setting the source_patterns and deps required for
@@ skipping 22 matching lines @@
       "//chrome/app:generated_resources",
       "//chrome/app/resources:locale_settings",
       "//chrome/app/resources:platform_locale_settings",
       "//components/strings:components_locale_settings",
       "//components/strings:components_strings",
     ]
     if (defined(invoker.deps)) {
       deps += invoker.deps
     }
 
-    if (use_ash) {
+    # TODO(tonikitoo): On Ozone builds, we are (ab)using some ash resources.
+    # There should be an variable that better represents this build configuratiton.

[fwang, 2016/10/12 14:33:15]

Ditto.

[tonikitoo, 2016/10/12 14:45:07]

Done.

+    if (use_ash || use_ozone) {
       source_patterns += [ "${root_gen_dir}/ash/common/strings/ash_strings_" ]
       deps += [ "//ash/common/strings" ]
     }
     if (is_chromeos) {
       source_patterns += [
         "${root_gen_dir}/remoting/resources/",
         "${root_gen_dir}/ui/chromeos/strings/ui_chromeos_strings_",
       ]
       deps += [
         "//remoting/resources",
@@ skipping 43 matching lines @@
         "//chrome/app:chromium_strings",
         "//components/strings:components_chromium_strings",
       ]
     }
 
     if (defined(invoker.additional_source_patterns)) {
       source_patterns += invoker.additional_source_patterns
     }
   }
 }