| 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 1830 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1841 #endif | 1841 #endif |
| 1842 // TODO(tyoshino): Remove this temporary flag and command line switch. See | 1842 // TODO(tyoshino): Remove this temporary flag and command line switch. See |
| 1843 // crbug.com/366483 for the target milestone. | 1843 // crbug.com/366483 for the target milestone. |
| 1844 { | 1844 { |
| 1845 "allow-insecure-websocket-from-https-origin", | 1845 "allow-insecure-websocket-from-https-origin", |
| 1846 IDS_FLAGS_ALLOW_INSECURE_WEBSOCKET_FROM_HTTPS_ORIGIN_NAME, | 1846 IDS_FLAGS_ALLOW_INSECURE_WEBSOCKET_FROM_HTTPS_ORIGIN_NAME, |
| 1847 IDS_FLAGS_ALLOW_INSECURE_WEBSOCKET_FROM_HTTPS_ORIGIN_DESCRIPTION, | 1847 IDS_FLAGS_ALLOW_INSECURE_WEBSOCKET_FROM_HTTPS_ORIGIN_DESCRIPTION, |
| 1848 kOsAll, | 1848 kOsAll, |
| 1849 SINGLE_VALUE_TYPE(switches::kAllowInsecureWebSocketFromHttpsOrigin) | 1849 SINGLE_VALUE_TYPE(switches::kAllowInsecureWebSocketFromHttpsOrigin) |
| 1850 }, | 1850 }, |
| 1851 #if defined(OS_MACOSX) | |
| 1852 { | |
| 1853 "apps-keep-chrome-alive", | |
| 1854 IDS_FLAGS_APPS_KEEP_CHROME_ALIVE_NAME, | |
| 1855 IDS_FLAGS_APPS_KEEP_CHROME_ALIVE_DESCRIPTION, | |
| 1856 kOsMac, | |
| 1857 SINGLE_VALUE_TYPE(switches::kAppsKeepChromeAlive) | |
| 1858 }, | |
| 1859 #endif | |
| 1860 { | 1851 { |
| 1861 "enable-apps-file-associations", | 1852 "enable-apps-file-associations", |
| 1862 IDS_FLAGS_ENABLE_APPS_FILE_ASSOCIATIONS_NAME, | 1853 IDS_FLAGS_ENABLE_APPS_FILE_ASSOCIATIONS_NAME, |
| 1863 IDS_FLAGS_ENABLE_APPS_FILE_ASSOCIATIONS_DESCRIPTION, | 1854 IDS_FLAGS_ENABLE_APPS_FILE_ASSOCIATIONS_DESCRIPTION, |
| 1864 kOsMac, | 1855 kOsMac, |
| 1865 SINGLE_VALUE_TYPE(switches::kEnableAppsFileAssociations) | 1856 SINGLE_VALUE_TYPE(switches::kEnableAppsFileAssociations) |
| 1866 }, | 1857 }, |
| 1867 #if defined(OS_ANDROID) | 1858 #if defined(OS_ANDROID) |
| 1868 { | 1859 { |
| 1869 "enable-embeddedsearch-api", | 1860 "enable-embeddedsearch-api", |
| (...skipping 612 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2482 } | 2473 } |
| 2483 | 2474 |
| 2484 const Experiment* GetExperiments(size_t* count) { | 2475 const Experiment* GetExperiments(size_t* count) { |
| 2485 *count = num_experiments; | 2476 *count = num_experiments; |
| 2486 return experiments; | 2477 return experiments; |
| 2487 } | 2478 } |
| 2488 | 2479 |
| 2489 } // namespace testing | 2480 } // namespace testing |
| 2490 | 2481 |
| 2491 } // namespace about_flags | 2482 } // namespace about_flags |
| OLD | NEW |