Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(161)

Side by Side Diff: chrome/installer/setup/install_worker.cc

Issue 985573003: Support 32-bit subversion fields in base::Version. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rename back Created 5 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 651 matching lines...) Expand 10 before | Expand all | Expand 10 after
662 true); 662 true);
663 // TODO(wfh): Ensure that this value is preserved in the 64-bit hive when 663 // TODO(wfh): Ensure that this value is preserved in the 64-bit hive when
664 // 64-bit installs place the uninstall information into the 64-bit registry. 664 // 64-bit installs place the uninstall information into the 64-bit registry.
665 install_list->AddSetRegValueWorkItem(reg_root, 665 install_list->AddSetRegValueWorkItem(reg_root,
666 uninstall_reg, 666 uninstall_reg,
667 KEY_WOW64_32KEY, 667 KEY_WOW64_32KEY,
668 L"InstallDate", 668 L"InstallDate",
669 InstallUtil::GetCurrentDate(), 669 InstallUtil::GetCurrentDate(),
670 false); 670 false);
671 671
672 const std::vector<uint16>& version_components = new_version.components(); 672 const std::vector<uint32>& version_components = new_version.components();
673 if (version_components.size() == 4) { 673 if (version_components.size() == 4) {
674 // Our version should be in major.minor.build.rev. 674 // Our version should be in major.minor.build.rev.
675 install_list->AddSetRegValueWorkItem( 675 install_list->AddSetRegValueWorkItem(
676 reg_root, 676 reg_root,
677 uninstall_reg, 677 uninstall_reg,
678 KEY_WOW64_32KEY, 678 KEY_WOW64_32KEY,
679 L"VersionMajor", 679 L"VersionMajor",
680 static_cast<DWORD>(version_components[2]), 680 static_cast<DWORD>(version_components[2]),
681 true); 681 true);
682 install_list->AddSetRegValueWorkItem( 682 install_list->AddSetRegValueWorkItem(
(...skipping 878 matching lines...) Expand 10 before | Expand all | Expand 10 after
1561 // Unconditionally remove the legacy Quick Enable command from the binaries. 1561 // 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 1562 // Do this even if multi-install Chrome isn't installed to ensure that it is
1563 // not left behind in any case. 1563 // not left behind in any case.
1564 work_item_list->AddDeleteRegKeyWorkItem( 1564 work_item_list->AddDeleteRegKeyWorkItem(
1565 installer_state.root_key(), cmd_key, KEY_WOW64_32KEY) 1565 installer_state.root_key(), cmd_key, KEY_WOW64_32KEY)
1566 ->set_log_message("removing " + base::UTF16ToASCII(kCmdQuickEnableCf) + 1566 ->set_log_message("removing " + base::UTF16ToASCII(kCmdQuickEnableCf) +
1567 " command"); 1567 " command");
1568 } 1568 }
1569 1569
1570 } // namespace installer 1570 } // namespace installer
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698