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

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

Issue 2437943002: Ship WebBluetooth out of origin trial (Closed)
Patch Set: address more comments Created 4 years, 1 month 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/browser/policy/policy_browsertest.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 801 matching lines...) Expand 10 before | Expand all | Expand 10 after
812 IDS_FLAGS_GPU_RASTERIZATION_DESCRIPTION, kOsAll, 812 IDS_FLAGS_GPU_RASTERIZATION_DESCRIPTION, kOsAll,
813 MULTI_VALUE_TYPE(kEnableGpuRasterizationChoices)}, 813 MULTI_VALUE_TYPE(kEnableGpuRasterizationChoices)},
814 {"gpu-rasterization-msaa-sample-count", 814 {"gpu-rasterization-msaa-sample-count",
815 IDS_FLAGS_GPU_RASTERIZATION_MSAA_SAMPLE_COUNT_NAME, 815 IDS_FLAGS_GPU_RASTERIZATION_MSAA_SAMPLE_COUNT_NAME,
816 IDS_FLAGS_GPU_RASTERIZATION_MSAA_SAMPLE_COUNT_DESCRIPTION, kOsAll, 816 IDS_FLAGS_GPU_RASTERIZATION_MSAA_SAMPLE_COUNT_DESCRIPTION, kOsAll,
817 MULTI_VALUE_TYPE(kGpuRasterizationMSAASampleCountChoices)}, 817 MULTI_VALUE_TYPE(kGpuRasterizationMSAASampleCountChoices)},
818 {"enable-experimental-web-platform-features", 818 {"enable-experimental-web-platform-features",
819 IDS_FLAGS_EXPERIMENTAL_WEB_PLATFORM_FEATURES_NAME, 819 IDS_FLAGS_EXPERIMENTAL_WEB_PLATFORM_FEATURES_NAME,
820 IDS_FLAGS_EXPERIMENTAL_WEB_PLATFORM_FEATURES_DESCRIPTION, kOsAll, 820 IDS_FLAGS_EXPERIMENTAL_WEB_PLATFORM_FEATURES_DESCRIPTION, kOsAll,
821 SINGLE_VALUE_TYPE(switches::kEnableExperimentalWebPlatformFeatures)}, 821 SINGLE_VALUE_TYPE(switches::kEnableExperimentalWebPlatformFeatures)},
822 {"enable-web-bluetooth", IDS_FLAGS_WEB_BLUETOOTH_NAME,
823 IDS_FLAGS_WEB_BLUETOOTH_DESCRIPTION,
824 kOsCrOS | kOsMac | kOsAndroid | kOsLinux,
825 SINGLE_VALUE_TYPE(switches::kEnableWebBluetooth)},
826 #if defined(ENABLE_EXTENSIONS) 822 #if defined(ENABLE_EXTENSIONS)
827 {"enable-ble-advertising-in-apps", 823 {"enable-ble-advertising-in-apps",
828 IDS_FLAGS_BLE_ADVERTISING_IN_EXTENSIONS_NAME, 824 IDS_FLAGS_BLE_ADVERTISING_IN_EXTENSIONS_NAME,
829 IDS_FLAGS_BLE_ADVERTISING_IN_EXTENSIONS_DESCRIPTION, kOsCrOS, 825 IDS_FLAGS_BLE_ADVERTISING_IN_EXTENSIONS_DESCRIPTION, kOsCrOS,
830 SINGLE_VALUE_TYPE(extensions::switches::kEnableBLEAdvertising)}, 826 SINGLE_VALUE_TYPE(extensions::switches::kEnableBLEAdvertising)},
831 #endif // ENABLE_EXTENSIONS 827 #endif // ENABLE_EXTENSIONS
832 {"enable-devtools-experiments", IDS_FLAGS_DEVTOOLS_EXPERIMENTS_NAME, 828 {"enable-devtools-experiments", IDS_FLAGS_DEVTOOLS_EXPERIMENTS_NAME,
833 IDS_FLAGS_DEVTOOLS_EXPERIMENTS_DESCRIPTION, kOsDesktop, 829 IDS_FLAGS_DEVTOOLS_EXPERIMENTS_DESCRIPTION, kOsDesktop,
834 SINGLE_VALUE_TYPE(switches::kEnableDevToolsExperiments)}, 830 SINGLE_VALUE_TYPE(switches::kEnableDevToolsExperiments)},
835 {"silent-debugger-extension-api", 831 {"silent-debugger-extension-api",
(...skipping 1440 matching lines...) Expand 10 before | Expand all | Expand 10 after
2276 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; 2272 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0;
2277 2273
2278 const FeatureEntry* GetFeatureEntries(size_t* count) { 2274 const FeatureEntry* GetFeatureEntries(size_t* count) {
2279 *count = arraysize(kFeatureEntries); 2275 *count = arraysize(kFeatureEntries);
2280 return kFeatureEntries; 2276 return kFeatureEntries;
2281 } 2277 }
2282 2278
2283 } // namespace testing 2279 } // namespace testing
2284 2280
2285 } // namespace about_flags 2281 } // namespace about_flags
OLDNEW
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/policy/policy_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698