| 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 a specific implementation of BrowserDistribution class for | 5 // This file defines a specific implementation of BrowserDistribution class for |
| 6 // Chrome Frame. It overrides the bare minimum of methods necessary to get a | 6 // Chrome Frame. It overrides the bare minimum of methods necessary to get a |
| 7 // Chrome Frame installer that does not interact with Google Chrome or | 7 // Chrome Frame installer that does not interact with Google Chrome or |
| 8 // Chromium installations. | 8 // Chromium installations. |
| 9 | 9 |
| 10 #include "chrome/installer/util/chrome_frame_distribution.h" | 10 #include "chrome/installer/util/chrome_frame_distribution.h" |
| (...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 93 base::string16 key(google_update::kRegPathClientStateMedium); | 93 base::string16 key(google_update::kRegPathClientStateMedium); |
| 94 key.append(L"\\"); | 94 key.append(L"\\"); |
| 95 key.append(kChromeFrameGuid); | 95 key.append(kChromeFrameGuid); |
| 96 return key; | 96 return key; |
| 97 } | 97 } |
| 98 | 98 |
| 99 std::string ChromeFrameDistribution::GetNetworkStatsServer() const { | 99 std::string ChromeFrameDistribution::GetNetworkStatsServer() const { |
| 100 return chrome_common_net::kEchoTestServerLocation; | 100 return chrome_common_net::kEchoTestServerLocation; |
| 101 } | 101 } |
| 102 | 102 |
| 103 std::string ChromeFrameDistribution::GetHttpPipeliningTestServer() const { | |
| 104 return chrome_common_net::kPipelineTestServerBaseUrl; | |
| 105 } | |
| 106 | |
| 107 base::string16 ChromeFrameDistribution::GetUninstallLinkName() { | 103 base::string16 ChromeFrameDistribution::GetUninstallLinkName() { |
| 108 return L"Uninstall Chrome Frame"; | 104 return L"Uninstall Chrome Frame"; |
| 109 } | 105 } |
| 110 | 106 |
| 111 base::string16 ChromeFrameDistribution::GetUninstallRegPath() { | 107 base::string16 ChromeFrameDistribution::GetUninstallRegPath() { |
| 112 return L"Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\" | 108 return L"Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\" |
| 113 L"Google Chrome Frame"; | 109 L"Google Chrome Frame"; |
| 114 } | 110 } |
| 115 | 111 |
| 116 base::string16 ChromeFrameDistribution::GetVersionKey() { | 112 base::string16 ChromeFrameDistribution::GetVersionKey() { |
| (...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 150 | 146 |
| 151 void ChromeFrameDistribution::UpdateInstallStatus(bool system_install, | 147 void ChromeFrameDistribution::UpdateInstallStatus(bool system_install, |
| 152 installer::ArchiveType archive_type, | 148 installer::ArchiveType archive_type, |
| 153 installer::InstallStatus install_status) { | 149 installer::InstallStatus install_status) { |
| 154 #if defined(GOOGLE_CHROME_BUILD) | 150 #if defined(GOOGLE_CHROME_BUILD) |
| 155 GoogleUpdateSettings::UpdateInstallStatus(system_install, | 151 GoogleUpdateSettings::UpdateInstallStatus(system_install, |
| 156 archive_type, InstallUtil::GetInstallReturnCode(install_status), | 152 archive_type, InstallUtil::GetInstallReturnCode(install_status), |
| 157 kChromeFrameGuid); | 153 kChromeFrameGuid); |
| 158 #endif | 154 #endif |
| 159 } | 155 } |
| OLD | NEW |