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 1858 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1869 }, | 1869 }, |
1870 #endif | 1870 #endif |
1871 { | 1871 { |
1872 "extension-active-script-permission", | 1872 "extension-active-script-permission", |
1873 IDS_FLAGS_USER_CONSENT_FOR_EXTENSION_SCRIPTS_NAME, | 1873 IDS_FLAGS_USER_CONSENT_FOR_EXTENSION_SCRIPTS_NAME, |
1874 IDS_FLAGS_USER_CONSENT_FOR_EXTENSION_SCRIPTS_DESCRIPTION, | 1874 IDS_FLAGS_USER_CONSENT_FOR_EXTENSION_SCRIPTS_DESCRIPTION, |
1875 kOsAll, | 1875 kOsAll, |
1876 SINGLE_VALUE_TYPE(extensions::switches::kEnableScriptsRequireAction) | 1876 SINGLE_VALUE_TYPE(extensions::switches::kEnableScriptsRequireAction) |
1877 }, | 1877 }, |
1878 { | 1878 { |
1879 "enable-harfbuzz-rendertext", | 1879 "harfbuzz-rendertext", |
1880 IDS_FLAGS_ENABLE_HARFBUZZ_RENDERTEXT_NAME, | 1880 IDS_FLAGS_HARFBUZZ_RENDERTEXT_NAME, |
1881 IDS_FLAGS_ENABLE_HARFBUZZ_RENDERTEXT_DESCRIPTION, | 1881 IDS_FLAGS_HARFBUZZ_RENDERTEXT_DESCRIPTION, |
1882 kOsDesktop, | 1882 kOsDesktop, |
1883 SINGLE_VALUE_TYPE(switches::kEnableHarfBuzzRenderText) | 1883 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableHarfBuzzRenderText, |
| 1884 switches::kDisableHarfBuzzRenderText) |
1884 }, | 1885 }, |
1885 #if defined(OS_ANDROID) | 1886 #if defined(OS_ANDROID) |
1886 { | 1887 { |
1887 "answers-in-suggest", | 1888 "answers-in-suggest", |
1888 IDS_FLAGS_ENABLE_ANSWERS_IN_SUGGEST_NAME, | 1889 IDS_FLAGS_ENABLE_ANSWERS_IN_SUGGEST_NAME, |
1889 IDS_FLAGS_ENABLE_ANSWERS_IN_SUGGEST_DESCRIPTION, | 1890 IDS_FLAGS_ENABLE_ANSWERS_IN_SUGGEST_DESCRIPTION, |
1890 kOsAndroid, | 1891 kOsAndroid, |
1891 MULTI_VALUE_TYPE(kAnswersInSuggestChoices) | 1892 MULTI_VALUE_TYPE(kAnswersInSuggestChoices) |
1892 }, | 1893 }, |
1893 #endif | 1894 #endif |
(...skipping 566 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2460 } | 2461 } |
2461 | 2462 |
2462 const Experiment* GetExperiments(size_t* count) { | 2463 const Experiment* GetExperiments(size_t* count) { |
2463 *count = num_experiments; | 2464 *count = num_experiments; |
2464 return experiments; | 2465 return experiments; |
2465 } | 2466 } |
2466 | 2467 |
2467 } // namespace testing | 2468 } // namespace testing |
2468 | 2469 |
2469 } // namespace about_flags | 2470 } // namespace about_flags |
OLD | NEW |