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

Unified Diff: chrome/installer/util/shell_util.cc

Issue 1573243010: Follow up to https://codereview.chromium.org/1581473002 for Metro removal in installer (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@metro-mode-2
Patch Set: dual_mode Created 4 years, 11 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/installer/util/shell_util.h ('k') | chrome/installer/util/shell_util_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/installer/util/shell_util.cc
diff --git a/chrome/installer/util/shell_util.cc b/chrome/installer/util/shell_util.cc
index b6b0ba92d2660e669e87e92902b8065c9e3bcfb4..3a36d1d2f1043998ac95e61b246f29149ae59c11 100644
--- a/chrome/installer/util/shell_util.cc
+++ b/chrome/installer/util/shell_util.cc
@@ -300,6 +300,7 @@ void GetProgIdEntries(const ApplicationInfo& app_info,
entries->push_back(new RegistryEntry(
prog_id_path + ShellUtil::kRegShellOpen, ShellUtil::kRegDelegateExecute,
app_info.delegate_clsid));
+ // TODO(scottmg): Simplify after Metro removal. https://crbug.com/558054.
entries->back()->set_removal_flag(RegistryEntry::RemovalFlag::VALUE);
}
@@ -380,6 +381,7 @@ void GetChromeProgIdEntries(BrowserDistribution* dist,
GetChromeDelegateExecuteEntries(chrome_exe, app_info);
// Remove the keys (not only their values) so that Windows will continue
// to launch Chrome without a pesky association error.
+ // TODO(scottmg): Simplify after Metro removal. https://crbug.com/558054.
for (RegistryEntry* entry : delegate_execute_entries)
entry->set_removal_flag(RegistryEntry::RemovalFlag::KEY);
// Move |delegate_execute_entries| to |entries|.
@@ -967,9 +969,6 @@ base::win::ShortcutProperties TranslateShortcutProperties(
if (properties.has_app_id())
shortcut_properties.set_app_id(properties.app_id);
- if (properties.has_dual_mode())
- shortcut_properties.set_dual_mode(properties.dual_mode);
-
return shortcut_properties;
}
@@ -1379,7 +1378,6 @@ const wchar_t* ShellUtil::kRegOpenWithProgids = L"OpenWithProgids";
ShellUtil::ShortcutProperties::ShortcutProperties(ShellChange level_in)
: level(level_in),
icon_index(0),
- dual_mode(false),
pin_to_taskbar(false),
options(0U) {}
« no previous file with comments | « chrome/installer/util/shell_util.h ('k') | chrome/installer/util/shell_util_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698