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

Unified Diff: chrome/browser/managed_mode/managed_user_service.cc

Issue 12217132: Revert 181898 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 7 years, 10 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
Index: chrome/browser/managed_mode/managed_user_service.cc
===================================================================
--- chrome/browser/managed_mode/managed_user_service.cc (revision 181902)
+++ chrome/browser/managed_mode/managed_user_service.cc (working copy)
@@ -107,6 +107,12 @@
registry->RegisterIntegerPref(prefs::kDefaultManagedModeFilteringBehavior,
ManagedModeURLFilter::BLOCK,
PrefRegistrySyncable::UNSYNCABLE_PREF);
+ registry->RegisterStringPref(prefs::kManagedModeLocalPassphrase,
+ "",
+ PrefRegistrySyncable::UNSYNCABLE_PREF);
+ registry->RegisterStringPref(prefs::kManagedModeLocalSalt,
+ "",
+ PrefRegistrySyncable::UNSYNCABLE_PREF);
}
scoped_refptr<const ManagedModeURLFilter>
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/resources/options/managed_user_set_passphrase.css » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698