Index: chrome/browser/about_flags.cc |
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc |
index 0752edd30e1df35d8e8f93b1d42e8a77eddf4d29..631a72cad02cbff658b1d52e74593fe312f7664c 100644 |
--- a/chrome/browser/about_flags.cc |
+++ b/chrome/browser/about_flags.cc |
@@ -1786,6 +1786,15 @@ const Experiment kExperiments[] = { |
SINGLE_VALUE_TYPE(chromeos::switches::kEnableFileManagerMTP) |
}, |
#endif |
+ // TODO(tyoshino): Remove this temporary flag and command line switch. See |
+ // crbug.com/366483 for the target milestone. |
+ { |
+ "allow-insecure-websocket-from-https-origin", |
+ IDS_FLAGS_ALLOW_INSECURE_WEBSOCKET_FROM_HTTPS_ORIGIN_NAME, |
+ IDS_FLAGS_ALLOW_INSECURE_WEBSOCKET_FROM_HTTPS_ORIGIN_DESCRIPTION, |
+ kOsAll, |
+ SINGLE_VALUE_TYPE(switches::kAllowInsecureWebSocketFromHttpsOrigin) |
+ }, |
}; |
const Experiment* experiments = kExperiments; |