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 <windows.h> | 7 #include <windows.h> |
8 #include <shlobj.h> | 8 #include <shlobj.h> |
9 #include <time.h> | 9 #include <time.h> |
10 | 10 |
(...skipping 378 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
389 ShellUtil::ShortcutProperties quick_launch_properties(base_properties); | 389 ShellUtil::ShortcutProperties quick_launch_properties(base_properties); |
390 quick_launch_properties.level = ShellUtil::CURRENT_USER; | 390 quick_launch_properties.level = ShellUtil::CURRENT_USER; |
391 ExecuteAndLogShortcutOperation( | 391 ExecuteAndLogShortcutOperation( |
392 ShellUtil::SHORTCUT_LOCATION_QUICK_LAUNCH, dist, | 392 ShellUtil::SHORTCUT_LOCATION_QUICK_LAUNCH, dist, |
393 quick_launch_properties, shortcut_operation); | 393 quick_launch_properties, shortcut_operation); |
394 } | 394 } |
395 | 395 |
396 ShellUtil::ShortcutProperties start_menu_properties(base_properties); | 396 ShellUtil::ShortcutProperties start_menu_properties(base_properties); |
397 // IMPORTANT: Only the default (no arguments and default browserappid) browser | 397 // IMPORTANT: Only the default (no arguments and default browserappid) browser |
398 // shortcut in the Start menu (Start screen on Win8+) should be made dual | 398 // shortcut in the Start menu (Start screen on Win8+) should be made dual |
399 // mode and that prior to Windows 10 only. | 399 // mode and that prior to Windows 10 only. |
gab
2016/01/12 21:11:04
This comment was specific to the removed code and
scottmg
2016/01/13 20:48:16
Done.
| |
400 if (InstallUtil::ShouldInstallMetroProperties()) | |
401 start_menu_properties.set_dual_mode(true); | |
gab
2016/01/12 21:11:04
Assuming we can get rid of ShellUtil::ShortcutProp
scottmg
2016/01/13 20:48:16
Done.
| |
402 if (shortcut_operation == ShellUtil::SHELL_SHORTCUT_CREATE_ALWAYS || | 400 if (shortcut_operation == ShellUtil::SHELL_SHORTCUT_CREATE_ALWAYS || |
403 shortcut_operation == | 401 shortcut_operation == |
404 ShellUtil::SHELL_SHORTCUT_CREATE_IF_NO_SYSTEM_LEVEL) { | 402 ShellUtil::SHELL_SHORTCUT_CREATE_IF_NO_SYSTEM_LEVEL) { |
405 start_menu_properties.set_pin_to_taskbar(!do_not_create_taskbar_shortcut); | 403 start_menu_properties.set_pin_to_taskbar(!do_not_create_taskbar_shortcut); |
406 } | 404 } |
407 | 405 |
408 // The attempt below to update the stortcut will fail if it does not already | 406 // The attempt below to update the stortcut will fail if it does not already |
409 // exist at the expected location on disk. First check if it exists in the | 407 // exist at the expected location on disk. First check if it exists in the |
410 // previous location (under a subdirectory) and, if so, move it to the new | 408 // previous location (under a subdirectory) and, if so, move it to the new |
411 // location. | 409 // location. |
(...skipping 241 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
653 // Read master_preferences copied beside chrome.exe at install. | 651 // Read master_preferences copied beside chrome.exe at install. |
654 MasterPreferences prefs(installation_root.AppendASCII(kDefaultMasterPrefs)); | 652 MasterPreferences prefs(installation_root.AppendASCII(kDefaultMasterPrefs)); |
655 base::FilePath chrome_exe(installation_root.Append(kChromeExe)); | 653 base::FilePath chrome_exe(installation_root.Append(kChromeExe)); |
656 CreateOrUpdateShortcuts( | 654 CreateOrUpdateShortcuts( |
657 chrome_exe, chrome, prefs, CURRENT_USER, install_operation); | 655 chrome_exe, chrome, prefs, CURRENT_USER, install_operation); |
658 | 656 |
659 UpdateDefaultBrowserBeaconForPath(chrome_exe); | 657 UpdateDefaultBrowserBeaconForPath(chrome_exe); |
660 } | 658 } |
661 | 659 |
662 } // namespace installer | 660 } // namespace installer |
OLD | NEW |