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

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

Issue 480513004: Stopping the history recording for a supervised user (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Refactored und reformatted. 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 unified diff | Download patch
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 880 matching lines...) Expand 10 before | Expand all | Expand 10 after
891 // Boolean controlling whether history saving is disabled. 891 // Boolean controlling whether history saving is disabled.
892 const char kSavingBrowserHistoryDisabled[] = "history.saving_disabled"; 892 const char kSavingBrowserHistoryDisabled[] = "history.saving_disabled";
893 893
894 // Boolean controlling whether deleting browsing and download history is 894 // Boolean controlling whether deleting browsing and download history is
895 // permitted. 895 // permitted.
896 const char kAllowDeletingBrowserHistory[] = "history.deleting_enabled"; 896 const char kAllowDeletingBrowserHistory[] = "history.deleting_enabled";
897 897
898 // Boolean controlling whether SafeSearch is mandatory for Google Web Searches. 898 // Boolean controlling whether SafeSearch is mandatory for Google Web Searches.
899 const char kForceSafeSearch[] = "settings.force_safesearch"; 899 const char kForceSafeSearch[] = "settings.force_safesearch";
900 900
901 // Boolean controlling whether History is recorded & synced for supervised user.
Bernhard Bauer 2014/08/20 20:50:28 Nit: either "for supervised users" or "for a super
fhorschig 2014/08/21 07:51:24 Done.
902 const char kRecordHistory[] = "settings.history_recorded";
903
901 #if defined(OS_LINUX) && !defined(OS_CHROMEOS) 904 #if defined(OS_LINUX) && !defined(OS_CHROMEOS)
902 // Linux specific preference on whether we should match the system theme. 905 // Linux specific preference on whether we should match the system theme.
903 const char kUsesSystemTheme[] = "extensions.theme.use_system"; 906 const char kUsesSystemTheme[] = "extensions.theme.use_system";
904 #endif 907 #endif
905 const char kCurrentThemePackFilename[] = "extensions.theme.pack"; 908 const char kCurrentThemePackFilename[] = "extensions.theme.pack";
906 const char kCurrentThemeID[] = "extensions.theme.id"; 909 const char kCurrentThemeID[] = "extensions.theme.id";
907 const char kCurrentThemeImages[] = "extensions.theme.images"; 910 const char kCurrentThemeImages[] = "extensions.theme.images";
908 const char kCurrentThemeColors[] = "extensions.theme.colors"; 911 const char kCurrentThemeColors[] = "extensions.theme.colors";
909 const char kCurrentThemeTints[] = "extensions.theme.tints"; 912 const char kCurrentThemeTints[] = "extensions.theme.tints";
910 const char kCurrentThemeDisplayProperties[] = "extensions.theme.properties"; 913 const char kCurrentThemeDisplayProperties[] = "extensions.theme.properties";
(...skipping 1415 matching lines...) Expand 10 before | Expand all | Expand 10 after
2326 // "mapped_title" entries, detailing the bookmark target URL (if any), the title 2329 // "mapped_title" entries, detailing the bookmark target URL (if any), the title
2327 // given by the PartnerBookmarksProvider and either the user-visible renamed 2330 // given by the PartnerBookmarksProvider and either the user-visible renamed
2328 // title or an empty string if the bookmark node was removed. 2331 // title or an empty string if the bookmark node was removed.
2329 const char kPartnerBookmarkMappings[] = "partnerbookmarks.mappings"; 2332 const char kPartnerBookmarkMappings[] = "partnerbookmarks.mappings";
2330 #endif 2333 #endif
2331 2334
2332 // Whether DNS Quick Check is disabled in proxy resolution. 2335 // Whether DNS Quick Check is disabled in proxy resolution.
2333 const char kQuickCheckEnabled[] = "proxy.quick_check_enabled"; 2336 const char kQuickCheckEnabled[] = "proxy.quick_check_enabled";
2334 2337
2335 } // namespace prefs 2338 } // namespace prefs
OLDNEW
« chrome/browser/supervised_user/supervised_user_constants.cc ('K') | « chrome/common/pref_names.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698