diff options
| author | sdefresne <sdefresne@chromium.org> | 2015-11-26 06:57:03 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-11-26 14:57:59 +0000 |
| commit | 7557365f301cf48f5fc25fcc480fcd44331f7a7c (patch) | |
| tree | d69a5bed5efdf2315ee48ef4c2468a0bbe3dc313 /ios | |
| parent | 80c0fb255a11e696aa9d50968dc605f7273a4d92 (diff) | |
| download | chromium_src-7557365f301cf48f5fc25fcc480fcd44331f7a7c.zip chromium_src-7557365f301cf48f5fc25fcc480fcd44331f7a7c.tar.gz chromium_src-7557365f301cf48f5fc25fcc480fcd44331f7a7c.tar.bz2 | |
Upstream some additional switches used on iOS.
BUG=551954
Review URL: https://codereview.chromium.org/1475363002
Cr-Commit-Position: refs/heads/master@{#361891}
Diffstat (limited to 'ios')
| -rw-r--r-- | ios/chrome/browser/chrome_switches.cc | 3 | ||||
| -rw-r--r-- | ios/chrome/browser/chrome_switches.h | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/ios/chrome/browser/chrome_switches.cc b/ios/chrome/browser/chrome_switches.cc index 47711ff..258f952 100644 --- a/ios/chrome/browser/chrome_switches.cc +++ b/ios/chrome/browser/chrome_switches.cc @@ -97,6 +97,9 @@ const char kUserAgent[] = "user-agent"; // These mappings only apply to the host resolver. const char kIOSHostResolverRules[] = "host-resolver-rules"; +// Ignores certificate-related errors. +const char kIOSIgnoreCertificateErrors[] = "ignore-certificate-errors"; + // Allows for forcing socket connections to http/https to use fixed ports. const char kIOSTestingFixedHttpPort[] = "testing-fixed-http-port"; const char kIOSTestingFixedHttpsPort[] = "testing-fixed-https-port"; diff --git a/ios/chrome/browser/chrome_switches.h b/ios/chrome/browser/chrome_switches.h index 9436fb0..c5c0e07 100644 --- a/ios/chrome/browser/chrome_switches.h +++ b/ios/chrome/browser/chrome_switches.h @@ -37,6 +37,7 @@ extern const char kIOSMetricsRecordingOnly[]; extern const char kUserAgent[]; extern const char kIOSHostResolverRules[]; +extern const char kIOSIgnoreCertificateErrors[]; extern const char kIOSTestingFixedHttpPort[]; extern const char kIOSTestingFixedHttpsPort[]; |