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

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

Issue 1130613002: Clean up Noto Sans UI stuff. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 7 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 2182 matching lines...) Expand 10 before | Expand all | Expand 10 after
2193 autofill::switches::kDisableCreditCardScan) 2193 autofill::switches::kDisableCreditCardScan)
2194 }, 2194 },
2195 #if defined(OS_CHROMEOS) 2195 #if defined(OS_CHROMEOS)
2196 { 2196 {
2197 "disable-captive-portal-bypass-proxy", 2197 "disable-captive-portal-bypass-proxy",
2198 IDS_FLAGS_DISABLE_CAPTIVE_PORTAL_BYPASS_PROXY_NAME, 2198 IDS_FLAGS_DISABLE_CAPTIVE_PORTAL_BYPASS_PROXY_NAME,
2199 IDS_FLAGS_DISABLE_CAPTIVE_PORTAL_BYPASS_PROXY_DESCRIPTION, 2199 IDS_FLAGS_DISABLE_CAPTIVE_PORTAL_BYPASS_PROXY_DESCRIPTION,
2200 kOsCrOS, 2200 kOsCrOS,
2201 SINGLE_VALUE_TYPE(chromeos::switches::kDisableCaptivePortalBypassProxy) 2201 SINGLE_VALUE_TYPE(chromeos::switches::kDisableCaptivePortalBypassProxy)
2202 }, 2202 },
2203 {
2204 "disable-roboto-font-ui",
2205 IDS_FLAGS_DISABLE_ROBOTO_FONT_UI_NAME,
2206 IDS_FLAGS_DISABLE_ROBOTO_FONT_UI_DESCRIPTION,
2207 kOsCrOS,
2208 SINGLE_VALUE_TYPE(switches::kDisableRobotoFontUI)
2209 },
2210 #endif // defined(OS_CHROMEOS) 2203 #endif // defined(OS_CHROMEOS)
2211 #if defined(OS_ANDROID) 2204 #if defined(OS_ANDROID)
2212 { 2205 {
2213 "enable-seccomp-filter-sandbox", 2206 "enable-seccomp-filter-sandbox",
2214 IDS_FLAGS_ENABLE_SECCOMP_FILTER_SANDBOX_ANDROID_NAME, 2207 IDS_FLAGS_ENABLE_SECCOMP_FILTER_SANDBOX_ANDROID_NAME,
2215 IDS_FLAGS_ENABLE_SECCOMP_FILTER_SANDBOX_ANDROID_DESCRIPTION, 2208 IDS_FLAGS_ENABLE_SECCOMP_FILTER_SANDBOX_ANDROID_DESCRIPTION,
2216 kOsAndroid, 2209 kOsAndroid,
2217 SINGLE_VALUE_TYPE(switches::kEnableSeccompFilterSandbox) 2210 SINGLE_VALUE_TYPE(switches::kEnableSeccompFilterSandbox)
2218 }, 2211 },
2219 #endif 2212 #endif
(...skipping 797 matching lines...) Expand 10 before | Expand all | Expand 10 after
3017 } 3010 }
3018 3011
3019 const Experiment* GetExperiments(size_t* count) { 3012 const Experiment* GetExperiments(size_t* count) {
3020 *count = num_experiments; 3013 *count = num_experiments;
3021 return experiments; 3014 return experiments;
3022 } 3015 }
3023 3016
3024 } // namespace testing 3017 } // namespace testing
3025 3018
3026 } // namespace about_flags 3019 } // namespace about_flags
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698