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

Side by Side Diff: chrome/common/pref_names.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: update GYP file with right order. 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/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 1180 matching lines...) Expand 10 before | Expand all | Expand 10 after
1191 // Used to indicate whether or not the toolbar redesign bubble has been shown 1191 // Used to indicate whether or not the toolbar redesign bubble has been shown
1192 // and acknowledged, and the last time the bubble was shown. 1192 // and acknowledged, and the last time the bubble was shown.
1193 const char kToolbarIconSurfacingBubbleAcknowledged[] = 1193 const char kToolbarIconSurfacingBubbleAcknowledged[] =
1194 "toolbar_icon_surfacing_bubble_acknowledged"; 1194 "toolbar_icon_surfacing_bubble_acknowledged";
1195 const char kToolbarIconSurfacingBubbleLastShowTime[] = 1195 const char kToolbarIconSurfacingBubbleLastShowTime[] =
1196 "toolbar_icon_surfacing_bubble_show_time"; 1196 "toolbar_icon_surfacing_bubble_show_time";
1197 #endif 1197 #endif
1198 1198
1199 #if defined(ENABLE_WEBRTC) 1199 #if defined(ENABLE_WEBRTC)
1200 // Whether WebRTC should bind to individual NICs to explore all possible routing 1200 // Whether WebRTC should bind to individual NICs to explore all possible routing
1201 // options. Default is true. 1201 // options. Default is true. This has become obsoleted and replaced by
1202 // kWebRTCIPHandlingPolicy. TODO(guoweis): Remove this at M50.
1202 const char kWebRTCMultipleRoutesEnabled[] = "webrtc.multiple_routes_enabled"; 1203 const char kWebRTCMultipleRoutesEnabled[] = "webrtc.multiple_routes_enabled";
1203 // Whether WebRTC should use non-proxied UDP. If false, WebRTC will not send UDP 1204 // Whether WebRTC should use non-proxied UDP. If false, WebRTC will not send UDP
1204 // unless it goes through a proxy (i.e RETURN when it's available). If no UDP 1205 // unless it goes through a proxy (i.e RETURN when it's available). If no UDP
1205 // proxy is configured, it will not send UDP. If true, WebRTC will send UDP 1206 // proxy is configured, it will not send UDP. If true, WebRTC will send UDP
1206 // regardless of whether or not a proxy is configured. 1207 // regardless of whether or not a proxy is configured. TODO(guoweis): Remove
1208 // this at M50.
1207 const char kWebRTCNonProxiedUdpEnabled[] = 1209 const char kWebRTCNonProxiedUdpEnabled[] =
1208 "webrtc.nonproxied_udp_enabled"; 1210 "webrtc.nonproxied_udp_enabled";
1211 // Define the IP handling policy override that WebRTC should follow. When not
1212 // set, it defaults to "default".
1213 const char kWebRTCIPHandlingPolicy[] = "webrtc.ip_handling_policy";
1209 #endif 1214 #endif
1210 1215
1211 // *************** LOCAL STATE *************** 1216 // *************** LOCAL STATE ***************
1212 // These are attached to the machine/installation 1217 // These are attached to the machine/installation
1213 1218
1214 // A pref to configure networks device-wide. Its value must be a list of 1219 // A pref to configure networks device-wide. Its value must be a list of
1215 // NetworkConfigurations according to the OpenNetworkConfiguration 1220 // NetworkConfigurations according to the OpenNetworkConfiguration
1216 // specification. 1221 // specification.
1217 // Currently, this pref is only used to store the policy. The user's 1222 // Currently, this pref is only used to store the policy. The user's
1218 // configuration is still stored in Shill. 1223 // configuration is still stored in Shill.
(...skipping 963 matching lines...) Expand 10 before | Expand all | Expand 10 after
2182 "supervised_users.whitelists"; 2187 "supervised_users.whitelists";
2183 2188
2184 #if defined(ENABLE_EXTENSIONS) 2189 #if defined(ENABLE_EXTENSIONS)
2185 // Policy that indicates how to handle animated images. 2190 // Policy that indicates how to handle animated images.
2186 const char kAnimationPolicy[] = "settings.a11y.animation_policy"; 2191 const char kAnimationPolicy[] = "settings.a11y.animation_policy";
2187 #endif 2192 #endif
2188 2193
2189 const char kBackgroundTracingLastUpload[] = "background_tracing.last_upload"; 2194 const char kBackgroundTracingLastUpload[] = "background_tracing.last_upload";
2190 2195
2191 } // namespace prefs 2196 } // namespace prefs
OLDNEW
« no previous file with comments | « chrome/common/pref_names.h ('k') | chrome/test/data/extensions/api_test/preference/standard/test.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698