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

Side by Side Diff: chrome/browser/about_flags.cc

Issue 887223005: Skip interstitials and don't block requests for localhost SSL errors (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase again Created 5 years, 10 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 unified diff | Download patch
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/chrome_content_browser_client.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/about_flags.h" 5 #include "chrome/browser/about_flags.h"
6 6
7 #include <iterator> 7 #include <iterator>
8 #include <map> 8 #include <map>
9 #include <set> 9 #include <set>
10 #include <utility> 10 #include <utility>
(...skipping 2163 matching lines...) Expand 10 before | Expand all | Expand 10 after
2174 #if defined(ENABLE_DATA_REDUCTION_PROXY_DEBUGGING) 2174 #if defined(ENABLE_DATA_REDUCTION_PROXY_DEBUGGING)
2175 { 2175 {
2176 "enable-data-reduction-proxy-bypass-warnings", 2176 "enable-data-reduction-proxy-bypass-warnings",
2177 IDS_FLAGS_ENABLE_DATA_REDUCTION_PROXY_BYPASS_WARNING_NAME, 2177 IDS_FLAGS_ENABLE_DATA_REDUCTION_PROXY_BYPASS_WARNING_NAME,
2178 IDS_FLAGS_ENABLE_DATA_REDUCTION_PROXY_BYPASS_WARNING_DESCRIPTION, 2178 IDS_FLAGS_ENABLE_DATA_REDUCTION_PROXY_BYPASS_WARNING_DESCRIPTION,
2179 kOsAndroid, 2179 kOsAndroid,
2180 SINGLE_VALUE_TYPE(data_reduction_proxy::switches:: 2180 SINGLE_VALUE_TYPE(data_reduction_proxy::switches::
2181 kEnableDataReductionProxyBypassWarning) 2181 kEnableDataReductionProxyBypassWarning)
2182 }, 2182 },
2183 #endif 2183 #endif
2184 {
2185 "allow-insecure-localhost",
2186 IDS_ALLOW_INSECURE_LOCALHOST,
2187 IDS_ALLOW_INSECURE_LOCALHOST_DESCRIPTION,
2188 kOsAll,
2189 SINGLE_VALUE_TYPE(switches::kAllowInsecureLocalhost)
2190 },
2184 2191
2185 // NOTE: Adding new command-line switches requires adding corresponding 2192 // NOTE: Adding new command-line switches requires adding corresponding
2186 // entries to enum "LoginCustomFlags" in histograms.xml. See note in 2193 // entries to enum "LoginCustomFlags" in histograms.xml. See note in
2187 // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test. 2194 // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test.
2188 }; 2195 };
2189 2196
2190 const Experiment* experiments = kExperiments; 2197 const Experiment* experiments = kExperiments;
2191 size_t num_experiments = arraysize(kExperiments); 2198 size_t num_experiments = arraysize(kExperiments);
2192 2199
2193 // Stores and encapsulates the little state that about:flags has. 2200 // Stores and encapsulates the little state that about:flags has.
(...skipping 583 matching lines...) Expand 10 before | Expand all | Expand 10 after
2777 } 2784 }
2778 2785
2779 const Experiment* GetExperiments(size_t* count) { 2786 const Experiment* GetExperiments(size_t* count) {
2780 *count = num_experiments; 2787 *count = num_experiments;
2781 return experiments; 2788 return experiments;
2782 } 2789 }
2783 2790
2784 } // namespace testing 2791 } // namespace testing
2785 2792
2786 } // namespace about_flags 2793 } // namespace about_flags
OLDNEW
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/chrome_content_browser_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698