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

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: Added warning in console on localhost SSL errors 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
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 2136 matching lines...) Expand 10 before | Expand all | Expand 10 after
2147 }, 2147 },
2148 #if defined(OS_CHROMEOS) 2148 #if defined(OS_CHROMEOS)
2149 { 2149 {
2150 "enable-timezone-tracking", 2150 "enable-timezone-tracking",
2151 IDS_FLAGS_ENABLE_RESOLVE_TIMEZONE_BY_GEOLOCATION_NAME, 2151 IDS_FLAGS_ENABLE_RESOLVE_TIMEZONE_BY_GEOLOCATION_NAME,
2152 IDS_FLAGS_ENABLE_RESOLVE_TIMEZONE_BY_GEOLOCATION_DESCRIPTION, 2152 IDS_FLAGS_ENABLE_RESOLVE_TIMEZONE_BY_GEOLOCATION_DESCRIPTION,
2153 kOsCrOS, 2153 kOsCrOS,
2154 SINGLE_VALUE_TYPE(chromeos::switches::kEnableTimeZoneTrackingOption) 2154 SINGLE_VALUE_TYPE(chromeos::switches::kEnableTimeZoneTrackingOption)
2155 }, 2155 },
2156 #endif // defined(OS_CHROMEOS) 2156 #endif // defined(OS_CHROMEOS)
2157 {
2158 "allow-insecure-localhost",
2159 IDS_ALLOW_INSECURE_LOCALHOST,
2160 IDS_ALLOW_INSECURE_LOCALHOST_DESCRIPTION,
2161 kOsAll,
2162 SINGLE_VALUE_TYPE(switches::kAllowInsecureLocalhost)
2163 },
2157 2164
2158 // NOTE: Adding new command-line switches requires adding corresponding 2165 // NOTE: Adding new command-line switches requires adding corresponding
2159 // entries to enum "LoginCustomFlags" in histograms.xml. See note in 2166 // entries to enum "LoginCustomFlags" in histograms.xml. See note in
2160 // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test. 2167 // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test.
2161 }; 2168 };
2162 2169
2163 const Experiment* experiments = kExperiments; 2170 const Experiment* experiments = kExperiments;
2164 size_t num_experiments = arraysize(kExperiments); 2171 size_t num_experiments = arraysize(kExperiments);
2165 2172
2166 // Stores and encapsulates the little state that about:flags has. 2173 // Stores and encapsulates the little state that about:flags has.
(...skipping 559 matching lines...) Expand 10 before | Expand all | Expand 10 after
2726 } 2733 }
2727 2734
2728 const Experiment* GetExperiments(size_t* count) { 2735 const Experiment* GetExperiments(size_t* count) {
2729 *count = num_experiments; 2736 *count = num_experiments;
2730 return experiments; 2737 return experiments;
2731 } 2738 }
2732 2739
2733 } // namespace testing 2740 } // namespace testing
2734 2741
2735 } // namespace about_flags 2742 } // namespace about_flags
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698