| Index: chrome/common/chrome_switches.cc
|
| diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc
|
| index 9ae5be1331c80367aec4bed6e0ad50864c3106dd..f75ff27c7d74fb692f9dad09f980983766c68102 100644
|
| --- a/chrome/common/chrome_switches.cc
|
| +++ b/chrome/common/chrome_switches.cc
|
| @@ -50,9 +50,6 @@ const char kAllowRunningInsecureContent[] = "allow-running-insecure-content";
|
| // automation testing of the gallery.
|
| const char kAllowScriptingGallery[] = "allow-scripting-gallery";
|
|
|
| -// Specifies comma-separated list of extension ids to grant access to local
|
| -// websocket proxy.
|
| -const char kAllowWebSocketProxy[] = "allow-websocket-proxy";
|
|
|
| // Prevents Chrome from requiring authorization to run certain widely installed
|
| // but less commonly used plug-ins.
|
| @@ -1105,6 +1102,9 @@ const char kUserDataDir[] = "user-data-dir";
|
| // Prints version information and quits.
|
| const char kVersion[] = "version";
|
|
|
| +// Adds the given extension ID to all the permission whitelists.
|
| +const char kWhitelistedExtensionID[] = "whitelisted-extension-id";
|
| +
|
| // Uses WinHTTP to fetch and evaluate PAC scripts. Otherwise the default is to
|
| // use Chromium's network stack to fetch, and V8 to evaluate.
|
| const char kWinHttpProxyResolver[] = "winhttp-proxy-resolver";
|
|
|