summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrobertshield <robertshield@chromium.org>2016-02-05 10:11:41 -0800
committerCommit bot <commit-bot@chromium.org>2016-02-05 18:12:33 +0000
commitea10edfd4e79b4af75b71889dfb3b19c95d46295 (patch)
tree6b196f4de0e76c2f251a5dbd2ef271f956e0823d
parent8d74626043d3c38b749ab8becd2de1972baf5420 (diff)
downloadchromium_src-ea10edfd4e79b4af75b71889dfb3b19c95d46295.zip
chromium_src-ea10edfd4e79b4af75b71889dfb3b19c95d46295.tar.gz
chromium_src-ea10edfd4e79b4af75b71889dfb3b19c95d46295.tar.bz2
Stop using PRODUCT_STRING_PATH in the TriggeredProfileResetter.
BUG=577820 Review URL: https://codereview.chromium.org/1661043002 Cr-Commit-Position: refs/heads/master@{#373846}
-rw-r--r--chrome/browser/profile_resetter/triggered_profile_resetter.h6
-rw-r--r--chrome/browser/profile_resetter/triggered_profile_resetter_win.cc15
2 files changed, 14 insertions, 7 deletions
diff --git a/chrome/browser/profile_resetter/triggered_profile_resetter.h b/chrome/browser/profile_resetter/triggered_profile_resetter.h
index 45aa88d..0def51d 100644
--- a/chrome/browser/profile_resetter/triggered_profile_resetter.h
+++ b/chrome/browser/profile_resetter/triggered_profile_resetter.h
@@ -22,10 +22,8 @@ class Profile;
//
// To use this mechanism from a third party tool, perform the following steps:
// 1) Create (or open) the registry key
-// HKCU\Software\$PRODUCT_STRING_PATH\TriggeredReset where
-// $PRODUCT_STRING_PATH is one of the values in
-// chrome\common\chrome_constants.h, currently either "Google\\Chrome" or
-// "Chromium".
+// HKCU\Software\$PRODUCT_NAME\TriggeredReset where $PRODUCT_NAME is one
+// of the values "Google\\Chrome" or "Chromium".
// 2) Set a REG_SZ value called "ToolName" to the localized name of the tool.
// This string (truncated to kMaxToolNameLength) will be displayed in a
// notification UI. The "ToolName" should be just the name of the tool,
diff --git a/chrome/browser/profile_resetter/triggered_profile_resetter_win.cc b/chrome/browser/profile_resetter/triggered_profile_resetter_win.cc
index d1eb9e9..db5426b 100644
--- a/chrome/browser/profile_resetter/triggered_profile_resetter_win.cc
+++ b/chrome/browser/profile_resetter/triggered_profile_resetter_win.cc
@@ -10,14 +10,23 @@
#include "base/metrics/histogram_macros.h"
#include "base/win/registry.h"
#include "chrome/browser/profiles/profile.h"
-#include "chrome/common/chrome_constants.h"
#include "chrome/common/pref_names.h"
#include "components/prefs/pref_service.h"
+#if defined(GOOGLE_CHROME_BUILD)
+#define PRODUCT_NAME L"Google\\Chrome"
+#elif defined(CHROMIUM_BUILD)
+#define PRODUCT_NAME L"Chromium"
+#else
+#error Unknown branding
+#endif
+
// The registry path where the TriggeredReset values get set. Note that this
-// uses the same path for both SxS (Canary) and non-SxS Chrome.
+// uses the same path for both SxS (Canary) and non-SxS Chrome. This is
+// intended to allow third parties to use the API without needing to be
+// aware of and maintain changes to Chrome's channel logic.
const wchar_t kTriggeredResetRegistryPath[] =
- L"Software\\" PRODUCT_STRING_PATH L"\\TriggeredReset";
+ L"Software\\" PRODUCT_NAME L"\\TriggeredReset";
const wchar_t kTriggeredResetToolName[] = L"ToolName";
const wchar_t kTriggeredResetTimestamp[] = L"Timestamp";