| 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 1818 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1829 }, | 1829 }, |
| 1830 #endif | 1830 #endif |
| 1831 { | 1831 { |
| 1832 "enable-save-password-bubble", | 1832 "enable-save-password-bubble", |
| 1833 IDS_FLAGS_ENABLE_SAVE_PASSWORD_BUBBLE_NAME, | 1833 IDS_FLAGS_ENABLE_SAVE_PASSWORD_BUBBLE_NAME, |
| 1834 IDS_FLAGS_ENABLE_SAVE_PASSWORD_BUBBLE_DESCRIPTION, | 1834 IDS_FLAGS_ENABLE_SAVE_PASSWORD_BUBBLE_DESCRIPTION, |
| 1835 kOsWin | kOsLinux | kOsCrOS | kOsMac, | 1835 kOsWin | kOsLinux | kOsCrOS | kOsMac, |
| 1836 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableSavePasswordBubble, | 1836 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableSavePasswordBubble, |
| 1837 switches::kDisableSavePasswordBubble) | 1837 switches::kDisableSavePasswordBubble) |
| 1838 }, | 1838 }, |
| 1839 // TODO(tyoshino): Remove this temporary flag and command line switch. See | |
| 1840 // crbug.com/366483 for the target milestone. | |
| 1841 { | |
| 1842 "allow-insecure-websocket-from-https-origin", | |
| 1843 IDS_FLAGS_ALLOW_INSECURE_WEBSOCKET_FROM_HTTPS_ORIGIN_NAME, | |
| 1844 IDS_FLAGS_ALLOW_INSECURE_WEBSOCKET_FROM_HTTPS_ORIGIN_DESCRIPTION, | |
| 1845 kOsAll, | |
| 1846 SINGLE_VALUE_TYPE(switches::kAllowInsecureWebSocketFromHttpsOrigin) | |
| 1847 }, | |
| 1848 { | 1839 { |
| 1849 "enable-apps-file-associations", | 1840 "enable-apps-file-associations", |
| 1850 IDS_FLAGS_ENABLE_APPS_FILE_ASSOCIATIONS_NAME, | 1841 IDS_FLAGS_ENABLE_APPS_FILE_ASSOCIATIONS_NAME, |
| 1851 IDS_FLAGS_ENABLE_APPS_FILE_ASSOCIATIONS_DESCRIPTION, | 1842 IDS_FLAGS_ENABLE_APPS_FILE_ASSOCIATIONS_DESCRIPTION, |
| 1852 kOsMac, | 1843 kOsMac, |
| 1853 SINGLE_VALUE_TYPE(switches::kEnableAppsFileAssociations) | 1844 SINGLE_VALUE_TYPE(switches::kEnableAppsFileAssociations) |
| 1854 }, | 1845 }, |
| 1855 #if defined(OS_ANDROID) | 1846 #if defined(OS_ANDROID) |
| 1856 { | 1847 { |
| 1857 "enable-embeddedsearch-api", | 1848 "enable-embeddedsearch-api", |
| (...skipping 1009 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2867 } | 2858 } |
| 2868 | 2859 |
| 2869 const Experiment* GetExperiments(size_t* count) { | 2860 const Experiment* GetExperiments(size_t* count) { |
| 2870 *count = num_experiments; | 2861 *count = num_experiments; |
| 2871 return experiments; | 2862 return experiments; |
| 2872 } | 2863 } |
| 2873 | 2864 |
| 2874 } // namespace testing | 2865 } // namespace testing |
| 2875 | 2866 |
| 2876 } // namespace about_flags | 2867 } // namespace about_flags |
| OLD | NEW |