Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(91)

Unified Diff: chrome/browser/about_flags.cc

Issue 248863003: Add a chrome://flags item "allow-insecure-websocket-from-https-origin" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Addressed #9 Created 6 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | content/browser/renderer_host/render_process_host_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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;
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | content/browser/renderer_host/render_process_host_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698