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

Unified Diff: chrome/browser/prefs/chrome_pref_service_factory.cc

Issue 444253002: Prefs: Only use IDR_PREF_HASH_SEED_BIN in Chrome builds. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 6 years, 4 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/prefs/chrome_pref_service_factory.cc
===================================================================
--- chrome/browser/prefs/chrome_pref_service_factory.cc (revision 287601)
+++ chrome/browser/prefs/chrome_pref_service_factory.cc (working copy)
@@ -352,13 +352,16 @@
// ways to defer preference loading until the device ID can be used.
rlz_lib::GetMachineId(&device_id);
#endif
+ std::string seed;
+#if defined(GOOGLE_CHROME_BUILD)
+ seed = ResourceBundle::GetSharedInstance().GetRawDataResource(
+ IDR_PREF_HASH_SEED_BIN).as_string(),
+#endif
return make_scoped_ptr(new ProfilePrefStoreManager(
profile_path,
GetTrackingConfiguration(),
kTrackedPrefsReportingIDsCount,
- ResourceBundle::GetSharedInstance()
- .GetRawDataResource(IDR_PREF_HASH_SEED_BIN)
- .as_string(),
+ seed,
device_id,
g_browser_process->local_state()));
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698