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

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: latest round from jww and sleevi 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 12 matching lines...) Expand all
23 #include "chrome/common/chrome_content_client.h" 23 #include "chrome/common/chrome_content_client.h"
24 #include "chrome/common/chrome_switches.h" 24 #include "chrome/common/chrome_switches.h"
25 #include "chrome/grit/generated_resources.h" 25 #include "chrome/grit/generated_resources.h"
26 #include "components/autofill/core/common/autofill_switches.h" 26 #include "components/autofill/core/common/autofill_switches.h"
27 #include "components/cloud_devices/common/cloud_devices_switches.h" 27 #include "components/cloud_devices/common/cloud_devices_switches.h"
28 #include "components/metrics/metrics_hashes.h" 28 #include "components/metrics/metrics_hashes.h"
29 #include "components/nacl/common/nacl_switches.h" 29 #include "components/nacl/common/nacl_switches.h"
30 #include "components/proximity_auth/switches.h" 30 #include "components/proximity_auth/switches.h"
31 #include "components/search/search_switches.h" 31 #include "components/search/search_switches.h"
32 #include "content/public/browser/user_metrics.h" 32 #include "content/public/browser/user_metrics.h"
33 #include "content/public/common/content_switches.h"
33 #include "media/base/media_switches.h" 34 #include "media/base/media_switches.h"
34 #include "ui/base/l10n/l10n_util.h" 35 #include "ui/base/l10n/l10n_util.h"
35 #include "ui/base/ui_base_switches.h" 36 #include "ui/base/ui_base_switches.h"
36 #include "ui/display/display_switches.h" 37 #include "ui/display/display_switches.h"
37 #include "ui/events/event_switches.h" 38 #include "ui/events/event_switches.h"
38 #include "ui/gfx/switches.h" 39 #include "ui/gfx/switches.h"
39 #include "ui/gl/gl_switches.h" 40 #include "ui/gl/gl_switches.h"
40 #include "ui/keyboard/keyboard_switches.h" 41 #include "ui/keyboard/keyboard_switches.h"
41 #include "ui/native_theme/native_theme_switches.h" 42 #include "ui/native_theme/native_theme_switches.h"
42 #include "ui/views/views_switches.h" 43 #include "ui/views/views_switches.h"
(...skipping 2124 matching lines...) Expand 10 before | Expand all | Expand 10 after
2167 #endif // defined(OS_MACOSX) 2168 #endif // defined(OS_MACOSX)
2168 #if defined(OS_CHROMEOS) 2169 #if defined(OS_CHROMEOS)
2169 { 2170 {
2170 "disable-timezone-tracking", 2171 "disable-timezone-tracking",
2171 IDS_FLAGS_DISABLE_RESOLVE_TIMEZONE_BY_GEOLOCATION_NAME, 2172 IDS_FLAGS_DISABLE_RESOLVE_TIMEZONE_BY_GEOLOCATION_NAME,
2172 IDS_FLAGS_DISABLE_RESOLVE_TIMEZONE_BY_GEOLOCATION_DESCRIPTION, 2173 IDS_FLAGS_DISABLE_RESOLVE_TIMEZONE_BY_GEOLOCATION_DESCRIPTION,
2173 kOsCrOS, 2174 kOsCrOS,
2174 SINGLE_VALUE_TYPE(chromeos::switches::kDisableTimeZoneTrackingOption) 2175 SINGLE_VALUE_TYPE(chromeos::switches::kDisableTimeZoneTrackingOption)
2175 }, 2176 },
2176 #endif // defined(OS_CHROMEOS) 2177 #endif // defined(OS_CHROMEOS)
2178 {
2179 "allow-insecure-localhost",
2180 IDS_ALLOW_INSECURE_LOCALHOST,
2181 IDS_ALLOW_INSECURE_LOCALHOST_DESCRIPTION,
2182 kOsAll,
2183 SINGLE_VALUE_TYPE(switches::kAllowInsecureLocalhost)
2184 },
2177 2185
2178 // NOTE: Adding new command-line switches requires adding corresponding 2186 // NOTE: Adding new command-line switches requires adding corresponding
2179 // entries to enum "LoginCustomFlags" in histograms.xml. See note in 2187 // entries to enum "LoginCustomFlags" in histograms.xml. See note in
2180 // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test. 2188 // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test.
2181 }; 2189 };
2182 2190
2183 const Experiment* experiments = kExperiments; 2191 const Experiment* experiments = kExperiments;
2184 size_t num_experiments = arraysize(kExperiments); 2192 size_t num_experiments = arraysize(kExperiments);
2185 2193
2186 // Stores and encapsulates the little state that about:flags has. 2194 // Stores and encapsulates the little state that about:flags has.
(...skipping 559 matching lines...) Expand 10 before | Expand all | Expand 10 after
2746 } 2754 }
2747 2755
2748 const Experiment* GetExperiments(size_t* count) { 2756 const Experiment* GetExperiments(size_t* count) {
2749 *count = num_experiments; 2757 *count = num_experiments;
2750 return experiments; 2758 return experiments;
2751 } 2759 }
2752 2760
2753 } // namespace testing 2761 } // namespace testing
2754 2762
2755 } // namespace about_flags 2763 } // namespace about_flags
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698