| 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 1829 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1840 }, | 1840 }, |
| 1841 #endif | 1841 #endif |
| 1842 { | 1842 { |
| 1843 "enable-experimental-hotwording", | 1843 "enable-experimental-hotwording", |
| 1844 IDS_FLAGS_ENABLE_EXPERIMENTAL_HOTWORDING_NAME, | 1844 IDS_FLAGS_ENABLE_EXPERIMENTAL_HOTWORDING_NAME, |
| 1845 IDS_FLAGS_ENABLE_EXPERIMENTAL_HOTWORDING_DESCRIPTION, | 1845 IDS_FLAGS_ENABLE_EXPERIMENTAL_HOTWORDING_DESCRIPTION, |
| 1846 kOsDesktop, | 1846 kOsDesktop, |
| 1847 SINGLE_VALUE_TYPE(switches::kEnableExperimentalHotwording) | 1847 SINGLE_VALUE_TYPE(switches::kEnableExperimentalHotwording) |
| 1848 }, | 1848 }, |
| 1849 { | 1849 { |
| 1850 "enable-embedded-extension-options", | |
| 1851 IDS_FLAGS_ENABLE_EMBEDDED_EXTENSION_OPTIONS_NAME, | |
| 1852 IDS_FLAGS_ENABLE_EMBEDDED_EXTENSION_OPTIONS_DESCRIPTION, | |
| 1853 kOsDesktop, | |
| 1854 SINGLE_VALUE_TYPE(extensions::switches::kEnableEmbeddedExtensionOptions) | |
| 1855 }, | |
| 1856 { | |
| 1857 "enable-website-settings-manager", | 1850 "enable-website-settings-manager", |
| 1858 IDS_FLAGS_ENABLE_WEBSITE_SETTINGS_NAME, | 1851 IDS_FLAGS_ENABLE_WEBSITE_SETTINGS_NAME, |
| 1859 IDS_FLAGS_ENABLE_WEBSITE_SETTINGS_DESCRIPTION, | 1852 IDS_FLAGS_ENABLE_WEBSITE_SETTINGS_DESCRIPTION, |
| 1860 kOsDesktop, | 1853 kOsDesktop, |
| 1861 SINGLE_VALUE_TYPE(switches::kEnableWebsiteSettingsManager) | 1854 SINGLE_VALUE_TYPE(switches::kEnableWebsiteSettingsManager) |
| 1862 }, | 1855 }, |
| 1863 { | 1856 { |
| 1864 "remember-cert-error-decisions", | 1857 "remember-cert-error-decisions", |
| 1865 IDS_FLAGS_REMEMBER_CERTIFICATE_ERROR_DECISIONS_NAME, | 1858 IDS_FLAGS_REMEMBER_CERTIFICATE_ERROR_DECISIONS_NAME, |
| 1866 IDS_FLAGS_REMEMBER_CERTIFICATE_ERROR_DECISIONS_DESCRIPTION, | 1859 IDS_FLAGS_REMEMBER_CERTIFICATE_ERROR_DECISIONS_DESCRIPTION, |
| (...skipping 610 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2477 } | 2470 } |
| 2478 | 2471 |
| 2479 const Experiment* GetExperiments(size_t* count) { | 2472 const Experiment* GetExperiments(size_t* count) { |
| 2480 *count = num_experiments; | 2473 *count = num_experiments; |
| 2481 return experiments; | 2474 return experiments; |
| 2482 } | 2475 } |
| 2483 | 2476 |
| 2484 } // namespace testing | 2477 } // namespace testing |
| 2485 | 2478 |
| 2486 } // namespace about_flags | 2479 } // namespace about_flags |
| OLD | NEW |