Chromium Code Reviews| Index: chrome/common/chrome_switches.cc |
| diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc |
| index a7adf4f2d808f17b93a9d872bc9822f0abceebd9..6a5d6be42547596588eba81d09f1a40f629f5ec4 100644 |
| --- a/chrome/common/chrome_switches.cc |
| +++ b/chrome/common/chrome_switches.cc |
| @@ -328,6 +328,9 @@ const char kDisableDeviceDiscoveryNotifications[] = |
| // Disables retrieval of PAC URLs from DHCP as per the WPAD standard. |
| const char kDisableDhcpWpad[] = "disable-dhcp-wpad"; |
| +// Force-disables DNS probes on main frame DNS errors. |
| +const char kDisableDnsProbes[] = "disable-dns-probes"; |
|
Yaron
2013/11/25 23:49:33
Merge error?
yefimt
2013/11/26 00:14:48
Yes, thank you
On 2013/11/25 23:49:33, Yaron wrote
|
| + |
| // Disable extensions. |
| const char kDisableExtensions[] = "disable-extensions"; |
| @@ -587,6 +590,9 @@ const char kEnableDeviceDiscoveryNotifications[] = |
| // Enables the DOM distiller. |
| const char kEnableDomDistiller[] = "enable-dom-distiller"; |
| +// Enable Enhanced Bookmarks. |
| +const char kEnableEnhancedBookmarks[] = "enable-enhanced-bookmarks"; |
| + |
| // Enables experimentation with ephemeral apps, which are launched without |
| // installing in Chrome. |
| const char kEnableEphemeralApps[] = "enable-ephemeral-apps"; |