diff options
| author | gab <gab@chromium.org> | 2015-07-27 09:34:26 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-07-27 16:34:59 +0000 |
| commit | a1b29082fe381f0d8db227f2e8e967baaae245bf (patch) | |
| tree | 0437e5f359077ccc28d325fc3713c1bd807ec0cd /chrome/installer/setup | |
| parent | cdccaf0307f426d3fb4cc31ea32504df3fb66bed (diff) | |
| download | chromium_src-a1b29082fe381f0d8db227f2e8e967baaae245bf.zip chromium_src-a1b29082fe381f0d8db227f2e8e967baaae245bf.tar.gz chromium_src-a1b29082fe381f0d8db227f2e8e967baaae245bf.tar.bz2 | |
No dual_mode on Win10+ shortcuts.
BUG=501166
Review URL: https://codereview.chromium.org/1252513002
Cr-Commit-Position: refs/heads/master@{#340479}
Diffstat (limited to 'chrome/installer/setup')
| -rw-r--r-- | chrome/installer/setup/install.cc | 7 | ||||
| -rw-r--r-- | chrome/installer/setup/install_unittest.cc | 4 | ||||
| -rw-r--r-- | chrome/installer/setup/setup_main.cc | 3 |
3 files changed, 9 insertions, 5 deletions
diff --git a/chrome/installer/setup/install.cc b/chrome/installer/setup/install.cc index 37a1417..00a74af 100644 --- a/chrome/installer/setup/install.cc +++ b/chrome/installer/setup/install.cc @@ -429,9 +429,10 @@ void CreateOrUpdateShortcuts( ShellUtil::ShortcutProperties start_menu_properties(base_properties); // IMPORTANT: Only the default (no arguments and default browserappid) browser - // shortcut in the Start menu (Start screen on Win8+) should be made dual - // mode. - start_menu_properties.set_dual_mode(true); + // shortcut in the Start menu (Start screen on Win8+) should be considered for + // dual mode. + if (InstallUtil::ShouldInstallMetroProperties()) + start_menu_properties.set_dual_mode(true); if (!do_not_create_taskbar_shortcut && (shortcut_operation == ShellUtil::SHELL_SHORTCUT_CREATE_ALWAYS || shortcut_operation == diff --git a/chrome/installer/setup/install_unittest.cc b/chrome/installer/setup/install_unittest.cc index f9256a0..8c48202 100644 --- a/chrome/installer/setup/install_unittest.cc +++ b/chrome/installer/setup/install_unittest.cc @@ -21,6 +21,7 @@ #include "chrome/installer/setup/install_worker.h" #include "chrome/installer/setup/setup_constants.h" #include "chrome/installer/util/browser_distribution.h" +#include "chrome/installer/util/install_util.h" #include "chrome/installer/util/installer_state.h" #include "chrome/installer/util/master_preferences.h" #include "chrome/installer/util/master_preferences_constants.h" @@ -87,7 +88,8 @@ class InstallShortcutTest : public testing::Test { expected_properties_.set_description(chrome_properties.description); expected_properties_.set_dual_mode(false); expected_start_menu_properties_ = expected_properties_; - expected_start_menu_properties_.set_dual_mode(true); + expected_start_menu_properties_.set_dual_mode( + InstallUtil::ShouldInstallMetroProperties()); prefs_.reset(GetFakeMasterPrefs(false, false, false)); diff --git a/chrome/installer/setup/setup_main.cc b/chrome/installer/setup/setup_main.cc index 6b419c7..aac2781 100644 --- a/chrome/installer/setup/setup_main.cc +++ b/chrome/installer/setup/setup_main.cc @@ -880,7 +880,8 @@ installer::InstallStatus RegisterDevChrome( // Create the Start menu shortcut and pin it to the taskbar. ShellUtil::ShortcutProperties shortcut_properties(ShellUtil::CURRENT_USER); chrome.AddDefaultShortcutProperties(chrome_exe, &shortcut_properties); - shortcut_properties.set_dual_mode(true); + if (InstallUtil::ShouldInstallMetroProperties()) + shortcut_properties.set_dual_mode(true); shortcut_properties.set_pin_to_taskbar(true); ShellUtil::CreateOrUpdateShortcut( ShellUtil::SHORTCUT_LOCATION_START_MENU_CHROME_DIR, chrome_dist, |