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

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

Issue 2967993002: DRP: Make secure proxy check URL a DRP param (Closed)
Patch Set: megjablon comment Created 3 years, 5 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 | « no previous file | chrome/browser/flag_descriptions.h » ('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 1843 matching lines...) Expand 10 before | Expand all | Expand 10 after
1854 {"extension-content-verification", 1854 {"extension-content-verification",
1855 flag_descriptions::kExtensionContentVerificationName, 1855 flag_descriptions::kExtensionContentVerificationName,
1856 flag_descriptions::kExtensionContentVerificationDescription, kOsDesktop, 1856 flag_descriptions::kExtensionContentVerificationDescription, kOsDesktop,
1857 MULTI_VALUE_TYPE(kExtensionContentVerificationChoices)}, 1857 MULTI_VALUE_TYPE(kExtensionContentVerificationChoices)},
1858 #if BUILDFLAG(ENABLE_EXTENSIONS) 1858 #if BUILDFLAG(ENABLE_EXTENSIONS)
1859 {"extension-active-script-permission", 1859 {"extension-active-script-permission",
1860 flag_descriptions::kUserConsentForExtensionScriptsName, 1860 flag_descriptions::kUserConsentForExtensionScriptsName,
1861 flag_descriptions::kUserConsentForExtensionScriptsDescription, kOsAll, 1861 flag_descriptions::kUserConsentForExtensionScriptsDescription, kOsAll,
1862 SINGLE_VALUE_TYPE(extensions::switches::kEnableScriptsRequireAction)}, 1862 SINGLE_VALUE_TYPE(extensions::switches::kEnableScriptsRequireAction)},
1863 #endif // ENABLE_EXTENSIONS 1863 #endif // ENABLE_EXTENSIONS
1864 #if defined(OS_ANDROID)
1865 {"enable-data-reduction-proxy-carrier-test",
1866 flag_descriptions::kDataReductionProxyCarrierTestName,
1867 flag_descriptions::kDataReductionProxyCarrierTestDescription, kOsAndroid,
1868 SINGLE_VALUE_TYPE(
1869 data_reduction_proxy::switches::kEnableDataReductionProxyCarrierTest)},
1870 #endif // OS_ANDROID
1871 {"enable-hotword-hardware", 1864 {"enable-hotword-hardware",
1872 flag_descriptions::kExperimentalHotwordHardwareName, 1865 flag_descriptions::kExperimentalHotwordHardwareName,
1873 flag_descriptions::kExperimentalHotwordHardwareDescription, kOsCrOS, 1866 flag_descriptions::kExperimentalHotwordHardwareDescription, kOsCrOS,
1874 SINGLE_VALUE_TYPE(switches::kEnableExperimentalHotwordHardware)}, 1867 SINGLE_VALUE_TYPE(switches::kEnableExperimentalHotwordHardware)},
1875 #if BUILDFLAG(ENABLE_EXTENSIONS) 1868 #if BUILDFLAG(ENABLE_EXTENSIONS)
1876 {"enable-embedded-extension-options", 1869 {"enable-embedded-extension-options",
1877 flag_descriptions::kEmbeddedExtensionOptionsName, 1870 flag_descriptions::kEmbeddedExtensionOptionsName,
1878 flag_descriptions::kEmbeddedExtensionOptionsDescription, kOsDesktop, 1871 flag_descriptions::kEmbeddedExtensionOptionsDescription, kOsDesktop,
1879 SINGLE_VALUE_TYPE(extensions::switches::kEnableEmbeddedExtensionOptions)}, 1872 SINGLE_VALUE_TYPE(extensions::switches::kEnableEmbeddedExtensionOptions)},
1880 #endif // ENABLE_EXTENSIONS 1873 #endif // ENABLE_EXTENSIONS
(...skipping 1491 matching lines...) Expand 10 before | Expand all | Expand 10 after
3372 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; 3365 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0;
3373 3366
3374 const FeatureEntry* GetFeatureEntries(size_t* count) { 3367 const FeatureEntry* GetFeatureEntries(size_t* count) {
3375 *count = arraysize(kFeatureEntries); 3368 *count = arraysize(kFeatureEntries);
3376 return kFeatureEntries; 3369 return kFeatureEntries;
3377 } 3370 }
3378 3371
3379 } // namespace testing 3372 } // namespace testing
3380 3373
3381 } // namespace about_flags 3374 } // namespace about_flags
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/flag_descriptions.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698