Bundle some ash resources into chrome for mash=1 use_ash=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("//chrome/common/features.gni")
 import("//tools/grit/repack.gni")
 
 # Wraps repack_locales(), setting the source_patterns and deps required for
 # Chrome.
 #
 # Extra Parameters:
 #
 #   additional_source_patterns [optional]
 #      Extra source_patterns for repack_locales().
 template("chrome_repack_locales") {
@@ skipping 15 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) {
+    # Chrome --mash in non-chromeos builds need to access some ash resources
+    # in order to avoid some missing localized strings in Ash's window manager session.
+    # TODO(tonikitoo): Remove this when a chrome/mus is available.
+    if (use_ash || enable_package_mash_services) {
       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 42 matching lines @@
         "//chrome/app:chromium_strings",
         "//components/strings:components_chromium_strings",
       ]
     }
 
     if (defined(invoker.additional_source_patterns)) {
       source_patterns += invoker.additional_source_patterns
     }
   }
 }