Skip to content

Commit

Permalink
Blacklist registry keys now stored under chromium name for chromium b…
Browse files Browse the repository at this point in the history
…uilds.

BUG=

Review URL: https://codereview.chromium.org/349693002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@279267 0039d316-1c4b-4281-b951-d872f2087c98
  • Loading branch information
krstnmnlsn@chromium.org committed Jun 24, 2014
1 parent 6550438 commit 400f8cd
Showing 1 changed file with 11 additions and 2 deletions.
13 changes: 11 additions & 2 deletions chrome_elf/chrome_elf_constants.cc
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,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
Expand All @@ -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";
Expand Down

0 comments on commit 400f8cd

Please sign in to comment.