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

Unified Diff: chrome/browser/win/chrome_elf_init.cc

Issue 2760853002: Remove use of PRODUCT_STRING_PATH in chrome_elf. (Closed)
Patch Set: Created 3 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/BUILD.gn ('k') | chrome/browser/win/chrome_elf_init_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/win/chrome_elf_init.cc
diff --git a/chrome/browser/win/chrome_elf_init.cc b/chrome/browser/win/chrome_elf_init.cc
index 3ae357ea06133f5ce36042d9fab3afe0585ca78d..9d64fc779c6708a8a64eaeb97f7c6c0637a86471 100644
--- a/chrome/browser/win/chrome_elf_init.cc
+++ b/chrome/browser/win/chrome_elf_init.cc
@@ -13,6 +13,7 @@
#include "base/strings/utf_string_conversions.h"
#include "base/win/registry.h"
#include "chrome/common/chrome_version.h"
+#include "chrome/install_static/install_util.h"
#include "chrome_elf/blacklist/blacklist.h"
#include "chrome_elf/chrome_elf_constants.h"
#include "chrome_elf/dll_hash/dll_hash.h"
@@ -115,16 +116,19 @@ void InitializeChromeElf() {
// sandbox::MITIGATION_EXTENSION_POINT_DISABLE is set properly in reg.
// Note: the very existence of this key signals elf to not enable
// this mitigation on browser next start.
- base::win::RegKey finch_security_registry_key(
- HKEY_CURRENT_USER, elf_sec::kRegSecurityFinchPath, KEY_READ);
+ const base::string16 finch_path(install_static::GetRegistryPath().append(
+ elf_sec::kRegSecurityFinchKeyName));
+ base::win::RegKey finch_security_registry_key(HKEY_CURRENT_USER,
+ finch_path.c_str(), KEY_READ);
if (base::FeatureList::IsEnabled(features::kWinSboxDisableExtensionPoints)) {
if (finch_security_registry_key.Valid())
finch_security_registry_key.DeleteKey(L"");
} else {
- if (!finch_security_registry_key.Valid())
- finch_security_registry_key.Create(
- HKEY_CURRENT_USER, elf_sec::kRegSecurityFinchPath, KEY_WRITE);
+ if (!finch_security_registry_key.Valid()) {
+ finch_security_registry_key.Create(HKEY_CURRENT_USER, finch_path.c_str(),
+ KEY_WRITE);
+ }
}
}
« no previous file with comments | « chrome/browser/BUILD.gn ('k') | chrome/browser/win/chrome_elf_init_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698