Chromium Code Reviews| 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 1784 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1795 "allow-insecure-websocket-from-https-origin", | 1795 "allow-insecure-websocket-from-https-origin", |
| 1796 IDS_FLAGS_ALLOW_INSECURE_WEBSOCKET_FROM_HTTPS_ORIGIN_NAME, | 1796 IDS_FLAGS_ALLOW_INSECURE_WEBSOCKET_FROM_HTTPS_ORIGIN_NAME, |
| 1797 IDS_FLAGS_ALLOW_INSECURE_WEBSOCKET_FROM_HTTPS_ORIGIN_DESCRIPTION, | 1797 IDS_FLAGS_ALLOW_INSECURE_WEBSOCKET_FROM_HTTPS_ORIGIN_DESCRIPTION, |
| 1798 kOsAll, | 1798 kOsAll, |
| 1799 SINGLE_VALUE_TYPE(switches::kAllowInsecureWebSocketFromHttpsOrigin) | 1799 SINGLE_VALUE_TYPE(switches::kAllowInsecureWebSocketFromHttpsOrigin) |
| 1800 }, | 1800 }, |
| 1801 { | 1801 { |
| 1802 "enable-apps-file-associations", | 1802 "enable-apps-file-associations", |
| 1803 IDS_FLAGS_ENABLE_APPS_FILE_ASSOCIATIONS_NAME, | 1803 IDS_FLAGS_ENABLE_APPS_FILE_ASSOCIATIONS_NAME, |
| 1804 IDS_FLAGS_ENABLE_APPS_FILE_ASSOCIATIONS_DESCRIPTION, | 1804 IDS_FLAGS_ENABLE_APPS_FILE_ASSOCIATIONS_DESCRIPTION, |
| 1805 kOsMac, | 1805 kOsWin | kOsMac, |
|
jackhou1
2014/10/27 02:13:28
Is this necessary for testing? If not we should pr
Matt Giuca
2014/11/04 06:00:09
It lets us tell other people to test it without th
| |
| 1806 SINGLE_VALUE_TYPE(switches::kEnableAppsFileAssociations) | 1806 SINGLE_VALUE_TYPE(switches::kEnableAppsFileAssociations) |
| 1807 }, | 1807 }, |
| 1808 #if defined(OS_ANDROID) | 1808 #if defined(OS_ANDROID) |
| 1809 { | 1809 { |
| 1810 "enable-embeddedsearch-api", | 1810 "enable-embeddedsearch-api", |
| 1811 IDS_FLAGS_ENABLE_EMBEDDEDSEARCH_API_NAME, | 1811 IDS_FLAGS_ENABLE_EMBEDDEDSEARCH_API_NAME, |
| 1812 IDS_FLAGS_ENABLE_EMBEDDEDSEARCH_API_DESCRIPTION, | 1812 IDS_FLAGS_ENABLE_EMBEDDEDSEARCH_API_DESCRIPTION, |
| 1813 kOsAndroid, | 1813 kOsAndroid, |
| 1814 SINGLE_VALUE_TYPE(switches::kEnableEmbeddedSearchAPI) | 1814 SINGLE_VALUE_TYPE(switches::kEnableEmbeddedSearchAPI) |
| 1815 }, | 1815 }, |
| (...skipping 769 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 2585 } | 2585 } |
| 2586 | 2586 |
| 2587 const Experiment* GetExperiments(size_t* count) { | 2587 const Experiment* GetExperiments(size_t* count) { |
| 2588 *count = num_experiments; | 2588 *count = num_experiments; |
| 2589 return experiments; | 2589 return experiments; |
| 2590 } | 2590 } |
| 2591 | 2591 |
| 2592 } // namespace testing | 2592 } // namespace testing |
| 2593 | 2593 |
| 2594 } // namespace about_flags | 2594 } // namespace about_flags |
| OLD | NEW |