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 1760 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1771 #endif | 1771 #endif |
1772 // TODO(tyoshino): Remove this temporary flag and command line switch. See | 1772 // TODO(tyoshino): Remove this temporary flag and command line switch. See |
1773 // crbug.com/366483 for the target milestone. | 1773 // crbug.com/366483 for the target milestone. |
1774 { | 1774 { |
1775 "allow-insecure-websocket-from-https-origin", | 1775 "allow-insecure-websocket-from-https-origin", |
1776 IDS_FLAGS_ALLOW_INSECURE_WEBSOCKET_FROM_HTTPS_ORIGIN_NAME, | 1776 IDS_FLAGS_ALLOW_INSECURE_WEBSOCKET_FROM_HTTPS_ORIGIN_NAME, |
1777 IDS_FLAGS_ALLOW_INSECURE_WEBSOCKET_FROM_HTTPS_ORIGIN_DESCRIPTION, | 1777 IDS_FLAGS_ALLOW_INSECURE_WEBSOCKET_FROM_HTTPS_ORIGIN_DESCRIPTION, |
1778 kOsAll, | 1778 kOsAll, |
1779 SINGLE_VALUE_TYPE(switches::kAllowInsecureWebSocketFromHttpsOrigin) | 1779 SINGLE_VALUE_TYPE(switches::kAllowInsecureWebSocketFromHttpsOrigin) |
1780 }, | 1780 }, |
| 1781 #if defined(OS_MACOSX) |
| 1782 { |
| 1783 "apps-keep-chrome-alive", |
| 1784 IDS_FLAGS_APPS_KEEP_CHROME_ALIVE_NAME, |
| 1785 IDS_FLAGS_APPS_KEEP_CHROME_ALIVE_DESCRIPTION, |
| 1786 kOsMac, |
| 1787 SINGLE_VALUE_TYPE(switches::kAppsKeepChromeAlive) |
| 1788 } |
| 1789 #endif |
1781 }; | 1790 }; |
1782 | 1791 |
1783 const Experiment* experiments = kExperiments; | 1792 const Experiment* experiments = kExperiments; |
1784 size_t num_experiments = arraysize(kExperiments); | 1793 size_t num_experiments = arraysize(kExperiments); |
1785 | 1794 |
1786 // Stores and encapsulates the little state that about:flags has. | 1795 // Stores and encapsulates the little state that about:flags has. |
1787 class FlagsState { | 1796 class FlagsState { |
1788 public: | 1797 public: |
1789 FlagsState() : needs_restart_(false) {} | 1798 FlagsState() : needs_restart_(false) {} |
1790 void ConvertFlagsToSwitches(FlagsStorage* flags_storage, | 1799 void ConvertFlagsToSwitches(FlagsStorage* flags_storage, |
(...skipping 504 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2295 } | 2304 } |
2296 | 2305 |
2297 const Experiment* GetExperiments(size_t* count) { | 2306 const Experiment* GetExperiments(size_t* count) { |
2298 *count = num_experiments; | 2307 *count = num_experiments; |
2299 return experiments; | 2308 return experiments; |
2300 } | 2309 } |
2301 | 2310 |
2302 } // namespace testing | 2311 } // namespace testing |
2303 | 2312 |
2304 } // namespace about_flags | 2313 } // namespace about_flags |
OLD | NEW |