OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 // | 4 // |
5 // This file defines specific implementation of BrowserDistribution class for | 5 // This file defines specific implementation of BrowserDistribution class for |
6 // Google Chrome. | 6 // Google Chrome. |
7 | 7 |
8 #include "chrome/installer/util/google_chrome_distribution.h" | 8 #include "chrome/installer/util/google_chrome_distribution.h" |
9 | 9 |
10 #include <windows.h> | 10 #include <windows.h> |
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
90 base::string16 os_version = base::StringPrintf(L"%d.%d.%d", | 90 base::string16 os_version = base::StringPrintf(L"%d.%d.%d", |
91 version_number.major, version_number.minor, version_number.build); | 91 version_number.major, version_number.minor, version_number.build); |
92 | 92 |
93 base::FilePath iexplore; | 93 base::FilePath iexplore; |
94 if (!PathService::Get(base::DIR_PROGRAM_FILES, &iexplore)) | 94 if (!PathService::Get(base::DIR_PROGRAM_FILES, &iexplore)) |
95 return; | 95 return; |
96 | 96 |
97 iexplore = iexplore.AppendASCII("Internet Explorer"); | 97 iexplore = iexplore.AppendASCII("Internet Explorer"); |
98 iexplore = iexplore.AppendASCII("iexplore.exe"); | 98 iexplore = iexplore.AppendASCII("iexplore.exe"); |
99 | 99 |
100 base::string16 command = iexplore.value() + L" " + GetUninstallSurveyUrl() + | 100 base::string16 command = L"\"" + iexplore.value() + L"\" " + |
101 L"&" + kVersionParam + L"=" + base::UTF8ToWide(version.GetString()) + | 101 GetUninstallSurveyUrl() + |
| 102 L"&" + kVersionParam + L"=" + base::ASCIIToUTF16(version.GetString()) + |
102 L"&" + kOSParam + L"=" + os_version; | 103 L"&" + kOSParam + L"=" + os_version; |
103 | 104 |
104 base::string16 uninstall_metrics; | 105 base::string16 uninstall_metrics; |
105 if (installer::ExtractUninstallMetricsFromFile(local_data_path, | 106 if (installer::ExtractUninstallMetricsFromFile(local_data_path, |
106 &uninstall_metrics)) { | 107 &uninstall_metrics)) { |
107 // The user has opted into anonymous usage data collection, so append | 108 // The user has opted into anonymous usage data collection, so append |
108 // metrics and distribution data. | 109 // metrics and distribution data. |
109 command += uninstall_metrics; | 110 command += uninstall_metrics; |
110 if (!distribution_data.empty()) { | 111 if (!distribution_data.empty()) { |
111 command += L"&"; | 112 command += L"&"; |
(...skipping 163 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
275 GetAppGuid()); | 276 GetAppGuid()); |
276 } | 277 } |
277 | 278 |
278 bool GoogleChromeDistribution::ShouldSetExperimentLabels() { | 279 bool GoogleChromeDistribution::ShouldSetExperimentLabels() { |
279 return true; | 280 return true; |
280 } | 281 } |
281 | 282 |
282 bool GoogleChromeDistribution::HasUserExperiments() { | 283 bool GoogleChromeDistribution::HasUserExperiments() { |
283 return true; | 284 return true; |
284 } | 285 } |
OLD | NEW |