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 contains the definitions of the installer functions that build | 5 // This file contains the definitions of the installer functions that build |
6 // the WorkItemList used to install the application. | 6 // the WorkItemList used to install the application. |
7 | 7 |
8 #include "chrome/installer/setup/install_worker.h" | 8 #include "chrome/installer/setup/install_worker.h" |
9 | 9 |
10 #include <oaidl.h> | 10 #include <oaidl.h> |
(...skipping 29 matching lines...) Expand all Loading... | |
40 #include "chrome/installer/util/firewall_manager_win.h" | 40 #include "chrome/installer/util/firewall_manager_win.h" |
41 #include "chrome/installer/util/google_update_constants.h" | 41 #include "chrome/installer/util/google_update_constants.h" |
42 #include "chrome/installer/util/helper.h" | 42 #include "chrome/installer/util/helper.h" |
43 #include "chrome/installer/util/install_util.h" | 43 #include "chrome/installer/util/install_util.h" |
44 #include "chrome/installer/util/installation_state.h" | 44 #include "chrome/installer/util/installation_state.h" |
45 #include "chrome/installer/util/installer_state.h" | 45 #include "chrome/installer/util/installer_state.h" |
46 #include "chrome/installer/util/l10n_string_util.h" | 46 #include "chrome/installer/util/l10n_string_util.h" |
47 #include "chrome/installer/util/product.h" | 47 #include "chrome/installer/util/product.h" |
48 #include "chrome/installer/util/set_reg_value_work_item.h" | 48 #include "chrome/installer/util/set_reg_value_work_item.h" |
49 #include "chrome/installer/util/shell_util.h" | 49 #include "chrome/installer/util/shell_util.h" |
50 #include "chrome/installer/util/update_active_setup_version_work_item.h" | |
grt (UTC plus 2)
2015/07/09 14:23:53
same nit
gab
2015/07/09 20:36:37
Oops again :-).
| |
50 #include "chrome/installer/util/util_constants.h" | 51 #include "chrome/installer/util/util_constants.h" |
51 #include "chrome/installer/util/work_item_list.h" | 52 #include "chrome/installer/util/work_item_list.h" |
52 | 53 |
53 using base::ASCIIToUTF16; | 54 using base::ASCIIToUTF16; |
54 using base::win::RegKey; | 55 using base::win::RegKey; |
55 | 56 |
56 namespace installer { | 57 namespace installer { |
57 | 58 |
58 namespace { | 59 namespace { |
59 | 60 |
(...skipping 1501 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1561 // Unconditionally remove the legacy Quick Enable command from the binaries. | 1562 // Unconditionally remove the legacy Quick Enable command from the binaries. |
1562 // Do this even if multi-install Chrome isn't installed to ensure that it is | 1563 // Do this even if multi-install Chrome isn't installed to ensure that it is |
1563 // not left behind in any case. | 1564 // not left behind in any case. |
1564 work_item_list->AddDeleteRegKeyWorkItem( | 1565 work_item_list->AddDeleteRegKeyWorkItem( |
1565 installer_state.root_key(), cmd_key, KEY_WOW64_32KEY) | 1566 installer_state.root_key(), cmd_key, KEY_WOW64_32KEY) |
1566 ->set_log_message("removing " + base::UTF16ToASCII(kCmdQuickEnableCf) + | 1567 ->set_log_message("removing " + base::UTF16ToASCII(kCmdQuickEnableCf) + |
1567 " command"); | 1568 " command"); |
1568 } | 1569 } |
1569 | 1570 |
1570 } // namespace installer | 1571 } // namespace installer |
OLD | NEW |