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

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

Issue 750153002: ChromeOS: bypass proxy for captive portal authorization. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 1 month 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 2063 matching lines...) Expand 10 before | Expand all | Expand 10 after
2074 SINGLE_VALUE_TYPE(chromeos::switches::kDisableNewZIPUnpacker) 2074 SINGLE_VALUE_TYPE(chromeos::switches::kDisableNewZIPUnpacker)
2075 }, 2075 },
2076 #endif // defined(OS_CHROMEOS) 2076 #endif // defined(OS_CHROMEOS)
2077 { 2077 {
2078 "ssl-version-min", 2078 "ssl-version-min",
2079 IDS_FLAGS_SSL_VERSION_MIN_NAME, 2079 IDS_FLAGS_SSL_VERSION_MIN_NAME,
2080 IDS_FLAGS_SSL_VERSION_MIN_DESCRIPTION, 2080 IDS_FLAGS_SSL_VERSION_MIN_DESCRIPTION,
2081 kOsAll, 2081 kOsAll,
2082 MULTI_VALUE_TYPE(kSSLVersionMinChoices) 2082 MULTI_VALUE_TYPE(kSSLVersionMinChoices)
2083 }, 2083 },
2084 #if defined(OS_CHROMEOS)
2085 {
2086 "enable-captive-portal-bypass-proxy",
2087 IDS_FLAGS_ENABLE_CAPTIVE_PORTAL_BYPASS_PROXY_NAME,
2088 IDS_FLAGS_ENABLE_CAPTIVE_PORTAL_BYPASS_PROXY_DESCRIPTION,
2089 kOsCrOS,
2090 SINGLE_VALUE_TYPE(chromeos::switches::kEnableCaptivePortalBypassProxy)
2091 },
2092 #endif // defined(OS_CHROMEOS)
2093
2084 // NOTE: Adding new command-line switches requires adding corresponding 2094 // NOTE: Adding new command-line switches requires adding corresponding
2085 // entries to enum "LoginCustomFlags" in histograms.xml. See note in 2095 // entries to enum "LoginCustomFlags" in histograms.xml. See note in
2086 // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test. 2096 // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test.
2087 }; 2097 };
2088 2098
2089 const Experiment* experiments = kExperiments; 2099 const Experiment* experiments = kExperiments;
2090 size_t num_experiments = arraysize(kExperiments); 2100 size_t num_experiments = arraysize(kExperiments);
2091 2101
2092 // Stores and encapsulates the little state that about:flags has. 2102 // Stores and encapsulates the little state that about:flags has.
2093 class FlagsState { 2103 class FlagsState {
(...skipping 565 matching lines...) Expand 10 before | Expand all | Expand 10 after
2659 } 2669 }
2660 2670
2661 const Experiment* GetExperiments(size_t* count) { 2671 const Experiment* GetExperiments(size_t* count) {
2662 *count = num_experiments; 2672 *count = num_experiments;
2663 return experiments; 2673 return experiments;
2664 } 2674 }
2665 2675
2666 } // namespace testing 2676 } // namespace testing
2667 2677
2668 } // namespace about_flags 2678 } // namespace about_flags
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698