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

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

Issue 889533002: Revert "Enable Roboto by default for testing purpose." (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 10 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') | chrome/test/data/chromeos/oobe_webui_browsertest.js » ('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 2071 matching lines...) Expand 10 before | Expand all | Expand 10 after
2082 }, 2082 },
2083 #if defined(OS_CHROMEOS) 2083 #if defined(OS_CHROMEOS)
2084 { 2084 {
2085 "enable-captive-portal-bypass-proxy", 2085 "enable-captive-portal-bypass-proxy",
2086 IDS_FLAGS_ENABLE_CAPTIVE_PORTAL_BYPASS_PROXY_NAME, 2086 IDS_FLAGS_ENABLE_CAPTIVE_PORTAL_BYPASS_PROXY_NAME,
2087 IDS_FLAGS_ENABLE_CAPTIVE_PORTAL_BYPASS_PROXY_DESCRIPTION, 2087 IDS_FLAGS_ENABLE_CAPTIVE_PORTAL_BYPASS_PROXY_DESCRIPTION,
2088 kOsCrOS, 2088 kOsCrOS,
2089 SINGLE_VALUE_TYPE(chromeos::switches::kEnableCaptivePortalBypassProxy) 2089 SINGLE_VALUE_TYPE(chromeos::switches::kEnableCaptivePortalBypassProxy)
2090 }, 2090 },
2091 { 2091 {
2092 "disable-roboto-font-ui", 2092 "enable-roboto-font-ui",
2093 IDS_FLAGS_DISABLE_ROBOTO_FONT_UI_NAME, 2093 IDS_FLAGS_ENABLE_ROBOTO_FONT_UI_NAME,
2094 IDS_FLAGS_DISABLE_ROBOTO_FONT_UI_DESCRIPTION, 2094 IDS_FLAGS_ENABLE_ROBOTO_FONT_UI_DESCRIPTION,
2095 kOsCrOS, 2095 kOsCrOS,
2096 SINGLE_VALUE_TYPE(switches::kDisableRobotoFontUI) 2096 SINGLE_VALUE_TYPE(switches::kEnableRobotoFontUI)
2097 }, 2097 },
2098 #endif // defined(OS_CHROMEOS) 2098 #endif // defined(OS_CHROMEOS)
2099 #if defined(OS_ANDROID) 2099 #if defined(OS_ANDROID)
2100 { 2100 {
2101 "enable-seccomp-filter-sandbox", 2101 "enable-seccomp-filter-sandbox",
2102 IDS_FLAGS_ENABLE_SECCOMP_FILTER_SANDBOX_ANDROID_NAME, 2102 IDS_FLAGS_ENABLE_SECCOMP_FILTER_SANDBOX_ANDROID_NAME,
2103 IDS_FLAGS_ENABLE_SECCOMP_FILTER_SANDBOX_ANDROID_DESCRIPTION, 2103 IDS_FLAGS_ENABLE_SECCOMP_FILTER_SANDBOX_ANDROID_DESCRIPTION,
2104 kOsAndroid, 2104 kOsAndroid,
2105 SINGLE_VALUE_TYPE(switches::kEnableSeccompFilterSandbox) 2105 SINGLE_VALUE_TYPE(switches::kEnableSeccompFilterSandbox)
2106 }, 2106 },
(...skipping 623 matching lines...) Expand 10 before | Expand all | Expand 10 after
2730 } 2730 }
2731 2731
2732 const Experiment* GetExperiments(size_t* count) { 2732 const Experiment* GetExperiments(size_t* count) {
2733 *count = num_experiments; 2733 *count = num_experiments;
2734 return experiments; 2734 return experiments;
2735 } 2735 }
2736 2736
2737 } // namespace testing 2737 } // namespace testing
2738 2738
2739 } // namespace about_flags 2739 } // namespace about_flags
OLDNEW
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/test/data/chromeos/oobe_webui_browsertest.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698