| 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 <algorithm> | 7 #include <algorithm> |
| 8 #include <iterator> | 8 #include <iterator> |
| 9 #include <map> | 9 #include <map> |
| 10 #include <set> | 10 #include <set> |
| (...skipping 806 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 817 }, | 817 }, |
| 818 { | 818 { |
| 819 "no-discard-tabs", | 819 "no-discard-tabs", |
| 820 IDS_FLAGS_NO_DISCARD_TABS_NAME, | 820 IDS_FLAGS_NO_DISCARD_TABS_NAME, |
| 821 IDS_FLAGS_NO_DISCARD_TABS_DESCRIPTION, | 821 IDS_FLAGS_NO_DISCARD_TABS_DESCRIPTION, |
| 822 kOsCrOS, | 822 kOsCrOS, |
| 823 SINGLE_VALUE_TYPE(switches::kNoDiscardTabs) | 823 SINGLE_VALUE_TYPE(switches::kNoDiscardTabs) |
| 824 }, | 824 }, |
| 825 #endif | 825 #endif |
| 826 { | 826 { |
| 827 "enable-download-resumption", |
| 828 IDS_FLAGS_ENABLE_DOWNLOAD_RESUMPTION_NAME, |
| 829 IDS_FLAGS_ENABLE_DOWNLOAD_RESUMPTION_DESCRIPTION, |
| 830 kOsAll, |
| 831 SINGLE_VALUE_TYPE(switches::kEnableDownloadResumption) |
| 832 }, |
| 833 { |
| 827 "allow-nacl-socket-api", | 834 "allow-nacl-socket-api", |
| 828 IDS_FLAGS_ALLOW_NACL_SOCKET_API_NAME, | 835 IDS_FLAGS_ALLOW_NACL_SOCKET_API_NAME, |
| 829 IDS_FLAGS_ALLOW_NACL_SOCKET_API_DESCRIPTION, | 836 IDS_FLAGS_ALLOW_NACL_SOCKET_API_DESCRIPTION, |
| 830 kOsAll, | 837 kOsAll, |
| 831 SINGLE_VALUE_TYPE_AND_VALUE(switches::kAllowNaClSocketAPI, "*") | 838 SINGLE_VALUE_TYPE_AND_VALUE(switches::kAllowNaClSocketAPI, "*") |
| 832 }, | 839 }, |
| 833 { | 840 { |
| 834 "stacked-tab-strip", | 841 "stacked-tab-strip", |
| 835 IDS_FLAGS_STACKED_TAB_STRIP_NAME, | 842 IDS_FLAGS_STACKED_TAB_STRIP_NAME, |
| 836 IDS_FLAGS_STACKED_TAB_STRIP_DESCRIPTION, | 843 IDS_FLAGS_STACKED_TAB_STRIP_DESCRIPTION, |
| (...skipping 793 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1630 } | 1637 } |
| 1631 | 1638 |
| 1632 const Experiment* GetExperiments(size_t* count) { | 1639 const Experiment* GetExperiments(size_t* count) { |
| 1633 *count = num_experiments; | 1640 *count = num_experiments; |
| 1634 return experiments; | 1641 return experiments; |
| 1635 } | 1642 } |
| 1636 | 1643 |
| 1637 } // namespace testing | 1644 } // namespace testing |
| 1638 | 1645 |
| 1639 } // namespace about_flags | 1646 } // namespace about_flags |
| OLD | NEW |