OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 #include "chrome/installer/util/installer_state.h" | 5 #include "chrome/installer/util/installer_state.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <functional> | 8 #include <functional> |
9 #include <utility> | 9 #include <utility> |
10 | 10 |
(...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
110 if (!prefs.GetBool(master_preferences::kMsi, &msi_)) | 110 if (!prefs.GetBool(master_preferences::kMsi, &msi_)) |
111 msi_ = false; | 111 msi_ = false; |
112 | 112 |
113 const bool is_uninstall = command_line.HasSwitch(switches::kUninstall); | 113 const bool is_uninstall = command_line.HasSwitch(switches::kUninstall); |
114 | 114 |
115 if (prefs.install_chrome()) { | 115 if (prefs.install_chrome()) { |
116 Product* p = | 116 Product* p = |
117 AddProductFromPreferences(BrowserDistribution::CHROME_BROWSER, prefs, | 117 AddProductFromPreferences(BrowserDistribution::CHROME_BROWSER, prefs, |
118 machine_state); | 118 machine_state); |
119 VLOG(1) << (is_uninstall ? "Uninstall" : "Install") | 119 VLOG(1) << (is_uninstall ? "Uninstall" : "Install") |
120 << " distribution: " << p->distribution()->GetApplicationName(); | 120 << " distribution: " << p->distribution()->GetUnsuffixedAppName(); |
121 } | 121 } |
122 if (prefs.install_chrome_frame()) { | 122 if (prefs.install_chrome_frame()) { |
123 Product* p = | 123 Product* p = |
124 AddProductFromPreferences(BrowserDistribution::CHROME_FRAME, prefs, | 124 AddProductFromPreferences(BrowserDistribution::CHROME_FRAME, prefs, |
125 machine_state); | 125 machine_state); |
126 VLOG(1) << (is_uninstall ? "Uninstall" : "Install") | 126 VLOG(1) << (is_uninstall ? "Uninstall" : "Install") |
127 << " distribution: " << p->distribution()->GetApplicationName(); | 127 << " distribution: " << p->distribution()->GetUnsuffixedAppName(); |
128 } | 128 } |
129 | 129 |
130 BrowserDistribution* operand = NULL; | 130 BrowserDistribution* operand = NULL; |
131 | 131 |
132 if (is_uninstall) { | 132 if (is_uninstall) { |
133 operation_ = UNINSTALL; | 133 operation_ = UNINSTALL; |
134 } else if (!prefs.is_multi_install()) { | 134 } else if (!prefs.is_multi_install()) { |
135 // For a single-install, the current browser dist is the operand. | 135 // For a single-install, the current browser dist is the operand. |
136 operand = BrowserDistribution::GetDistribution(); | 136 operand = BrowserDistribution::GetDistribution(); |
137 operation_ = SINGLE_INSTALL_OR_UPDATE; | 137 operation_ = SINGLE_INSTALL_OR_UPDATE; |
(...skipping 479 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
617 if (is_multi_install()) { | 617 if (is_multi_install()) { |
618 InstallUtil::AddInstallerResultItems( | 618 InstallUtil::AddInstallerResultItems( |
619 system_install, multi_package_binaries_distribution()->GetStateKey(), | 619 system_install, multi_package_binaries_distribution()->GetStateKey(), |
620 status, string_resource_id, launch_cmd, install_list.get()); | 620 status, string_resource_id, launch_cmd, install_list.get()); |
621 } | 621 } |
622 if (!install_list->Do()) | 622 if (!install_list->Do()) |
623 LOG(ERROR) << "Failed to record installer error information in registry."; | 623 LOG(ERROR) << "Failed to record installer error information in registry."; |
624 } | 624 } |
625 | 625 |
626 } // namespace installer | 626 } // namespace installer |
OLD | NEW |