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

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: address jshin@'s comments. 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
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | ui/base/BUILD.gn » ('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 2204 matching lines...) Expand 10 before | Expand all | Expand 10 after
2215 autofill::switches::kDisableCreditCardScan) 2215 autofill::switches::kDisableCreditCardScan)
2216 }, 2216 },
2217 #if defined(OS_CHROMEOS) 2217 #if defined(OS_CHROMEOS)
2218 { 2218 {
2219 "disable-captive-portal-bypass-proxy", 2219 "disable-captive-portal-bypass-proxy",
2220 IDS_FLAGS_DISABLE_CAPTIVE_PORTAL_BYPASS_PROXY_NAME, 2220 IDS_FLAGS_DISABLE_CAPTIVE_PORTAL_BYPASS_PROXY_NAME,
2221 IDS_FLAGS_DISABLE_CAPTIVE_PORTAL_BYPASS_PROXY_DESCRIPTION, 2221 IDS_FLAGS_DISABLE_CAPTIVE_PORTAL_BYPASS_PROXY_DESCRIPTION,
2222 kOsCrOS, 2222 kOsCrOS,
2223 SINGLE_VALUE_TYPE(chromeos::switches::kDisableCaptivePortalBypassProxy) 2223 SINGLE_VALUE_TYPE(chromeos::switches::kDisableCaptivePortalBypassProxy)
2224 }, 2224 },
2225 {
2226 "disable-roboto-font-ui",
2227 IDS_FLAGS_DISABLE_ROBOTO_FONT_UI_NAME,
2228 IDS_FLAGS_DISABLE_ROBOTO_FONT_UI_DESCRIPTION,
2229 kOsCrOS,
2230 SINGLE_VALUE_TYPE(switches::kDisableRobotoFontUI)
2231 },
2232 #endif // defined(OS_CHROMEOS) 2225 #endif // defined(OS_CHROMEOS)
2233 #if defined(OS_ANDROID) 2226 #if defined(OS_ANDROID)
2234 { 2227 {
2235 "enable-seccomp-filter-sandbox", 2228 "enable-seccomp-filter-sandbox",
2236 IDS_FLAGS_ENABLE_SECCOMP_FILTER_SANDBOX_ANDROID_NAME, 2229 IDS_FLAGS_ENABLE_SECCOMP_FILTER_SANDBOX_ANDROID_NAME,
2237 IDS_FLAGS_ENABLE_SECCOMP_FILTER_SANDBOX_ANDROID_DESCRIPTION, 2230 IDS_FLAGS_ENABLE_SECCOMP_FILTER_SANDBOX_ANDROID_DESCRIPTION,
2238 kOsAndroid, 2231 kOsAndroid,
2239 SINGLE_VALUE_TYPE(switches::kEnableSeccompFilterSandbox) 2232 SINGLE_VALUE_TYPE(switches::kEnableSeccompFilterSandbox)
2240 }, 2233 },
2241 #endif 2234 #endif
(...skipping 815 matching lines...) Expand 10 before | Expand all | Expand 10 after
3057 } 3050 }
3058 3051
3059 const Experiment* GetExperiments(size_t* count) { 3052 const Experiment* GetExperiments(size_t* count) {
3060 *count = num_experiments; 3053 *count = num_experiments;
3061 return experiments; 3054 return experiments;
3062 } 3055 }
3063 3056
3064 } // namespace testing 3057 } // namespace testing
3065 3058
3066 } // namespace about_flags 3059 } // namespace about_flags
OLDNEW
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | ui/base/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698