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

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

Issue 818433003: ChromeOS: Implement CaptivePortalAuthenticationIgnoresProxy policy. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Tests fixed. Created 5 years, 9 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
« no previous file with comments | « chrome/app/chromeos_strings.grdp ('k') | chrome/browser/chromeos/login/lock/screen_locker.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 2038 matching lines...) Expand 10 before | Expand all | Expand 10 after
2049 kOsAndroid, 2049 kOsAndroid,
2050 ENABLE_DISABLE_VALUE_TYPE(autofill::switches::kEnableCreditCardScan, 2050 ENABLE_DISABLE_VALUE_TYPE(autofill::switches::kEnableCreditCardScan,
2051 autofill::switches::kDisableCreditCardScan) 2051 autofill::switches::kDisableCreditCardScan)
2052 }, 2052 },
2053 #if defined(OS_CHROMEOS) 2053 #if defined(OS_CHROMEOS)
2054 { 2054 {
2055 "enable-captive-portal-bypass-proxy", 2055 "enable-captive-portal-bypass-proxy",
2056 IDS_FLAGS_ENABLE_CAPTIVE_PORTAL_BYPASS_PROXY_NAME, 2056 IDS_FLAGS_ENABLE_CAPTIVE_PORTAL_BYPASS_PROXY_NAME,
2057 IDS_FLAGS_ENABLE_CAPTIVE_PORTAL_BYPASS_PROXY_DESCRIPTION, 2057 IDS_FLAGS_ENABLE_CAPTIVE_PORTAL_BYPASS_PROXY_DESCRIPTION,
2058 kOsCrOS, 2058 kOsCrOS,
2059 SINGLE_VALUE_TYPE(chromeos::switches::kEnableCaptivePortalBypassProxy) 2059 SINGLE_VALUE_TYPE(chromeos::switches::kEnableCaptivePortalBypassProxyOption)
2060 }, 2060 },
2061 { 2061 {
2062 "disable-roboto-font-ui", 2062 "disable-roboto-font-ui",
2063 IDS_FLAGS_DISABLE_ROBOTO_FONT_UI_NAME, 2063 IDS_FLAGS_DISABLE_ROBOTO_FONT_UI_NAME,
2064 IDS_FLAGS_DISABLE_ROBOTO_FONT_UI_DESCRIPTION, 2064 IDS_FLAGS_DISABLE_ROBOTO_FONT_UI_DESCRIPTION,
2065 kOsCrOS, 2065 kOsCrOS,
2066 SINGLE_VALUE_TYPE(switches::kDisableRobotoFontUI) 2066 SINGLE_VALUE_TYPE(switches::kDisableRobotoFontUI)
2067 }, 2067 },
2068 #endif // defined(OS_CHROMEOS) 2068 #endif // defined(OS_CHROMEOS)
2069 #if defined(OS_ANDROID) 2069 #if defined(OS_ANDROID)
(...skipping 711 matching lines...) Expand 10 before | Expand all | Expand 10 after
2781 } 2781 }
2782 2782
2783 const Experiment* GetExperiments(size_t* count) { 2783 const Experiment* GetExperiments(size_t* count) {
2784 *count = num_experiments; 2784 *count = num_experiments;
2785 return experiments; 2785 return experiments;
2786 } 2786 }
2787 2787
2788 } // namespace testing 2788 } // namespace testing
2789 2789
2790 } // namespace about_flags 2790 } // namespace about_flags
OLDNEW
« no previous file with comments | « chrome/app/chromeos_strings.grdp ('k') | chrome/browser/chromeos/login/lock/screen_locker.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698