From 400f8cdff3a81258f6ae0b817d9182ee991bb4a3 Mon Sep 17 00:00:00 2001 From: "krstnmnlsn@chromium.org" Date: Tue, 24 Jun 2014 01:52:43 +0000 Subject: Blacklist registry keys now stored under chromium name for chromium builds. BUG= Review URL: https://codereview.chromium.org/349693002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@279267 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome_elf/chrome_elf_constants.cc | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'chrome_elf') diff --git a/chrome_elf/chrome_elf_constants.cc b/chrome_elf/chrome_elf_constants.cc index a7ee1c9..ffb9b9d 100644 --- a/chrome_elf/chrome_elf_constants.cc +++ b/chrome_elf/chrome_elf_constants.cc @@ -5,6 +5,14 @@ #include "chrome_elf/chrome_elf_constants.h" #if defined(GOOGLE_CHROME_BUILD) +#define PRODUCT_STRING_PATH L"Google\\Chrome" +#elif defined(CHROMIUM_BUILD) +#define PRODUCT_STRING_PATH L"Chromium" +#else +#error Unknown branding +#endif + +#if defined(GOOGLE_CHROME_BUILD) const wchar_t kAppDataDirName[] = L"Google\\Chrome"; #else const wchar_t kAppDataDirName[] = L"Chromium"; @@ -16,9 +24,10 @@ const wchar_t kUserDataDirName[] = L"User Data"; namespace blacklist { -const wchar_t kRegistryBeaconPath[] = L"SOFTWARE\\Google\\Chrome\\BLBeacon"; +const wchar_t kRegistryBeaconPath[] = + L"SOFTWARE\\" PRODUCT_STRING_PATH L"\\BLBeacon"; const wchar_t kRegistryFinchListPath[] = - L"SOFTWARE\\Google\\Chrome\\BLFinchList"; + L"SOFTWARE\\" PRODUCT_STRING_PATH L"\\BLFinchList"; const wchar_t kBeaconVersion[] = L"version"; const wchar_t kBeaconState[] = L"state"; const wchar_t kBeaconAttemptCount[] = L"failed_count"; -- cgit v1.1