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" |
11 | 11 |
12 #include "base/strings/string_util.h" | 12 #include "base/strings/string_util.h" |
13 #include "chrome/common/net/test_server_locations.h" | 13 #include "chrome/common/net/test_server_locations.h" |
14 #include "chrome/installer/util/channel_info.h" | 14 #include "chrome/installer/util/channel_info.h" |
15 #include "chrome/installer/util/google_update_constants.h" | 15 #include "chrome/installer/util/google_update_constants.h" |
16 #include "chrome/installer/util/google_update_settings.h" | 16 #include "chrome/installer/util/google_update_settings.h" |
17 #include "chrome/installer/util/helper.h" | 17 #include "chrome/installer/util/helper.h" |
18 #include "chrome/installer/util/install_util.h" | 18 #include "chrome/installer/util/install_util.h" |
| 19 #include "chrome/installer/util/installer_util_strings.h" |
19 #include "chrome/installer/util/l10n_string_util.h" | 20 #include "chrome/installer/util/l10n_string_util.h" |
20 #include "chrome/installer/util/updating_app_registration_data.h" | 21 #include "chrome/installer/util/updating_app_registration_data.h" |
21 | 22 |
22 #include "installer_util_strings.h" // NOLINT | |
23 | |
24 namespace { | 23 namespace { |
25 const wchar_t kChromeFrameGuid[] = L"{8BA986DA-5100-405E-AA35-86F34A02ACBF}"; | 24 const wchar_t kChromeFrameGuid[] = L"{8BA986DA-5100-405E-AA35-86F34A02ACBF}"; |
26 } | 25 } |
27 | 26 |
28 ChromeFrameDistribution::ChromeFrameDistribution() | 27 ChromeFrameDistribution::ChromeFrameDistribution() |
29 : BrowserDistribution( | 28 : BrowserDistribution( |
30 CHROME_FRAME, | 29 CHROME_FRAME, |
31 scoped_ptr<AppRegistrationData>( | 30 scoped_ptr<AppRegistrationData>( |
32 new UpdatingAppRegistrationData(kChromeFrameGuid))) { | 31 new UpdatingAppRegistrationData(kChromeFrameGuid))) { |
33 } | 32 } |
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
125 | 124 |
126 void ChromeFrameDistribution::UpdateInstallStatus(bool system_install, | 125 void ChromeFrameDistribution::UpdateInstallStatus(bool system_install, |
127 installer::ArchiveType archive_type, | 126 installer::ArchiveType archive_type, |
128 installer::InstallStatus install_status) { | 127 installer::InstallStatus install_status) { |
129 #if defined(GOOGLE_CHROME_BUILD) | 128 #if defined(GOOGLE_CHROME_BUILD) |
130 GoogleUpdateSettings::UpdateInstallStatus(system_install, | 129 GoogleUpdateSettings::UpdateInstallStatus(system_install, |
131 archive_type, InstallUtil::GetInstallReturnCode(install_status), | 130 archive_type, InstallUtil::GetInstallReturnCode(install_status), |
132 kChromeFrameGuid); | 131 kChromeFrameGuid); |
133 #endif | 132 #endif |
134 } | 133 } |
OLD | NEW |