| 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 827 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 838 chromeos::switches::kDisableNetworkPortalNotification) | 838 chromeos::switches::kDisableNetworkPortalNotification) |
| 839 }, | 839 }, |
| 840 #endif | 840 #endif |
| 841 { | 841 { |
| 842 "enable-download-resumption", | 842 "enable-download-resumption", |
| 843 IDS_FLAGS_ENABLE_DOWNLOAD_RESUMPTION_NAME, | 843 IDS_FLAGS_ENABLE_DOWNLOAD_RESUMPTION_NAME, |
| 844 IDS_FLAGS_ENABLE_DOWNLOAD_RESUMPTION_DESCRIPTION, | 844 IDS_FLAGS_ENABLE_DOWNLOAD_RESUMPTION_DESCRIPTION, |
| 845 kOsDesktop, | 845 kOsDesktop, |
| 846 SINGLE_VALUE_TYPE(switches::kEnableDownloadResumption) | 846 SINGLE_VALUE_TYPE(switches::kEnableDownloadResumption) |
| 847 }, | 847 }, |
| 848 { |
| 849 "enable-download-notification", |
| 850 IDS_FLAGS_ENABLE_DOWNLOAD_NOTIFICATION_NAME, |
| 851 IDS_FLAGS_ENABLE_DOWNLOAD_NOTIFICATION_DESCRIPTION, |
| 852 kOsCrOS, |
| 853 SINGLE_VALUE_TYPE(switches::kEnableDownloadNotification) |
| 854 }, |
| 848 #if defined(ENABLE_PLUGINS) | 855 #if defined(ENABLE_PLUGINS) |
| 849 { | 856 { |
| 850 "allow-nacl-socket-api", | 857 "allow-nacl-socket-api", |
| 851 IDS_FLAGS_ALLOW_NACL_SOCKET_API_NAME, | 858 IDS_FLAGS_ALLOW_NACL_SOCKET_API_NAME, |
| 852 IDS_FLAGS_ALLOW_NACL_SOCKET_API_DESCRIPTION, | 859 IDS_FLAGS_ALLOW_NACL_SOCKET_API_DESCRIPTION, |
| 853 kOsDesktop, | 860 kOsDesktop, |
| 854 SINGLE_VALUE_TYPE_AND_VALUE(switches::kAllowNaClSocketAPI, "*") | 861 SINGLE_VALUE_TYPE_AND_VALUE(switches::kAllowNaClSocketAPI, "*") |
| 855 }, | 862 }, |
| 856 #endif | 863 #endif |
| 857 #if defined(OS_CHROMEOS) | 864 #if defined(OS_CHROMEOS) |
| (...skipping 1872 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2730 } | 2737 } |
| 2731 | 2738 |
| 2732 const Experiment* GetExperiments(size_t* count) { | 2739 const Experiment* GetExperiments(size_t* count) { |
| 2733 *count = num_experiments; | 2740 *count = num_experiments; |
| 2734 return experiments; | 2741 return experiments; |
| 2735 } | 2742 } |
| 2736 | 2743 |
| 2737 } // namespace testing | 2744 } // namespace testing |
| 2738 | 2745 |
| 2739 } // namespace about_flags | 2746 } // namespace about_flags |
| OLD | NEW |