Fix GetAppShortcutName to return a localized name for Chrome

chrome/installer/util/google_chrome_distribution.cc

 // 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.
 //
 // This file defines specific implementation of BrowserDistribution class for
 // Google Chrome.
 
 #include "chrome/installer/util/google_chrome_distribution.h"
 
 #include <windows.h>
@@ skipping 53 matching lines @@
 const wchar_t kToastExpUninstallGroup[] =    L"04";
 const wchar_t kToastExpTriesOkGroup[] =      L"18";
 const wchar_t kToastExpTriesErrorGroup[] =   L"28";
 const wchar_t kToastActiveGroup[] =          L"40";
 const wchar_t kToastUDDirFailure[] =         L"40";
 const wchar_t kToastExpBaseGroup[] =         L"80";
 
 // Substitute the locale parameter in uninstall URL with whatever
 // Google Update tells us is the locale. In case we fail to find
 // the locale, we use US English.
-std::wstring LocalizeUrl(const wchar_t* url) {
-  std::wstring language;
+string16 LocalizeUrl(const wchar_t* url) {
+  string16 language;
   if (!GoogleUpdateSettings::GetLanguage(&language))
     language = L"en-US";  // Default to US English.
   return ReplaceStringPlaceholders(url, language.c_str(), NULL);
 }
 
-std::wstring GetUninstallSurveyUrl() {
+string16 GetUninstallSurveyUrl() {
   const wchar_t kSurveyUrl[] = L"http://www.google.com/support/chrome/bin/"
                                L"request.py?hl=$1&contact_type=uninstall";
   return LocalizeUrl(kSurveyUrl);
 }
 
-std::wstring GetWelcomeBackUrl() {
+string16 GetWelcomeBackUrl() {
   const wchar_t kWelcomeUrl[] = L"http://www.google.com/chrome/intl/$1/"
                                 L"welcomeback-new.html";
   return LocalizeUrl(kWelcomeUrl);
 }
 
 // Converts FILETIME to hours. FILETIME times are absolute times in
 // 100 nanosecond units. For example 5:30 pm of June 15, 2009 is 3580464.
 int FileTimeToHours(const FILETIME& time) {
   const ULONGLONG k100sNanoSecsToHours = 10000000LL * 60 * 60;
   ULARGE_INTEGER uli = {time.dwLowDateTime, time.dwHighDateTime};
@@ skipping 91 matching lines @@
   DWORD len = sizeof(buff);
   PSECURITY_DESCRIPTOR sd = reinterpret_cast<PSECURITY_DESCRIPTOR>(buff);
   if (!::GetFileSecurityW(exe.value().c_str(), DACL_SECURITY_INFORMATION,
                           sd, len, &len)) {
     return false;
   }
   wchar_t* sddl = 0;
   if (!::ConvertSecurityDescriptorToStringSecurityDescriptorW(sd,
       SDDL_REVISION_1, DACL_SECURITY_INFORMATION, &sddl, NULL))
     return false;
-  std::wstring new_sddl(sddl);
+  string16 new_sddl(sddl);
   ::LocalFree(sddl);
   sd = NULL;
   // See MSDN for the  security descriptor definition language (SDDL) syntax,
   // in our case we add "A;" generic read 'GR' and generic execute 'GX' for
   // the nt\authenticated_users 'AU' group, that becomes:
   const wchar_t kAllowACE[] = L"(A;;GRGX;;;AU)";
   // We should check that there are no special ACES for the group we
   // are interested, which is nt\authenticated_users.
-  if (std::wstring::npos != new_sddl.find(L";AU)"))
+  if (string16::npos != new_sddl.find(L";AU)"))
     return false;
   // Specific ACEs (not inherited) need to go to the front. It is ok if we
   // are the very first one.
   size_t pos_insert = new_sddl.find(L"(");
-  if (std::wstring::npos == pos_insert)
+  if (string16::npos == pos_insert)
     return false;
   // All good, time to change the dacl.
   new_sddl.insert(pos_insert, kAllowACE);
   if (!::ConvertStringSecurityDescriptorToSecurityDescriptorW(new_sddl.c_str(),
       SDDL_REVISION_1, &sd, NULL))
     return false;
   bool rv = ::SetFileSecurityW(exe.value().c_str(), DACL_SECURITY_INFORMATION,
                                sd) == TRUE;
   ::LocalFree(sd);
   return rv;
@@ skipping 66 matching lines @@
 
 GoogleChromeDistribution::GoogleChromeDistribution()
     : BrowserDistribution(CHROME_BROWSER),
       product_guid_(kChromeGuid) {
 }
 
 // The functions below are not used by the 64-bit Windows binary -
 // see the comment in google_chrome_distribution_dummy.cc
 #ifndef _WIN64
 bool GoogleChromeDistribution::BuildUninstallMetricsString(
-    DictionaryValue* uninstall_metrics_dict, std::wstring* metrics) {
+    DictionaryValue* uninstall_metrics_dict, string16* metrics) {
   DCHECK(NULL != metrics);
   bool has_values = false;
 
   for (DictionaryValue::key_iterator iter(uninstall_metrics_dict->begin_keys());
        iter != uninstall_metrics_dict->end_keys(); ++iter) {
     has_values = true;
     metrics->append(L"&");
     metrics->append(UTF8ToWide(*iter));
     metrics->append(L"=");
 
     std::string value;
     uninstall_metrics_dict->GetStringWithoutPathExpansion(*iter, &value);
     metrics->append(UTF8ToWide(value));
   }
 
   return has_values;
 }
 
 bool GoogleChromeDistribution::ExtractUninstallMetricsFromFile(
     const FilePath& file_path,
-    std::wstring* uninstall_metrics_string) {
+    string16* uninstall_metrics_string) {
   JSONFileValueSerializer json_serializer(file_path);
 
   std::string json_error_string;
   scoped_ptr<Value> root(json_serializer.Deserialize(NULL, NULL));
   if (!root.get())
     return false;
 
   // Preferences should always have a dictionary root.
   if (!root->IsType(Value::TYPE_DICTIONARY))
     return false;
 
   return ExtractUninstallMetrics(*static_cast<DictionaryValue*>(root.get()),
                                  uninstall_metrics_string);
 }
 
 bool GoogleChromeDistribution::ExtractUninstallMetrics(
-    const DictionaryValue& root, std::wstring* uninstall_metrics_string) {
+    const DictionaryValue& root, string16* uninstall_metrics_string) {

[grt (UTC plus 2), 2012/04/27 18:23:07]

please move the second arg to its own line

[gab, 2012/04/27 20:58:45]

Done.

   // Make sure that the user wants us reporting metrics. If not, don't
   // add our uninstall metrics.
   bool metrics_reporting_enabled = false;
   if (!root.GetBoolean(prefs::kMetricsReportingEnabled,
                        &metrics_reporting_enabled) ||
       !metrics_reporting_enabled) {
     return false;
   }
 
   DictionaryValue* uninstall_metrics_dict;
   if (!root.HasKey(installer::kUninstallMetricsName) ||
       !root.GetDictionary(installer::kUninstallMetricsName,
                           &uninstall_metrics_dict)) {
     return false;
   }
 
   if (!BuildUninstallMetricsString(uninstall_metrics_dict,
                                    uninstall_metrics_string)) {
     return false;
   }
 
   return true;
 }
 #endif
 
 void GoogleChromeDistribution::DoPostUninstallOperations(
     const Version& version,
     const FilePath& local_data_path,
-    const std::wstring& distribution_data) {
+    const string16& distribution_data) {
   // Send the Chrome version and OS version as params to the form.
   // It would be nice to send the locale, too, but I don't see an
   // easy way to get that in the existing code. It's something we
   // can add later, if needed.
   // We depend on installed_version.GetString() not having spaces or other
   // characters that need escaping: 0.2.13.4. Should that change, we will
   // need to escape the string before using it in a URL.
-  const std::wstring kVersionParam = L"crversion";
-  const std::wstring kOSParam = L"os";
+  const string16 kVersionParam = L"crversion";
+  const string16 kOSParam = L"os";
   base::win::OSInfo::VersionNumber version_number =
       base::win::OSInfo::GetInstance()->version_number();
-  std::wstring os_version = base::StringPrintf(L"%d.%d.%d",
+  string16 os_version = base::StringPrintf(L"%d.%d.%d",
       version_number.major, version_number.minor, version_number.build);
 
   FilePath iexplore;
   if (!PathService::Get(base::DIR_PROGRAM_FILES, &iexplore))
     return;
 
   iexplore = iexplore.AppendASCII("Internet Explorer");
   iexplore = iexplore.AppendASCII("iexplore.exe");
 
-  std::wstring command = iexplore.value() + L" " + GetUninstallSurveyUrl() +
+  string16 command = iexplore.value() + L" " + GetUninstallSurveyUrl() +
       L"&" + kVersionParam + L"=" + UTF8ToWide(version.GetString()) + L"&" +
       kOSParam + L"=" + os_version;
 
-  std::wstring uninstall_metrics;
+  string16 uninstall_metrics;
   if (ExtractUninstallMetricsFromFile(local_data_path, &uninstall_metrics)) {
     // The user has opted into anonymous usage data collection, so append
     // metrics and distribution data.
     command += uninstall_metrics;
     if (!distribution_data.empty()) {
       command += L"&";
       command += distribution_data;
     }
   }
 
   int pid = 0;
   // The reason we use WMI to launch the process is because the uninstall
   // process runs inside a Job object controlled by the shell. As long as there
   // are processes running, the shell will not close the uninstall applet. WMI
   // allows us to escape from the Job object so the applet will close.
   installer::WMIProcess::Launch(command, &pid);
 }
 
-std::wstring GoogleChromeDistribution::GetAppGuid() {
+string16 GoogleChromeDistribution::GetAppGuid() {
   return product_guid();
 }
 
-std::wstring GoogleChromeDistribution::GetApplicationName() {
+string16 GoogleChromeDistribution::GetApplicationName() {
   // I'd really like to return L ## PRODUCT_FULLNAME_STRING; but that's no good
   // since it'd be "Chromium" in a non-Chrome build, which isn't at all what I
   // want.  Sigh.
   return L"Google Chrome";
 }
 
-std::wstring GoogleChromeDistribution::GetAlternateApplicationName() {
-  const std::wstring& alt_product_name =
+string16 GoogleChromeDistribution::GetAppShortCutName() {
+  const string16& app_shortcut_name =
+      installer::GetLocalizedString(IDS_PRODUCT_NAME_BASE);
+  return app_shortcut_name;
+}
+
+string16 GoogleChromeDistribution::GetAlternateApplicationName() {
+  const string16& alt_product_name =
       installer::GetLocalizedString(IDS_OEM_MAIN_SHORTCUT_NAME_BASE);
   return alt_product_name;
 }
 
-std::wstring GoogleChromeDistribution::GetBrowserAppId() {
+string16 GoogleChromeDistribution::GetBrowserAppId() {
   return kBrowserAppId;
 }
 
-std::wstring GoogleChromeDistribution::GetInstallSubDir() {
-  std::wstring sub_dir(installer::kGoogleChromeInstallSubDir1);
+string16 GoogleChromeDistribution::GetInstallSubDir() {
+  string16 sub_dir(installer::kGoogleChromeInstallSubDir1);
   sub_dir.append(L"\\");
   sub_dir.append(installer::kGoogleChromeInstallSubDir2);
   return sub_dir;
 }
 
-std::wstring GoogleChromeDistribution::GetPublisherName() {
-  const std::wstring& publisher_name =
+string16 GoogleChromeDistribution::GetPublisherName() {
+  const string16& publisher_name =
       installer::GetLocalizedString(IDS_ABOUT_VERSION_COMPANY_NAME_BASE);
   return publisher_name;
 }
 
-std::wstring GoogleChromeDistribution::GetAppDescription() {
-  const std::wstring& app_description =
+string16 GoogleChromeDistribution::GetAppDescription() {
+  const string16& app_description =
       installer::GetLocalizedString(IDS_SHORTCUT_TOOLTIP_BASE);
   return app_description;
 }
 
 std::string GoogleChromeDistribution::GetSafeBrowsingName() {
   return "googlechrome";
 }
 
-std::wstring GoogleChromeDistribution::GetStateKey() {
-  std::wstring key(google_update::kRegPathClientState);
+string16 GoogleChromeDistribution::GetStateKey() {
+  string16 key(google_update::kRegPathClientState);
   key.append(L"\\");
   key.append(product_guid());
   return key;
 }
 
-std::wstring GoogleChromeDistribution::GetStateMediumKey() {
-  std::wstring key(google_update::kRegPathClientStateMedium);
+string16 GoogleChromeDistribution::GetStateMediumKey() {
+  string16 key(google_update::kRegPathClientStateMedium);
   key.append(L"\\");
   key.append(product_guid());
   return key;
 }
 
-std::wstring GoogleChromeDistribution::GetStatsServerURL() {
+string16 GoogleChromeDistribution::GetStatsServerURL() {
   return L"https://clients4.google.com/firefox/metrics/collect";
 }
 
 std::string GoogleChromeDistribution::GetNetworkStatsServer() const {
   return chrome_common_net::kEchoTestServerLocation;
 }
 
 std::string GoogleChromeDistribution::GetHttpPipeliningTestServer() const {
   return chrome_common_net::kPipelineTestServerBaseUrl;
 }
 
-std::wstring GoogleChromeDistribution::GetDistributionData(HKEY root_key) {
-  std::wstring sub_key(google_update::kRegPathClientState);
+string16 GoogleChromeDistribution::GetDistributionData(HKEY root_key) {
+  string16 sub_key(google_update::kRegPathClientState);
   sub_key.append(L"\\");
   sub_key.append(product_guid());
 
   base::win::RegKey client_state_key(root_key, sub_key.c_str(), KEY_READ);
-  std::wstring result;
-  std::wstring brand_value;
+  string16 result;
+  string16 brand_value;
   if (client_state_key.ReadValue(google_update::kRegRLZBrandField,
                                  &brand_value) == ERROR_SUCCESS) {
     result = google_update::kRegRLZBrandField;
     result.append(L"=");
     result.append(brand_value);
     result.append(L"&");
   }
 
-  std::wstring client_value;
+  string16 client_value;
   if (client_state_key.ReadValue(google_update::kRegClientField,
                                  &client_value) == ERROR_SUCCESS) {
     result.append(google_update::kRegClientField);
     result.append(L"=");
     result.append(client_value);
     result.append(L"&");
   }
 
-  std::wstring ap_value;
+  string16 ap_value;
   // If we fail to read the ap key, send up "&ap=" anyway to indicate
   // that this was probably a stable channel release.
   client_state_key.ReadValue(google_update::kRegApField, &ap_value);
   result.append(google_update::kRegApField);
   result.append(L"=");
   result.append(ap_value);
 
   return result;
 }
 
-std::wstring GoogleChromeDistribution::GetUninstallLinkName() {
-  const std::wstring& link_name =
+string16 GoogleChromeDistribution::GetUninstallLinkName() {
+  const string16& link_name =
       installer::GetLocalizedString(IDS_UNINSTALL_CHROME_BASE);
   return link_name;
 }
 
-std::wstring GoogleChromeDistribution::GetUninstallRegPath() {
+string16 GoogleChromeDistribution::GetUninstallRegPath() {
   return L"Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\"
          L"Google Chrome";
 }
 
-std::wstring GoogleChromeDistribution::GetVersionKey() {
-  std::wstring key(google_update::kRegPathClients);
+string16 GoogleChromeDistribution::GetVersionKey() {
+  string16 key(google_update::kRegPathClients);
   key.append(L"\\");
   key.append(product_guid());
   return key;
 }
 
 bool GoogleChromeDistribution::GetDelegateExecuteHandlerData(
     string16* handler_class_uuid,
     string16* type_lib_uuid,
     string16* type_lib_version,
     string16* interface_uuid) {
@@ skipping 28 matching lines @@
       product_guid());
 }
 
 // The functions below are not used by the 64-bit Windows binary -
 // see the comment in google_chrome_distribution_dummy.cc
 #ifndef _WIN64
 // A helper function that writes to HKLM if the handle was passed through the
 // command line, but HKCU otherwise. |experiment_group| is the value to write
 // and |last_write| is used when writing to HKLM to determine whether to close
 // the handle when done.
-void SetClient(const std::wstring& experiment_group, bool last_write) {
+void SetClient(const string16& experiment_group, bool last_write) {
   static int reg_key_handle = -1;
   if (reg_key_handle == -1) {
     // If a specific Toast Results key handle (presumably to our HKLM key) was
     // passed in to the command line (such as for system level installs), we use
     // it. Otherwise, we write to the key under HKCU.
     const CommandLine& cmd_line = *CommandLine::ForCurrentProcess();
     if (cmd_line.HasSwitch(installer::switches::kToastResultsKey)) {
       // Get the handle to the key under HKLM.
       base::StringToInt(cmd_line.GetSwitchValueASCII(
           installer::switches::kToastResultsKey).c_str(),
@@ skipping 47 matching lines @@
 
     // The experiment with the more compact bubble. This one is a bit special
     // because it is split into two: CAxx is regular style bubble and CBxx is
     // compact style bubble. See |compact_bubble| below.
     {L"en-US", kBrief, 1, L'C', L'A', 2, { kEnUs3, kEnUs3, 0, 0 } },
 
     // Catch-all rules.
     {kAll, kAll, 1, L'B', L'A', 1, {kEnUs3, 0, 0, 0} },
   };
 
-  std::wstring locale;
-  std::wstring brand;
+  string16 locale;
+  string16 brand;
 
   if (!GoogleUpdateSettings::GetLanguage(&locale))
     locale = ASCIIToWide("en-US");
   if (!GoogleUpdateSettings::GetBrand(&brand))
     brand = ASCIIToWide("");  // Could still be viable for catch-all rules.
   if (brand == kEnterprise)
     return false;
 
   for (int i = 0; i < arraysize(kExperimentFlavors); ++i) {
     // A maximum of four flavors are supported at the moment.
     DCHECK_LE(kExperimentFlavors[i].flavors, kMax);
     DCHECK_GT(kExperimentFlavors[i].flavors, 0);
     // Make sure each experiment has valid headings.
     for (int f = 0; f < kMax; ++f) {
       if (f < kExperimentFlavors[i].flavors) {
         DCHECK_GT(kExperimentFlavors[i].headings[f], 0);
       } else {
         DCHECK_EQ(kExperimentFlavors[i].headings[f], 0);
       }
     }
     // Make sure we don't overflow on the second letter of the experiment code.
     DCHECK(kExperimentFlavors[i].prefix2 +
            kExperimentFlavors[i].flavors - 1 <= 'Z');
 
     if (kExperimentFlavors[i].locale != locale &&
         kExperimentFlavors[i].locale != ASCIIToWide("*"))
       continue;
 
-    std::vector<std::wstring> brand_codes;
+    std::vector<string16> brand_codes;
     base::SplitString(kExperimentFlavors[i].brands, L',', &brand_codes);
     if (brand_codes.empty())
       return false;
-    for (std::vector<std::wstring>::iterator it = brand_codes.begin();
+    for (std::vector<string16>::iterator it = brand_codes.begin();
          it != brand_codes.end(); ++it) {
       if (*it != brand && *it != L"*")
         continue;
 
       // We have found our match.
       if (flavor < 0)
         flavor = base::RandInt(0, kExperimentFlavors[i].flavors - 1);
       experiment->flavor = flavor;
       experiment->heading = kExperimentFlavors[i].headings[flavor];
       experiment->control_group = kExperimentFlavors[i].control_group;
@@ skipping 41 matching lines @@
   }
 
   // The |flavor| value ends up being processed by TryChromeDialogView to show
   // different experiments.
   UserExperiment experiment;
   if (!GetExperimentDetails(&experiment, -1)) {
     VLOG(1) << "Failed to get experiment details.";
     return;
   }
   int flavor = experiment.flavor;
-  std::wstring base_group = experiment.prefix;
+  string16 base_group = experiment.prefix;
 
-  std::wstring brand;
+  string16 brand;
   if (GoogleUpdateSettings::GetBrand(&brand) && (brand == L"CHXX")) {
     // Testing only: the user automatically qualifies for the experiment.
     VLOG(1) << "Experiment qualification bypass";
   } else {
     // Check browser usage inactivity by the age of the last-write time of the
     // chrome user data directory.
     FilePath user_data_dir(product.GetUserDataPath());
 
     const bool experiment_enabled = false;
     const int kThirtyDays = 30 * 24;
@@ skipping 34 matching lines @@
   cmd_line.AppendSwitchASCII(installer::switches::kInactiveUserToast,
                              base::IntToString(flavor));
   cmd_line.AppendSwitchASCII(installer::switches::kExperimentGroup,
                              WideToASCII(base_group));
   LaunchSetup(&cmd_line, product, system_level);
 }
 
 // User qualifies for the experiment. To test, use --try-chrome-again=|flavor|
 // as a parameter to chrome.exe.
 void GoogleChromeDistribution::InactiveUserToastExperiment(int flavor,
-    const std::wstring& experiment_group,
+    const string16& experiment_group,
     const installer::Product& installation,
     const FilePath& application_path) {
   bool has_welcome_url = (flavor == 0);
   // Possibly add a url to launch depending on the experiment flavor.
   CommandLine options(CommandLine::NO_PROGRAM);
   options.AppendSwitchNative(switches::kTryChromeAgain,
       base::IntToString16(flavor));
   if (has_welcome_url) {
     // Prepend the url with a space.
-    std::wstring url(GetWelcomeBackUrl());
+    string16 url(GetWelcomeBackUrl());
     options.AppendArg("--");
     options.AppendArgNative(url);
     // The command line should now have the url added as:
     // "chrome.exe -- <url>"
-    DCHECK_NE(std::wstring::npos,
+    DCHECK_NE(string16::npos,
         options.GetCommandLineString().find(L" -- " + url));
   }
   // Launch chrome now. It will show the toast UI.
   int32 exit_code = 0;
   if (!installation.LaunchChromeAndWait(application_path, options, &exit_code))
     return;
 
   // The chrome process has exited, figure out what happened.
   const wchar_t* outcome = NULL;
   switch (exit_code) {
@@ skipping 20 matching lines @@
   // we waited for chrome to exit so the uninstall would not detect chrome
   // running.
   bool system_level_toast = CommandLine::ForCurrentProcess()->HasSwitch(
       installer::switches::kSystemLevelToast);
 
   CommandLine cmd(InstallUtil::GetChromeUninstallCmd(system_level_toast,
                                                      GetType()));
   base::LaunchProcess(cmd, base::LaunchOptions(), NULL);
 }
 #endif