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

Side by Side Diff: chrome/common/pref_names.cc

Issue 1056003003: Policy: Ignore ForceSafeSearch if ForceGoogleSafeSearch or ForceYoutubeSafetyMode are enabled (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix Android Created 5 years, 8 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 unified diff | Download patch
« no previous file with comments | « chrome/common/pref_names.h ('k') | components/policy/resources/policy_templates.json » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/common/pref_names.h" 5 #include "chrome/common/pref_names.h"
6 6
7 #include "base/basictypes.h" 7 #include "base/basictypes.h"
8 #include "chrome/common/pref_font_webkit_names.h" 8 #include "chrome/common/pref_font_webkit_names.h"
9 9
10 namespace prefs { 10 namespace prefs {
(...skipping 862 matching lines...) Expand 10 before | Expand all | Expand 10 after
873 const char kSpeechRecognitionTrayNotificationShownContexts[] = 873 const char kSpeechRecognitionTrayNotificationShownContexts[] =
874 "browser.speechinput_tray_notification_shown_contexts"; 874 "browser.speechinput_tray_notification_shown_contexts";
875 875
876 // Boolean controlling whether history saving is disabled. 876 // Boolean controlling whether history saving is disabled.
877 const char kSavingBrowserHistoryDisabled[] = "history.saving_disabled"; 877 const char kSavingBrowserHistoryDisabled[] = "history.saving_disabled";
878 878
879 // Boolean controlling whether deleting browsing and download history is 879 // Boolean controlling whether deleting browsing and download history is
880 // permitted. 880 // permitted.
881 const char kAllowDeletingBrowserHistory[] = "history.deleting_enabled"; 881 const char kAllowDeletingBrowserHistory[] = "history.deleting_enabled";
882 882
883 // Boolean controlling whether SafeSearch is mandatory for Google Web Searches
884 // and also whether Safety Mode is mandatory on YouTube.
885 // DEPRECATED: This is replaced by kForceGoogleSafeSearch and
886 // kForceYouTubeSafetyMode, and still exists for legacy reasons only.
887 const char kForceSafeSearch[] = "settings.force_safesearch";
888
889 // Boolean controlling whether SafeSearch is mandatory for Google Web Searches. 883 // Boolean controlling whether SafeSearch is mandatory for Google Web Searches.
890 const char kForceGoogleSafeSearch[] = "settings.force_google_safesearch"; 884 const char kForceGoogleSafeSearch[] = "settings.force_google_safesearch";
891 885
892 // Boolean controlling whether Safety Mode is mandatory on YouTube. 886 // Boolean controlling whether Safety Mode is mandatory on YouTube.
893 const char kForceYouTubeSafetyMode[] = "settings.force_youtube_safety_mode"; 887 const char kForceYouTubeSafetyMode[] = "settings.force_youtube_safety_mode";
894 888
895 // Boolean controlling whether History is recorded and synced for 889 // Boolean controlling whether History is recorded and synced for
896 // supervised users. 890 // supervised users.
897 const char kRecordHistory[] = "settings.history_recorded"; 891 const char kRecordHistory[] = "settings.history_recorded";
898 892
(...skipping 1395 matching lines...) Expand 10 before | Expand all | Expand 10 after
2294 // (name and a list of clients that registered the whitelist). 2288 // (name and a list of clients that registered the whitelist).
2295 const char kRegisteredSupervisedUserWhitelists[] = 2289 const char kRegisteredSupervisedUserWhitelists[] =
2296 "supervised_users.whitelists"; 2290 "supervised_users.whitelists";
2297 2291
2298 #if defined(ENABLE_EXTENSIONS) 2292 #if defined(ENABLE_EXTENSIONS)
2299 // Policy that indicates how to handle animated images. 2293 // Policy that indicates how to handle animated images.
2300 const char kAnimationPolicy[] = "settings.a11y.animation_policy"; 2294 const char kAnimationPolicy[] = "settings.a11y.animation_policy";
2301 #endif 2295 #endif
2302 2296
2303 } // namespace prefs 2297 } // namespace prefs
OLDNEW
« no previous file with comments | « chrome/common/pref_names.h ('k') | components/policy/resources/policy_templates.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698