| Index: chrome/common/pref_names.cc
|
| diff --git a/chrome/common/pref_names.cc b/chrome/common/pref_names.cc
|
| index c8eb8f1cdd0eceed4bc4a607f77ec24d03c66852..b002a54b3bdbb7f3c4e50361f98444a963a65e93 100644
|
| --- a/chrome/common/pref_names.cc
|
| +++ b/chrome/common/pref_names.cc
|
| @@ -949,6 +949,7 @@ const char kGeolocationEnabled[] = "geolocation.enabled";
|
| // Dictionary that maps [frame, toplevel] to their Geolocation content setting.
|
| const char kGeolocationContentSettings[] = "geolocation.content_settings";
|
|
|
| +
|
| // Preference to disable 3D APIs (WebGL, Pepper 3D).
|
| const char kDisable3DAPIs[] = "disable_3d_apis";
|
|
|
| @@ -1825,6 +1826,8 @@ const char kManagedDefaultGeolocationSetting[] =
|
| "profile.managed_default_content_settings.geolocation";
|
| const char kManagedDefaultNotificationsSetting[] =
|
| "profile.managed_default_content_settings.notifications";
|
| +const char kManagedDefaultMediaStreamSetting[] =
|
| + "mediastream.default_content_settings";
|
|
|
| // Preferences that are exclusively used to store managed
|
| // content settings patterns.
|
|
|