Support manual (white|black)list, previewing and allowing after interstitial

chrome/common/pref_names.cc

Index: chrome/common/pref_names.cc
diff --git a/chrome/common/pref_names.cc b/chrome/common/pref_names.cc
index 1995c2c473900527ea2f2b846d754d807f731f24..3fc5a7d3dc6316a7f4091eccfe7747383004c709 100644
--- a/chrome/common/pref_names.cc
+++ b/chrome/common/pref_names.cc
@@ -820,14 +820,14 @@ const char kDeauthorizeContentLicenses[] =
     "browser.clear_data.content_licenses";
 const char kDeleteTimePeriod[] = "browser.clear_data.time_period";
 
-//Family Control Prefs
-//Boolean pref controlling whether history deleting is disabled
+// Family Control Prefs
+// Boolean pref controlling whether history deleting is disabled
 const char kDeletingBrowserHistoryDisabled[] = "history.deleting_disabled";
 
 // Pref to prevent syncing on sign in.
 const char kDisableSigninSync[] = "signin.sync_disabled";
 
-//An integer pref. Holds one of three values:
+// An integer pref. Holds one of three values:
 // 0: allow sites outside of the family packs for a managed user.
 // 1: warn user if they try to access sites outside of the family packs.
 // 2: block sites outside of the family packs for a managed user.
@@ -2146,10 +2146,10 @@ const char kFlingAccelerationCurveCoefficient3[] =
 
 // Indicates whether the browser is in managed mode.
 const char kInManagedMode[] = "managed_mode";
-// Whitelist for manually approved pages.
-const char kManagedModeWhitelist[] = "managed_mode.whitelist";
-// Blacklist for manually blocked pages.
-const char kManagedModeBlacklist[] = "managed_mode.blacklist";
+// List of pages that are manually approved.
+const char kManagedModeWhitelist[] = "profile.managed.whitelist";
+// List of pages that are manually blocked.
+const char kManagedModeBlacklist[] = "profile.managed.blacklist";
 
 // Counts how many more times the 'profile on a network share' warning should be
 // shown to the user before the next silence period.