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

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: Rebased. Created 6 years 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 2014 matching lines...) Expand 10 before | Expand all | Expand 10 after
2025 kOsAll, 2025 kOsAll,
2026 MULTI_VALUE_TYPE(kSSLVersionMinChoices) 2026 MULTI_VALUE_TYPE(kSSLVersionMinChoices)
2027 }, 2027 },
2028 { 2028 {
2029 "enable-credit-card-scan", 2029 "enable-credit-card-scan",
2030 IDS_FLAGS_ENABLE_CREDIT_CARD_SCAN_NAME, 2030 IDS_FLAGS_ENABLE_CREDIT_CARD_SCAN_NAME,
2031 IDS_FLAGS_ENABLE_CREDIT_CARD_SCAN_DESCRIPTION, 2031 IDS_FLAGS_ENABLE_CREDIT_CARD_SCAN_DESCRIPTION,
2032 kOsAndroid, 2032 kOsAndroid,
2033 SINGLE_VALUE_TYPE(autofill::switches::kEnableCreditCardScan) 2033 SINGLE_VALUE_TYPE(autofill::switches::kEnableCreditCardScan)
2034 }, 2034 },
2035 #if defined(OS_CHROMEOS)
2036 {
2037 "enable-captive-portal-bypass-proxy",
2038 IDS_FLAGS_ENABLE_CAPTIVE_PORTAL_BYPASS_PROXY_NAME,
2039 IDS_FLAGS_ENABLE_CAPTIVE_PORTAL_BYPASS_PROXY_DESCRIPTION,
2040 kOsCrOS,
2041 SINGLE_VALUE_TYPE(chromeos::switches::kEnableCaptivePortalBypassProxy)
2042 },
2043 #endif // defined(OS_CHROMEOS)
2044
2035 // NOTE: Adding new command-line switches requires adding corresponding 2045 // NOTE: Adding new command-line switches requires adding corresponding
2036 // entries to enum "LoginCustomFlags" in histograms.xml. See note in 2046 // entries to enum "LoginCustomFlags" in histograms.xml. See note in
2037 // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test. 2047 // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test.
2038 }; 2048 };
2039 2049
2040 const Experiment* experiments = kExperiments; 2050 const Experiment* experiments = kExperiments;
2041 size_t num_experiments = arraysize(kExperiments); 2051 size_t num_experiments = arraysize(kExperiments);
2042 2052
2043 // Stores and encapsulates the little state that about:flags has. 2053 // Stores and encapsulates the little state that about:flags has.
2044 class FlagsState { 2054 class FlagsState {
(...skipping 558 matching lines...) Expand 10 before | Expand all | Expand 10 after
2603 } 2613 }
2604 2614
2605 const Experiment* GetExperiments(size_t* count) { 2615 const Experiment* GetExperiments(size_t* count) {
2606 *count = num_experiments; 2616 *count = num_experiments;
2607 return experiments; 2617 return experiments;
2608 } 2618 }
2609 2619
2610 } // namespace testing 2620 } // namespace testing
2611 2621
2612 } // namespace about_flags 2622 } // namespace about_flags
OLDNEW
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/chromeos/net/network_portal_notification_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698