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

chrome/common/pref_names.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/common/pref_names.h"
 
 #include "base/basictypes.h"
 
 namespace prefs {
 
@@ skipping 802 matching lines @@
 const char kDeleteDownloadHistory[] = "browser.clear_data.download_history";
 const char kDeleteCache[] = "browser.clear_data.cache";
 const char kDeleteCookies[] = "browser.clear_data.cookies";
 const char kDeletePasswords[] = "browser.clear_data.passwords";
 const char kDeleteFormData[] = "browser.clear_data.form_data";
 const char kDeleteHostedAppsData[] = "browser.clear_data.hosted_apps_data";
 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.
 const char kFamilyPackOptions[] = "browser.family_pack_options";
 
 // A boolean pref controlling the use of a password to lock chrome
 const char kChildLockDisabled[] = "child.locking_disabled";
 
 // Boolean pref to define the default values for using spellchecker.
 const char kEnableSpellCheck[] = "browser.enable_spellchecking";
@@ skipping 1298 matching lines @@
 const char kFlingAccelerationCurveCoefficient1[] =
     "gesture.fling_acceleration_curve_coefficient_1";
 const char kFlingAccelerationCurveCoefficient2[] =
     "gesture.fling_acceleration_curve_coefficient_2";
 const char kFlingAccelerationCurveCoefficient3[] =
     "gesture.fling_acceleration_curve_coefficient_3";
 #endif
 
 // Indicates whether the browser is in managed mode.
 const char kInManagedMode[] = "managed_mode";
-// Whitelist for manually approved pages.
+// List of pages that are manually approved.
 const char kManagedModeWhitelist[] = "managed_mode.whitelist";

[Bernhard Bauer, 2012/11/26 16:06:30]

Could you change this to "profile.managed.whitelist"?

[Sergiu, 2012/11/27 15:37:34]

Done.

-// Blacklist for manually blocked pages.
+// List of pages that are manually blocked.
 const char kManagedModeBlacklist[] = "managed_mode.blacklist";
 
 // Counts how many more times the 'profile on a network share' warning should be
 // shown to the user before the next silence period.
 const char kNetworkProfileWarningsLeft[] = "network_profile.warnings_left";
 // Tracks the time of the last shown warning. Used to reset
 // |network_profile.warnings_left| after a silence period.
 const char kNetworkProfileLastWarningTime[] =
     "network_profile.last_warning_time";
 
 // 64-bit serialization of the time last policy usage statistics were collected
 // by UMA_HISTOGRAM_ENUMERATION.
 const char kLastPolicyStatisticsUpdate[] = "policy.last_statistics_update";
 
 }  // namespace prefs