summaryrefslogtreecommitdiffstats
path: root/chrome/common
diff options
context:
space:
mode:
authormbelshe@chromium.org <mbelshe@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-16 21:30:53 +0000
committermbelshe@chromium.org <mbelshe@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-16 21:30:53 +0000
commit93bd86a6b4678b9dfc5b263107a90131974ef529 (patch)
tree0485992481c879628ed09f53c9d9eb4dc0826de2 /chrome/common
parentaf3490e9e22d301ff9dc521f4cee04ef1a20abd5 (diff)
downloadchromium_src-93bd86a6b4678b9dfc5b263107a90131974ef529.zip
chromium_src-93bd86a6b4678b9dfc5b263107a90131974ef529.tar.gz
chromium_src-93bd86a6b4678b9dfc5b263107a90131974ef529.tar.bz2
Add Group-Policy to disable the SPDY protocol.
BUG=59105 TEST=Configuration* Review URL: http://codereview.chromium.org/3782007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@62875 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common')
-rw-r--r--chrome/common/policy_constants.cc1
-rw-r--r--chrome/common/policy_constants.h1
-rw-r--r--chrome/common/pref_names.cc3
-rw-r--r--chrome/common/pref_names.h1
4 files changed, 6 insertions, 0 deletions
diff --git a/chrome/common/policy_constants.cc b/chrome/common/policy_constants.cc
index f149a90..ffe93b4 100644
--- a/chrome/common/policy_constants.cc
+++ b/chrome/common/policy_constants.cc
@@ -31,6 +31,7 @@ const char kDefaultSearchProviderIconURL[] =
"DefaultSearchProviderIconURL";
const char kDefaultSearchProviderEncodings[] =
"DefaultSearchProviderEncodings";
+const char kDisableSpdy[] = "DisableSpdy";
const char kProxyServerMode[] = "ProxyServerMode";
const char kProxyServer[] = "ProxyServer";
const char kProxyPacUrl[] = "ProxyPacUrl";
diff --git a/chrome/common/policy_constants.h b/chrome/common/policy_constants.h
index 919bb7f..cebf36b 100644
--- a/chrome/common/policy_constants.h
+++ b/chrome/common/policy_constants.h
@@ -29,6 +29,7 @@ extern const char kDefaultSearchProviderSearchURL[];
extern const char kDefaultSearchProviderSuggestURL[];
extern const char kDefaultSearchProviderIconURL[];
extern const char kDefaultSearchProviderEncodings[];
+extern const char kDisableSpdy[];
extern const char kProxyServerMode[];
extern const char kProxyServer[];
extern const char kProxyPacUrl[];
diff --git a/chrome/common/pref_names.cc b/chrome/common/pref_names.cc
index 02d5712..fcd461b 100644
--- a/chrome/common/pref_names.cc
+++ b/chrome/common/pref_names.cc
@@ -194,6 +194,9 @@ const char kDnsPrefetchingEnabled[] = "dns_prefetching.enabled";
// next startup, based on what was actually needed during this startup.
const char kDnsStartupPrefetchList[] = "StartupDNSPrefetchList";
+// Disables the SPDY protocol.
+const char kDisableSpdy[] = "spdy.disabled";
+
// A list of host names used to fetch web pages, and their commonly used
// sub-resource hostnames (and expected latency benefits from pre-resolving, or
// preconnecting to, such sub-resource hostnames).
diff --git a/chrome/common/pref_names.h b/chrome/common/pref_names.h
index bc6bc9a..7f7acdc 100644
--- a/chrome/common/pref_names.h
+++ b/chrome/common/pref_names.h
@@ -71,6 +71,7 @@ extern const char kAlternateErrorPagesEnabled[];
extern const char kDnsPrefetchingEnabled[];
extern const char kDnsStartupPrefetchList[];
extern const char kDnsHostReferralList[];
+extern const char kDisableSpdy[];
extern const char kCookiePromptExpanded[];
extern const char kInstantConfirmDialogShown[];
extern const char kInstantEnabled[];