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

Side by Side Diff: chrome/browser/extensions/api/preference/preference_api.cc

Issue 1413393003: Change WebRTC IP handling policy from multiple booleans to an enum. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: address devlin's comments. Created 5 years, 1 month 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/browser/extensions/api/preference/preference_api.h" 5 #include "chrome/browser/extensions/api/preference/preference_api.h"
6 6
7 #include <map> 7 #include <map>
8 #include <utility> 8 #include <utility>
9 9
10 #include "base/lazy_instance.h" 10 #include "base/lazy_instance.h"
(...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after
112 APIPermission::kPrivacy}, 112 APIPermission::kPrivacy},
113 {"searchSuggestEnabled", prefs::kSearchSuggestEnabled, 113 {"searchSuggestEnabled", prefs::kSearchSuggestEnabled,
114 APIPermission::kPrivacy, APIPermission::kPrivacy}, 114 APIPermission::kPrivacy, APIPermission::kPrivacy},
115 {"spellingServiceEnabled", prefs::kSpellCheckUseSpellingService, 115 {"spellingServiceEnabled", prefs::kSpellCheckUseSpellingService,
116 APIPermission::kPrivacy, APIPermission::kPrivacy}, 116 APIPermission::kPrivacy, APIPermission::kPrivacy},
117 {"thirdPartyCookiesAllowed", prefs::kBlockThirdPartyCookies, 117 {"thirdPartyCookiesAllowed", prefs::kBlockThirdPartyCookies,
118 APIPermission::kPrivacy, APIPermission::kPrivacy}, 118 APIPermission::kPrivacy, APIPermission::kPrivacy},
119 {"translationServiceEnabled", prefs::kEnableTranslate, 119 {"translationServiceEnabled", prefs::kEnableTranslate,
120 APIPermission::kPrivacy, APIPermission::kPrivacy}, 120 APIPermission::kPrivacy, APIPermission::kPrivacy},
121 #if defined(ENABLE_WEBRTC) 121 #if defined(ENABLE_WEBRTC)
122 // webRTCMultipleRoutesEnabled and webRTCNonProxiedUdpEnabled have become
123 // obsoleted and replaced by webRTCIPHandlingPolicy. Leaving it to allow
Devlin 2015/10/27 20:45:44 s/become obsoleted and/been/
guoweis_left_chromium 2015/10/28 16:39:51 Done.
124 // reading from it. TODO(guoweis): Remove this in M50.
Devlin 2015/10/27 20:45:44 But not just reading now, right? So this should p
guoweis_left_chromium 2015/10/28 16:39:51 Done.
122 {"webRTCMultipleRoutesEnabled", prefs::kWebRTCMultipleRoutesEnabled, 125 {"webRTCMultipleRoutesEnabled", prefs::kWebRTCMultipleRoutesEnabled,
123 APIPermission::kPrivacy, APIPermission::kPrivacy}, 126 APIPermission::kPrivacy, APIPermission::kPrivacy},
124 {"webRTCNonProxiedUdpEnabled", prefs::kWebRTCNonProxiedUdpEnabled, 127 {"webRTCNonProxiedUdpEnabled", prefs::kWebRTCNonProxiedUdpEnabled,
125 APIPermission::kPrivacy, APIPermission::kPrivacy}, 128 APIPermission::kPrivacy, APIPermission::kPrivacy},
129 {"webRTCIPHandlingPolicy", prefs::kWebRTCIPHandlingPolicy,
130 APIPermission::kPrivacy, APIPermission::kPrivacy},
126 #endif 131 #endif
127 // accessibilityFeatures.animationPolicy is available for 132 // accessibilityFeatures.animationPolicy is available for
128 // all platforms but the others from accessibilityFeatures 133 // all platforms but the others from accessibilityFeatures
129 // is only available for OS_CHROMEOS. 134 // is only available for OS_CHROMEOS.
130 {"animationPolicy", prefs::kAnimationPolicy, 135 {"animationPolicy", prefs::kAnimationPolicy,
131 APIPermission::kAccessibilityFeaturesRead, 136 APIPermission::kAccessibilityFeaturesRead,
132 APIPermission::kAccessibilityFeaturesModify}, 137 APIPermission::kAccessibilityFeaturesModify},
133 #if defined(OS_CHROMEOS) 138 #if defined(OS_CHROMEOS)
134 {"autoclick", prefs::kAccessibilityAutoclickEnabled, 139 {"autoclick", prefs::kAccessibilityAutoclickEnabled,
135 APIPermission::kAccessibilityFeaturesRead, 140 APIPermission::kAccessibilityFeaturesRead,
(...skipping 648 matching lines...) Expand 10 before | Expand all | Expand 10 after
784 pref_key, PreferenceFunction::PERMISSION_TYPE_WRITE, &browser_pref)) { 789 pref_key, PreferenceFunction::PERMISSION_TYPE_WRITE, &browser_pref)) {
785 return false; 790 return false;
786 } 791 }
787 792
788 PreferenceAPI::Get(GetProfile()) 793 PreferenceAPI::Get(GetProfile())
789 ->RemoveExtensionControlledPref(extension_id(), browser_pref, scope); 794 ->RemoveExtensionControlledPref(extension_id(), browser_pref, scope);
790 return true; 795 return true;
791 } 796 }
792 797
793 } // namespace extensions 798 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698