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

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

Issue 1968653002: Rename flags for Origin Trials framework (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address comments Created 4 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') | content/child/runtime_features.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 1700 matching lines...) Expand 10 before | Expand all | Expand 10 after
1711 {"enable-md-extensions", IDS_FLAGS_ENABLE_MATERIAL_DESIGN_EXTENSIONS_NAME, 1711 {"enable-md-extensions", IDS_FLAGS_ENABLE_MATERIAL_DESIGN_EXTENSIONS_NAME,
1712 IDS_FLAGS_ENABLE_MATERIAL_DESIGN_EXTENSIONS_DESCRIPTION, kOsDesktop, 1712 IDS_FLAGS_ENABLE_MATERIAL_DESIGN_EXTENSIONS_DESCRIPTION, kOsDesktop,
1713 SINGLE_VALUE_TYPE(switches::kEnableMaterialDesignExtensions)}, 1713 SINGLE_VALUE_TYPE(switches::kEnableMaterialDesignExtensions)},
1714 #endif 1714 #endif
1715 #if defined(OS_WIN) || defined(OS_LINUX) 1715 #if defined(OS_WIN) || defined(OS_LINUX)
1716 {"enable-input-ime-api", IDS_FLAGS_ENABLE_INPUT_IME_API_NAME, 1716 {"enable-input-ime-api", IDS_FLAGS_ENABLE_INPUT_IME_API_NAME,
1717 IDS_FLAGS_ENABLE_INPUT_IME_API_DESCRIPTION, kOsWin | kOsLinux, 1717 IDS_FLAGS_ENABLE_INPUT_IME_API_DESCRIPTION, kOsWin | kOsLinux,
1718 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableInputImeAPI, 1718 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableInputImeAPI,
1719 switches::kDisableInputImeAPI)}, 1719 switches::kDisableInputImeAPI)},
1720 #endif // defined(OS_WIN) || defined(OS_LINUX) 1720 #endif // defined(OS_WIN) || defined(OS_LINUX)
1721 {"enable-experimental-framework", IDS_FLAGS_EXPERIMENTAL_FRAMEWORK_NAME, 1721 {"enable-origin-trials", IDS_FLAGS_ORIGIN_TRIALS_NAME,
1722 IDS_FLAGS_EXPERIMENTAL_FRAMEWORK_DESCRIPTION, kOsAll, 1722 IDS_FLAGS_ORIGIN_TRIALS_DESCRIPTION, kOsAll,
1723 FEATURE_VALUE_TYPE(features::kExperimentalFramework)}, 1723 FEATURE_VALUE_TYPE(features::kOriginTrials)},
1724 {"enable-brotli", IDS_FLAGS_ENABLE_BROTLI_NAME, 1724 {"enable-brotli", IDS_FLAGS_ENABLE_BROTLI_NAME,
1725 IDS_FLAGS_ENABLE_BROTLI_DESCRIPTION, kOsAll, 1725 IDS_FLAGS_ENABLE_BROTLI_DESCRIPTION, kOsAll,
1726 FEATURE_VALUE_TYPE(features::kBrotliEncoding)}, 1726 FEATURE_VALUE_TYPE(features::kBrotliEncoding)},
1727 {"enable-webusb", IDS_FLAGS_ENABLE_WEB_USB_NAME, 1727 {"enable-webusb", IDS_FLAGS_ENABLE_WEB_USB_NAME,
1728 IDS_FLAGS_ENABLE_WEB_USB_DESCRIPTION, kOsAll, 1728 IDS_FLAGS_ENABLE_WEB_USB_DESCRIPTION, kOsAll,
1729 FEATURE_VALUE_TYPE(features::kWebUsb)}, 1729 FEATURE_VALUE_TYPE(features::kWebUsb)},
1730 #if defined(OS_ANDROID) 1730 #if defined(OS_ANDROID)
1731 {"disable-unified-media-pipeline", 1731 {"disable-unified-media-pipeline",
1732 IDS_FLAGS_DISABLE_UNIFIED_MEDIA_PIPELINE_NAME, 1732 IDS_FLAGS_DISABLE_UNIFIED_MEDIA_PIPELINE_NAME,
1733 IDS_FLAGS_DISABLE_UNIFIED_MEDIA_PIPELINE_DESCRIPTION, kOsAndroid, 1733 IDS_FLAGS_DISABLE_UNIFIED_MEDIA_PIPELINE_DESCRIPTION, kOsAndroid,
(...skipping 333 matching lines...) Expand 10 before | Expand all | Expand 10 after
2067 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; 2067 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0;
2068 2068
2069 const FeatureEntry* GetFeatureEntries(size_t* count) { 2069 const FeatureEntry* GetFeatureEntries(size_t* count) {
2070 *count = arraysize(kFeatureEntries); 2070 *count = arraysize(kFeatureEntries);
2071 return kFeatureEntries; 2071 return kFeatureEntries;
2072 } 2072 }
2073 2073
2074 } // namespace testing 2074 } // namespace testing
2075 2075
2076 } // namespace about_flags 2076 } // namespace about_flags
OLDNEW
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | content/child/runtime_features.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698