[Mac] Localize app shims with the OS preferred language.

chrome/browser/web_applications/web_app_mac.mm

 // Copyright (c) 2012 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 "chrome/browser/web_applications/web_app_mac.h"
 
 #import <Carbon/Carbon.h>
 #import <Cocoa/Cocoa.h>
 
 #include "base/command_line.h"
@@ skipping 682 matching lines @@
     return 0;
 
   for (std::vector<base::FilePath>::const_iterator it = folders.begin();
        it != folders.end(); ++it) {
     const base::FilePath& dst_path = *it;
     if (!base::CreateDirectory(dst_path)) {
       LOG(ERROR) << "Creating directory " << dst_path.value() << " failed.";
       return succeeded;
     }
 
     if (!base::CopyDirectory(staging_path, dst_path, true)) {

[tapted, 2015/05/15 02:02:49]

What about before this, something like

  // Ensure the copy does not merge with stale info.
  base::DeleteFile(dst_path.Append(app_name));

[jackhou1, 2015/05/15 02:44:56]

Done.

       LOG(ERROR) << "Copying app to dst path: " << dst_path.value()
                  << " failed";
       return succeeded;
     }
 
     // Remove the quarantine attribute from both the bundle and the executable.
     base::mac::RemoveQuarantineAttribute(dst_path.Append(app_name));
     base::mac::RemoveQuarantineAttribute(
         dst_path.Append(app_name)
             .Append("Contents").Append("MacOS").Append("app_mode_loader"));
@@ skipping 22 matching lines @@
 
   // The app list shim is not tied to a particular profile, so omit the copy
   // placed under the profile path. For shims, this copy is used when the
   // version under Applications is removed, and not needed for app list because
   // setting LSUIElement means there is no Dock "running" status to show.
   const bool is_app_list = info_->extension_id == app_mode::kAppListModeId;
   if (is_app_list) {
     path_to_add_to_dock = base::SysUTF8ToNSString(
         applications_dir.Append(GetShortcutBasename()).AsUTF8Unsafe());
   } else {
+    base::DeleteFile(GetInternalShortcutPath(), true);
     paths.push_back(app_data_dir_);
   }
 
   bool shortcut_visible =
       creation_locations.applications_menu_location != APP_MENU_LOCATION_HIDDEN;
-  if (shortcut_visible)
+  if (shortcut_visible) {
+    base::DeleteFile(GetApplicationsShortcutPath(), true);
     paths.push_back(applications_dir);
+  }
 
   DCHECK(!paths.empty());
   size_t success_count = CreateShortcutsIn(paths);
   if (success_count == 0)
     return false;
 
   if (!is_app_list)
     UpdateInternalBundleIdentifier();
 
   if (success_count != paths.size())
@@ skipping 127 matching lines @@
           switches::kEnableAppsFileAssociations)) {
     UpdateFileTypes(plist, file_handlers_info_);
   }
 
   return [plist writeToFile:plist_path
                  atomically:YES];
 }
 
 bool WebAppShortcutCreator::UpdateDisplayName(
     const base::FilePath& app_path) const {
-  // OSX searches for the best language in the order of preferred languages.
-  // Since we only have one localization directory, it will choose this one.
-  base::FilePath localized_dir = GetResourcesPath(app_path).Append("en.lproj");
+  // Localization is used to display the app name (rather than the bundle
+  // filename). OSX searches for the best language in the order of preferred
+  // languages, but one of them must be found otherwise it will default to
+  // the filename.
+  NSString* language = [[NSLocale preferredLanguages] objectAtIndex:0];
+  base::FilePath localized_dir = GetResourcesPath(app_path).Append(
+      base::SysNSStringToUTF8(language) + ".lproj");
   if (!base::CreateDirectory(localized_dir))
     return false;
 
   NSString* bundle_name = base::SysUTF16ToNSString(info_->title);
   NSString* display_name = base::SysUTF16ToNSString(info_->title);
   if (HasExistingExtensionShim(GetApplicationsDirname(), info_->extension_id,
                                app_path.BaseName())) {
     display_name = [bundle_name
         stringByAppendingString:base::SysUTF8ToNSString(
             " (" + info_->profile_name + ")")];
@@ skipping 295 matching lines @@
   web_app::GetShortcutInfoForApp(
       app,
       profile,
       base::Bind(&web_app::CreateAppShortcutInfoLoaded,
                  profile,
                  app,
                  close_callback));
 }
 
 }  // namespace chrome