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 #include "chrome/installer/setup/install.h" | 5 #include "chrome/installer/setup/install.h" |
6 | 6 |
7 #include <shlobj.h> | 7 #include <shlobj.h> |
8 #include <time.h> | 8 #include <time.h> |
9 #include <winuser.h> | 9 #include <winuser.h> |
10 | 10 |
(...skipping 534 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
545 | 545 |
546 installer_state.RemoveOldVersionDirectories( | 546 installer_state.RemoveOldVersionDirectories( |
547 new_version, | 547 new_version, |
548 existing_version.get(), | 548 existing_version.get(), |
549 install_temp_path); | 549 install_temp_path); |
550 } | 550 } |
551 | 551 |
552 return result; | 552 return result; |
553 } | 553 } |
554 | 554 |
555 bool HandleOsUpgradeForBrowser(const InstallerState& installer_state, | |
gab
2012/08/30 17:55:19
I thought I'd mentioned this before (maybe it argu
huangs
2012/08/30 20:14:22
Done. I chased after error messages. Avoided cha
| |
556 const Product& chrome_install, | |
grt (UTC plus 2)
2012/08/30 19:10:18
chrome_install -> chrome
huangs
2012/08/30 20:14:22
Done.
| |
557 const FilePath& setup_exe) { | |
558 // Upon upgrading to Windows 8, we need to fix Chrome shortcuts and register | |
grt (UTC plus 2)
2012/08/30 19:10:18
DCHECK(chrome.is_chrome()); before this line
huangs
2012/08/30 20:14:22
Done.
| |
559 // Chrome, so that Metro Chrome would work if Chrome is the default browser. | |
560 if (base::win::GetVersion() >= base::win::VERSION_WIN8) { | |
561 VLOG(1) << "Updating and registering shortcuts."; | |
562 uint32 shortcut_options = ShellUtil::SHORTCUT_DUAL_MODE; | |
563 CreateOrUpdateDesktopAndQuickLaunchShortcuts( | |
564 installer_state, chrome_install, shortcut_options); | |
565 CreateOrUpdateStartMenuAndTaskbarShortcuts( | |
566 installer_state, setup_exe, chrome_install, shortcut_options); | |
567 RegisterChromeOnMachine(installer_state, chrome_install, false); | |
568 } | |
569 return true; | |
570 } | |
571 | |
555 } // namespace installer | 572 } // namespace installer |
OLD | NEW |