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/setup/chrome_frame_quick_enable.h" | 5 #include "chrome/installer/setup/chrome_frame_quick_enable.h" |
6 | 6 |
7 #include <windows.h> | 7 #include <windows.h> |
8 | 8 |
9 #include "base/logging.h" | 9 #include "base/logging.h" |
10 #include "base/scoped_temp_dir.h" | 10 #include "base/scoped_temp_dir.h" |
(...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
113 const Version* opv = chrome_state->old_version(); | 113 const Version* opv = chrome_state->old_version(); |
114 AppendPostInstallTasks(*installer_state, setup_path, new_chrome_exe, opv, | 114 AppendPostInstallTasks(*installer_state, setup_path, new_chrome_exe, opv, |
115 new_version, temp_path.path(), item_list.get()); | 115 new_version, temp_path.path(), item_list.get()); |
116 | 116 |
117 // Before updating the channel values, add Chrome back to the mix so that | 117 // Before updating the channel values, add Chrome back to the mix so that |
118 // all multi-installed products' channel values get updated. | 118 // all multi-installed products' channel values get updated. |
119 installer_state->AddProductFromState(BrowserDistribution::CHROME_BROWSER, | 119 installer_state->AddProductFromState(BrowserDistribution::CHROME_BROWSER, |
120 *chrome_state); | 120 *chrome_state); |
121 AddGoogleUpdateWorkItems(*installer_state, item_list.get()); | 121 AddGoogleUpdateWorkItems(*installer_state, item_list.get()); |
122 | 122 |
| 123 // Add the items to remove the quick-enable-cf command from the registry. |
| 124 AddQuickEnableWorkItems(*installer_state, machine_state, NULL, NULL, |
| 125 item_list.get()); |
| 126 |
123 if (!item_list->Do()) { | 127 if (!item_list->Do()) { |
124 item_list->Rollback(); | 128 item_list->Rollback(); |
125 status = INSTALL_FAILED; | 129 status = INSTALL_FAILED; |
126 } else { | 130 } else { |
127 DCHECK_EQ(FIRST_INSTALL_SUCCESS, status); | 131 DCHECK_EQ(FIRST_INSTALL_SUCCESS, status); |
128 VLOG(1) << "Chrome Frame successfully activated."; | 132 VLOG(1) << "Chrome Frame successfully activated."; |
129 } | 133 } |
130 } | 134 } |
131 } | 135 } |
132 | 136 |
133 return status; | 137 return status; |
134 } | 138 } |
135 | 139 |
136 } // namespace installer | 140 } // namespace installer |
OLD | NEW |