| Index: chrome/common/pref_names.cc
 | 
| ===================================================================
 | 
| --- chrome/common/pref_names.cc	(revision 69758)
 | 
| +++ chrome/common/pref_names.cc	(working copy)
 | 
| @@ -631,9 +631,6 @@
 | 
|  // 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";
 | 
| -
 | 
|  // *************** LOCAL STATE ***************
 | 
|  // These are attached to the machine/installation
 | 
|  
 | 
| 
 | 
| Property changes on: chrome/common/pref_names.cc
 | 
| ___________________________________________________________________
 | 
| Deleted: svn:mergeinfo
 | 
| 
 | 
| 
 |