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

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

Issue 18112018: Cleanup the UseSharedProxies preference. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased. Created 7 years, 5 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 | Annotate | Revision Log
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 775 matching lines...) Expand 10 before | Expand all | Expand 10 after
786 const char kShowPlanNotifications[] = 786 const char kShowPlanNotifications[] =
787 "settings.internet.mobile.show_plan_notifications"; 787 "settings.internet.mobile.show_plan_notifications";
788 788
789 // A boolean pref of whether to show 3G promo notification. 789 // A boolean pref of whether to show 3G promo notification.
790 const char kShow3gPromoNotification[] = 790 const char kShow3gPromoNotification[] =
791 "settings.internet.mobile.show_3g_promo_notification"; 791 "settings.internet.mobile.show_3g_promo_notification";
792 792
793 // A string pref that contains version where "What's new" promo was shown. 793 // A string pref that contains version where "What's new" promo was shown.
794 const char kChromeOSReleaseNotesVersion[] = "settings.release_notes.version"; 794 const char kChromeOSReleaseNotesVersion[] = "settings.release_notes.version";
795 795
796 // A boolean pref that uses shared proxies. 796 // A boolean pref that controls whether proxy settings from shared network
797 // settings (accordingly from device policy) are applied or ignored.
797 const char kUseSharedProxies[] = "settings.use_shared_proxies"; 798 const char kUseSharedProxies[] = "settings.use_shared_proxies";
798 799
799 // Power state of the current displays from the last run. 800 // Power state of the current displays from the last run.
800 const char kDisplayPowerState[] = "settings.display.power_state"; 801 const char kDisplayPowerState[] = "settings.display.power_state";
801 // A dictionary pref that stores per display preferences. 802 // A dictionary pref that stores per display preferences.
802 const char kDisplayProperties[] = "settings.display.properties"; 803 const char kDisplayProperties[] = "settings.display.properties";
803 804
804 // A dictionary pref that specifies per-display layout/offset information. 805 // A dictionary pref that specifies per-display layout/offset information.
805 // Its key is the ID of the display and its value is a dictionary for the 806 // Its key is the ID of the display and its value is a dictionary for the
806 // layout/offset information. 807 // layout/offset information.
(...skipping 1693 matching lines...) Expand 10 before | Expand all | Expand 10 after
2500 2501
2501 // How often the bubble has been shown. 2502 // How often the bubble has been shown.
2502 extern const char kModuleConflictBubbleShown[] = "module_conflict.bubble_shown"; 2503 extern const char kModuleConflictBubbleShown[] = "module_conflict.bubble_shown";
2503 2504
2504 // A string pref for storing the salt used to compute the pepper device ID. 2505 // A string pref for storing the salt used to compute the pepper device ID.
2505 const char kDRMSalt[] = "settings.privacy.drm_salt"; 2506 const char kDRMSalt[] = "settings.privacy.drm_salt";
2506 // A boolean pref that enables the (private) pepper GetDeviceID() call. 2507 // A boolean pref that enables the (private) pepper GetDeviceID() call.
2507 const char kEnableDRM[] = "settings.privacy.drm_enabled"; 2508 const char kEnableDRM[] = "settings.privacy.drm_enabled";
2508 2509
2509 } // namespace prefs 2510 } // namespace prefs
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/options/chromeos/core_chromeos_options_handler.cc ('k') | chrome/test/base/testing_profile.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698