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_ready_mode.h" | 5 #include "chrome/installer/setup/chrome_frame_ready_mode.h" |
6 | 6 |
7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
8 #include "base/file_path.h" | 8 #include "base/file_path.h" |
9 #include "base/logging.h" | 9 #include "base/logging.h" |
10 #include "base/ref_counted.h" | 10 #include "base/ref_counted.h" |
11 #include "base/string_util.h" | 11 #include "base/string_util.h" |
12 #include "base/time.h" | 12 #include "base/time.h" |
13 #include "base/utf_string_conversions.h" | 13 #include "base/utf_string_conversions.h" |
14 #include "base/win/registry.h" | 14 #include "base/win/registry.h" |
15 #include "chrome/installer/setup/install.h" | 15 #include "chrome/installer/setup/install.h" |
| 16 #include "chrome/installer/setup/install_worker.h" |
16 #include "chrome/installer/util/browser_distribution.h" | 17 #include "chrome/installer/util/browser_distribution.h" |
17 #include "chrome/installer/util/google_update_constants.h" | 18 #include "chrome/installer/util/google_update_constants.h" |
18 #include "chrome/installer/util/helper.h" | 19 #include "chrome/installer/util/helper.h" |
19 #include "chrome/installer/util/install_util.h" | 20 #include "chrome/installer/util/install_util.h" |
20 #include "chrome/installer/util/installation_state.h" | 21 #include "chrome/installer/util/installation_state.h" |
21 #include "chrome/installer/util/installer_state.h" | 22 #include "chrome/installer/util/installer_state.h" |
22 #include "chrome/installer/util/master_preferences.h" | 23 #include "chrome/installer/util/master_preferences.h" |
23 #include "chrome/installer/util/master_preferences_constants.h" | 24 #include "chrome/installer/util/master_preferences_constants.h" |
24 #include "chrome/installer/util/package.h" | 25 #include "chrome/installer/util/package.h" |
25 #include "chrome/installer/util/package_properties.h" | 26 #include "chrome/installer/util/package_properties.h" |
(...skipping 180 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
206 LOG(ERROR) << "Failed to end temporary opt out of GCF"; | 207 LOG(ERROR) << "Failed to end temporary opt out of GCF"; |
207 item_list->Rollback(); | 208 item_list->Rollback(); |
208 status = READY_MODE_END_TEMP_OPT_OUT_FAILED; | 209 status = READY_MODE_END_TEMP_OPT_OUT_FAILED; |
209 } | 210 } |
210 } | 211 } |
211 | 212 |
212 return status; | 213 return status; |
213 } | 214 } |
214 | 215 |
215 } // namespace installer | 216 } // namespace installer |
OLD | NEW |