summaryrefslogtreecommitdiffstats
path: root/chrome/installer
diff options
context:
space:
mode:
authorrogerta@chromium.org <rogerta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-06-23 21:22:39 +0000
committerrogerta@chromium.org <rogerta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-06-23 21:22:39 +0000
commit7c04346463996ea0d940d7543ab423bd7e6dccf3 (patch)
treef39d23aba0486ea6539fee355534b7ba23f6103e /chrome/installer
parent63fe39ddae0993008b25e0d663639a790f8e7eee (diff)
downloadchromium_src-7c04346463996ea0d940d7543ab423bd7e6dccf3.zip
chromium_src-7c04346463996ea0d940d7543ab423bd7e6dccf3.tar.gz
chromium_src-7c04346463996ea0d940d7543ab423bd7e6dccf3.tar.bz2
Add helper function to GoogleUpdateSettings to retrieve the reactivation
brand code from the registry. BUG=None TEST=no user visible change Review URL: http://codereview.chromium.org/7229018 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@90269 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/installer')
-rw-r--r--chrome/installer/util/google_update_constants.cc1
-rw-r--r--chrome/installer/util/google_update_constants.h1
-rw-r--r--chrome/installer/util/google_update_settings.cc5
-rw-r--r--chrome/installer/util/google_update_settings.h5
4 files changed, 12 insertions, 0 deletions
diff --git a/chrome/installer/util/google_update_constants.cc b/chrome/installer/util/google_update_constants.cc
index cc73915..1380cc5 100644
--- a/chrome/installer/util/google_update_constants.cc
+++ b/chrome/installer/util/google_update_constants.cc
@@ -35,6 +35,7 @@ const wchar_t kRegNameField[] = L"name";
const wchar_t kRegOldVersionField[] = L"opv";
const wchar_t kRegOopcrashesField[] = L"oopcrashes";
const wchar_t kRegRLZBrandField[] = L"brand";
+const wchar_t kRegRLZReactivationBrandField[] = L"reactivationbrand";
const wchar_t kRegReferralField[] = L"referral";
const wchar_t kRegRenameCmdField[] = L"cmd";
const wchar_t kRegSendsPingsField[] = L"SendsPings";
diff --git a/chrome/installer/util/google_update_constants.h b/chrome/installer/util/google_update_constants.h
index 90580cc..26106e8 100644
--- a/chrome/installer/util/google_update_constants.h
+++ b/chrome/installer/util/google_update_constants.h
@@ -44,6 +44,7 @@ extern const wchar_t kRegNameField[];
extern const wchar_t kRegOldVersionField[];
extern const wchar_t kRegOopcrashesField[];
extern const wchar_t kRegRLZBrandField[];
+extern const wchar_t kRegRLZReactivationBrandField[];
extern const wchar_t kRegReferralField[];
extern const wchar_t kRegRenameCmdField[];
extern const wchar_t kRegSendsPingsField[];
diff --git a/chrome/installer/util/google_update_settings.cc b/chrome/installer/util/google_update_settings.cc
index a1cd48e..4572494 100644
--- a/chrome/installer/util/google_update_settings.cc
+++ b/chrome/installer/util/google_update_settings.cc
@@ -347,6 +347,11 @@ bool GoogleUpdateSettings::GetBrand(std::wstring* brand) {
return ReadGoogleUpdateStrKey(google_update::kRegRLZBrandField, brand);
}
+bool GoogleUpdateSettings::GetReactivationBrand(std::wstring* brand) {
+ return ReadGoogleUpdateStrKey(google_update::kRegRLZReactivationBrandField,
+ brand);
+}
+
bool GoogleUpdateSettings::GetClient(std::wstring* client) {
return ReadGoogleUpdateStrKey(google_update::kRegClientField, client);
}
diff --git a/chrome/installer/util/google_update_settings.h b/chrome/installer/util/google_update_settings.h
index cc331bd..888ba73 100644
--- a/chrome/installer/util/google_update_settings.h
+++ b/chrome/installer/util/google_update_settings.h
@@ -77,6 +77,11 @@ class GoogleUpdateSettings {
// assigned to a partner. Returns false if the information is not available.
static bool GetBrand(std::wstring* brand);
+ // Returns in |brand| the RLZ reactivation brand code or distribution tag
+ // that has been assigned to a partner for reactivating a dormant chrome
+ // install. Returns false if the information is not available.
+ static bool GetReactivationBrand(std::wstring* brand);
+
// Returns in |client| the google_update client field, which is currently
// used to track experiments. Returns false if the entry does not exist.
static bool GetClient(std::wstring* client);