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

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: Remove unnecessary #include 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 2177 matching lines...) Expand 10 before | Expand all | Expand 10 after
2188 #endif // defined(OS_MACOSX) 2188 #endif // defined(OS_MACOSX)
2189 #if defined(OS_CHROMEOS) 2189 #if defined(OS_CHROMEOS)
2190 { 2190 {
2191 "disable-timezone-tracking", 2191 "disable-timezone-tracking",
2192 IDS_FLAGS_DISABLE_RESOLVE_TIMEZONE_BY_GEOLOCATION_NAME, 2192 IDS_FLAGS_DISABLE_RESOLVE_TIMEZONE_BY_GEOLOCATION_NAME,
2193 IDS_FLAGS_DISABLE_RESOLVE_TIMEZONE_BY_GEOLOCATION_DESCRIPTION, 2193 IDS_FLAGS_DISABLE_RESOLVE_TIMEZONE_BY_GEOLOCATION_DESCRIPTION,
2194 kOsCrOS, 2194 kOsCrOS,
2195 SINGLE_VALUE_TYPE(chromeos::switches::kDisableTimeZoneTrackingOption) 2195 SINGLE_VALUE_TYPE(chromeos::switches::kDisableTimeZoneTrackingOption)
2196 }, 2196 },
2197 #endif // defined(OS_CHROMEOS) 2197 #endif // defined(OS_CHROMEOS)
2198 {
2199 "allow-insecure-localhost",
2200 IDS_ALLOW_INSECURE_LOCALHOST,
2201 IDS_ALLOW_INSECURE_LOCALHOST_DESCRIPTION,
2202 kOsAll,
2203 SINGLE_VALUE_TYPE(switches::kAllowInsecureLocalhost)
2204 },
2198 2205
2199 // NOTE: Adding new command-line switches requires adding corresponding 2206 // NOTE: Adding new command-line switches requires adding corresponding
2200 // entries to enum "LoginCustomFlags" in histograms.xml. See note in 2207 // entries to enum "LoginCustomFlags" in histograms.xml. See note in
2201 // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test. 2208 // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test.
2202 }; 2209 };
2203 2210
2204 const Experiment* experiments = kExperiments; 2211 const Experiment* experiments = kExperiments;
2205 size_t num_experiments = arraysize(kExperiments); 2212 size_t num_experiments = arraysize(kExperiments);
2206 2213
2207 // Stores and encapsulates the little state that about:flags has. 2214 // Stores and encapsulates the little state that about:flags has.
(...skipping 559 matching lines...) Expand 10 before | Expand all | Expand 10 after
2767 } 2774 }
2768 2775
2769 const Experiment* GetExperiments(size_t* count) { 2776 const Experiment* GetExperiments(size_t* count) {
2770 *count = num_experiments; 2777 *count = num_experiments;
2771 return experiments; 2778 return experiments;
2772 } 2779 }
2773 2780
2774 } // namespace testing 2781 } // namespace testing
2775 2782
2776 } // namespace about_flags 2783 } // namespace about_flags
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698