| 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 66 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 77 // It would be nice to send the locale, too, but I don't see an | 77 // It would be nice to send the locale, too, but I don't see an |
| 78 // easy way to get that in the existing code. It's something we | 78 // easy way to get that in the existing code. It's something we |
| 79 // can add later, if needed. | 79 // can add later, if needed. |
| 80 // We depend on installed_version.GetString() not having spaces or other | 80 // We depend on installed_version.GetString() not having spaces or other |
| 81 // characters that need escaping: 0.2.13.4. Should that change, we will | 81 // characters that need escaping: 0.2.13.4. Should that change, we will |
| 82 // need to escape the string before using it in a URL. | 82 // need to escape the string before using it in a URL. |
| 83 const base::string16 kVersionParam = L"crversion"; | 83 const base::string16 kVersionParam = L"crversion"; |
| 84 const base::string16 kOSParam = L"os"; | 84 const base::string16 kOSParam = L"os"; |
| 85 base::win::OSInfo::VersionNumber version_number = | 85 base::win::OSInfo::VersionNumber version_number = |
| 86 base::win::OSInfo::GetInstance()->version_number(); | 86 base::win::OSInfo::GetInstance()->version_number(); |
| 87 base::string16 os_version = base::StringPrintf(L"%d.%d.%d", | 87 base::string16 os_version = L"";/* base::StringPrintf(L"%d.%d.%d", |
| 88 version_number.major, version_number.minor, version_number.build); | 88 version_number.major, version_number.minor, version_number.build);*/ |
| 89 | 89 |
| 90 base::FilePath iexplore; | 90 base::FilePath iexplore; |
| 91 if (!PathService::Get(base::DIR_PROGRAM_FILES, &iexplore)) | 91 if (!PathService::Get(base::DIR_PROGRAM_FILES, &iexplore)) |
| 92 return; | 92 return; |
| 93 | 93 |
| 94 iexplore = iexplore.AppendASCII("Internet Explorer"); | 94 iexplore = iexplore.AppendASCII("Internet Explorer"); |
| 95 iexplore = iexplore.AppendASCII("iexplore.exe"); | 95 iexplore = iexplore.AppendASCII("iexplore.exe"); |
| 96 | 96 |
| 97 base::string16 command = L"\"" + iexplore.value() + L"\" " + | 97 base::string16 command = L"\"" + iexplore.value() + L"\" " + |
| 98 GetUninstallSurveyUrl() + | 98 GetUninstallSurveyUrl() + |
| (...skipping 157 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 256 GetAppGuid()); | 256 GetAppGuid()); |
| 257 } | 257 } |
| 258 | 258 |
| 259 bool GoogleChromeDistribution::ShouldSetExperimentLabels() { | 259 bool GoogleChromeDistribution::ShouldSetExperimentLabels() { |
| 260 return true; | 260 return true; |
| 261 } | 261 } |
| 262 | 262 |
| 263 bool GoogleChromeDistribution::HasUserExperiments() { | 263 bool GoogleChromeDistribution::HasUserExperiments() { |
| 264 return true; | 264 return true; |
| 265 } | 265 } |
| OLD | NEW |