OLD | NEW |
---|---|
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 2339 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
2350 {"lsd-permission-prompt", flag_descriptions::kLsdPermissionPromptName, | 2350 {"lsd-permission-prompt", flag_descriptions::kLsdPermissionPromptName, |
2351 flag_descriptions::kLsdPermissionPromptDescription, kOsAndroid, | 2351 flag_descriptions::kLsdPermissionPromptDescription, kOsAndroid, |
2352 FEATURE_VALUE_TYPE(features::kLsdPermissionPrompt)}, | 2352 FEATURE_VALUE_TYPE(features::kLsdPermissionPrompt)}, |
2353 #endif | 2353 #endif |
2354 | 2354 |
2355 #if defined(OS_CHROMEOS) | 2355 #if defined(OS_CHROMEOS) |
2356 {"enable-touchscreen-calibration", | 2356 {"enable-touchscreen-calibration", |
2357 flag_descriptions::kTouchscreenCalibrationName, | 2357 flag_descriptions::kTouchscreenCalibrationName, |
2358 flag_descriptions::kTouchscreenCalibrationDescription, kOsCrOS, | 2358 flag_descriptions::kTouchscreenCalibrationDescription, kOsCrOS, |
2359 SINGLE_VALUE_TYPE(chromeos::switches::kEnableTouchCalibrationSetting)}, | 2359 SINGLE_VALUE_TYPE(chromeos::switches::kEnableTouchCalibrationSetting)}, |
2360 #endif // defined(OS_CHROMEOS) | 2360 #endif // defined(OS_CHROMEOS) |
lgarron
2017/04/05 02:06:25
Nit: don't change indentation of unrelated code (m
elawrence
2017/04/06 01:06:10
This is from git cl lint. I wasn't able to quickly
| |
2361 | 2361 |
2362 #if defined(OS_WIN) | 2362 #if defined(OS_WIN) |
2363 {"gdi-text-printing", flag_descriptions::kGdiTextPrinting, | 2363 {"gdi-text-printing", flag_descriptions::kGdiTextPrinting, |
2364 flag_descriptions::kGdiTextPrintingDescription, kOsWin, | 2364 flag_descriptions::kGdiTextPrintingDescription, kOsWin, |
2365 FEATURE_VALUE_TYPE(features::kGdiTextPrinting)}, | 2365 FEATURE_VALUE_TYPE(features::kGdiTextPrinting)}, |
2366 {"postscript-printing", flag_descriptions::kPostscriptPrinting, | 2366 {"postscript-printing", flag_descriptions::kPostscriptPrinting, |
2367 flag_descriptions::kPostscriptPrintingDescription, kOsWin, | 2367 flag_descriptions::kPostscriptPrintingDescription, kOsWin, |
2368 FEATURE_VALUE_TYPE(features::kPostScriptPrinting)}, | 2368 FEATURE_VALUE_TYPE(features::kPostScriptPrinting)}, |
2369 #endif // defined(OS_WIN) | 2369 #endif // defined(OS_WIN) |
2370 | 2370 |
2371 #if defined(OS_CHROMEOS) | 2371 #if defined(OS_CHROMEOS) |
2372 {"show-arc-files-app", flag_descriptions::kShowArcFilesAppName, | 2372 {"show-arc-files-app", flag_descriptions::kShowArcFilesAppName, |
2373 flag_descriptions::kShowArcFilesAppDescription, kOsCrOS, | 2373 flag_descriptions::kShowArcFilesAppDescription, kOsCrOS, |
2374 FEATURE_VALUE_TYPE(arc::kShowArcFilesAppFeature)}, | 2374 FEATURE_VALUE_TYPE(arc::kShowArcFilesAppFeature)}, |
2375 #endif // defined(OS_CHROMEOS) | 2375 #endif // defined(OS_CHROMEOS) |
2376 | 2376 |
2377 #if defined(OS_ANDROID) | 2377 #if defined(OS_ANDROID) |
2378 {"aia-fetching", flag_descriptions::kAiaFetchingName, | 2378 {"aia-fetching", flag_descriptions::kAiaFetchingName, |
2379 flag_descriptions::kAiaFetchingDescription, kOsAndroid, | 2379 flag_descriptions::kAiaFetchingDescription, kOsAndroid, |
2380 FEATURE_VALUE_TYPE(net::CertVerifyProcAndroid::kAIAFetchingFeature)}, | 2380 FEATURE_VALUE_TYPE(net::CertVerifyProcAndroid::kAIAFetchingFeature)}, |
2381 #endif | 2381 #endif |
2382 | 2382 |
2383 #if defined(OS_CHROMEOS) | 2383 #if defined(OS_CHROMEOS) |
2384 {"force-enable-stylus-tools", | 2384 {"force-enable-stylus-tools", |
2385 flag_descriptions::kForceEnableStylusToolsName, | 2385 flag_descriptions::kForceEnableStylusToolsName, |
2386 flag_descriptions::kForceEnableStylusToolsDescription, kOsCrOS, | 2386 flag_descriptions::kForceEnableStylusToolsDescription, kOsCrOS, |
2387 SINGLE_VALUE_TYPE(ash::switches::kAshForceEnablePalette)}, | 2387 SINGLE_VALUE_TYPE(ash::switches::kAshForceEnablePalette)}, |
2388 #endif // defined(OS_CHROMEOS) | 2388 #endif // defined(OS_CHROMEOS) |
2389 | 2389 |
2390 {"enable-midi-manager-dynamic-instantiation", | 2390 {"enable-midi-manager-dynamic-instantiation", |
2391 flag_descriptions::kEnableMidiManagerDynamicInstantiationName, | 2391 flag_descriptions::kEnableMidiManagerDynamicInstantiationName, |
2392 flag_descriptions::kEnableMidiManagerDynamicInstantiationDescription, | 2392 flag_descriptions::kEnableMidiManagerDynamicInstantiationDescription, |
2393 kOsAll, | 2393 kOsAll, |
2394 FEATURE_VALUE_TYPE(midi::features::kMidiManagerDynamicInstantiation)}, | 2394 FEATURE_VALUE_TYPE(midi::features::kMidiManagerDynamicInstantiation)}, |
2395 | 2395 |
2396 #if defined(OS_WIN) | 2396 #if defined(OS_WIN) |
2397 {"new-usb-backend", flag_descriptions::kNewUsbBackendName, | 2397 {"new-usb-backend", flag_descriptions::kNewUsbBackendName, |
2398 flag_descriptions::kNewUsbBackendDescription, kOsWin, | 2398 flag_descriptions::kNewUsbBackendDescription, kOsWin, |
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
2482 kDelayNavigationFeatureVariations, | 2482 kDelayNavigationFeatureVariations, |
2483 "DelayNavigation")}, | 2483 "DelayNavigation")}, |
2484 | 2484 |
2485 #if defined(OS_ANDROID) | 2485 #if defined(OS_ANDROID) |
2486 {"enable-custom-context-menu", | 2486 {"enable-custom-context-menu", |
2487 flag_descriptions::kEnableCustomContextMenuName, | 2487 flag_descriptions::kEnableCustomContextMenuName, |
2488 flag_descriptions::kEnableCustomContextMenuDescription, kOsAndroid, | 2488 flag_descriptions::kEnableCustomContextMenuDescription, kOsAndroid, |
2489 FEATURE_VALUE_TYPE(chrome::android::kCustomContextMenu)}, | 2489 FEATURE_VALUE_TYPE(chrome::android::kCustomContextMenu)}, |
2490 #endif // OS_ANDROID | 2490 #endif // OS_ANDROID |
2491 | 2491 |
2492 #if defined(TOOLKIT_VIEWS) || (defined(OS_MACOSX) && !defined(OS_IOS)) | |
2493 {"show-cert-button", flag_descriptions::kShowCertButtonOnPageInfoName, | |
lgarron
2017/04/05 02:06:25
Nit: If it's going to be a link in the foreseeable
elawrence
2017/04/06 01:06:10
I suppose it's a link today and likely to remain t
| |
2494 flag_descriptions::kShowCertButtonOnPageInfoDescription, kOsDesktop, | |
2495 SINGLE_VALUE_TYPE(switches::kShowCertButton)}, | |
2496 #endif | |
2497 | |
2492 // NOTE: Adding new command-line switches requires adding corresponding | 2498 // NOTE: Adding new command-line switches requires adding corresponding |
2493 // entries to enum "LoginCustomFlags" in histograms.xml. See note in | 2499 // entries to enum "LoginCustomFlags" in histograms.xml. See note in |
2494 // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test. | 2500 // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test. |
2495 }; | 2501 }; |
2496 | 2502 |
2497 class FlagsStateSingleton { | 2503 class FlagsStateSingleton { |
2498 public: | 2504 public: |
2499 FlagsStateSingleton() | 2505 FlagsStateSingleton() |
2500 : flags_state_(kFeatureEntries, arraysize(kFeatureEntries)) {} | 2506 : flags_state_(kFeatureEntries, arraysize(kFeatureEntries)) {} |
2501 ~FlagsStateSingleton() {} | 2507 ~FlagsStateSingleton() {} |
(...skipping 188 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
2690 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; | 2696 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; |
2691 | 2697 |
2692 const FeatureEntry* GetFeatureEntries(size_t* count) { | 2698 const FeatureEntry* GetFeatureEntries(size_t* count) { |
2693 *count = arraysize(kFeatureEntries); | 2699 *count = arraysize(kFeatureEntries); |
2694 return kFeatureEntries; | 2700 return kFeatureEntries; |
2695 } | 2701 } |
2696 | 2702 |
2697 } // namespace testing | 2703 } // namespace testing |
2698 | 2704 |
2699 } // namespace about_flags | 2705 } // namespace about_flags |
OLD | NEW |