| 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 813 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 824 chromeos::switches::kDisableNetworkPortalNotification) | 824 chromeos::switches::kDisableNetworkPortalNotification) |
| 825 }, | 825 }, |
| 826 #endif | 826 #endif |
| 827 { | 827 { |
| 828 "enable-download-resumption", | 828 "enable-download-resumption", |
| 829 IDS_FLAGS_ENABLE_DOWNLOAD_RESUMPTION_NAME, | 829 IDS_FLAGS_ENABLE_DOWNLOAD_RESUMPTION_NAME, |
| 830 IDS_FLAGS_ENABLE_DOWNLOAD_RESUMPTION_DESCRIPTION, | 830 IDS_FLAGS_ENABLE_DOWNLOAD_RESUMPTION_DESCRIPTION, |
| 831 kOsDesktop, | 831 kOsDesktop, |
| 832 SINGLE_VALUE_TYPE(switches::kEnableDownloadResumption) | 832 SINGLE_VALUE_TYPE(switches::kEnableDownloadResumption) |
| 833 }, | 833 }, |
| 834 { |
| 835 "enable-download-notification", |
| 836 IDS_FLAGS_ENABLE_DOWNLOAD_NOTIFICATION_NAME, |
| 837 IDS_FLAGS_ENABLE_DOWNLOAD_NOTIFICATION_DESCRIPTION, |
| 838 kOsCrOS, |
| 839 SINGLE_VALUE_TYPE(switches::kEnableDownloadNotification) |
| 840 }, |
| 834 #if defined(ENABLE_PLUGINS) | 841 #if defined(ENABLE_PLUGINS) |
| 835 { | 842 { |
| 836 "allow-nacl-socket-api", | 843 "allow-nacl-socket-api", |
| 837 IDS_FLAGS_ALLOW_NACL_SOCKET_API_NAME, | 844 IDS_FLAGS_ALLOW_NACL_SOCKET_API_NAME, |
| 838 IDS_FLAGS_ALLOW_NACL_SOCKET_API_DESCRIPTION, | 845 IDS_FLAGS_ALLOW_NACL_SOCKET_API_DESCRIPTION, |
| 839 kOsDesktop, | 846 kOsDesktop, |
| 840 SINGLE_VALUE_TYPE_AND_VALUE(switches::kAllowNaClSocketAPI, "*") | 847 SINGLE_VALUE_TYPE_AND_VALUE(switches::kAllowNaClSocketAPI, "*") |
| 841 }, | 848 }, |
| 842 #endif | 849 #endif |
| 843 #if defined(OS_CHROMEOS) | 850 #if defined(OS_CHROMEOS) |
| (...skipping 1937 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2781 } | 2788 } |
| 2782 | 2789 |
| 2783 const Experiment* GetExperiments(size_t* count) { | 2790 const Experiment* GetExperiments(size_t* count) { |
| 2784 *count = num_experiments; | 2791 *count = num_experiments; |
| 2785 return experiments; | 2792 return experiments; |
| 2786 } | 2793 } |
| 2787 | 2794 |
| 2788 } // namespace testing | 2795 } // namespace testing |
| 2789 | 2796 |
| 2790 } // namespace about_flags | 2797 } // namespace about_flags |
| OLD | NEW |