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 1787 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1798 SINGLE_VALUE_TYPE(switches::kAppsKeepChromeAlive) | 1798 SINGLE_VALUE_TYPE(switches::kAppsKeepChromeAlive) |
1799 }, | 1799 }, |
1800 #endif | 1800 #endif |
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 kOsMac, |
1806 SINGLE_VALUE_TYPE(switches::kEnableAppsFileAssociations) | 1806 SINGLE_VALUE_TYPE(switches::kEnableAppsFileAssociations) |
1807 }, | 1807 }, |
| 1808 #if defined(OS_ANDROID) |
| 1809 { |
| 1810 "enable-embeddedsearch-api", |
| 1811 IDS_FLAGS_ENABLE_EMBEDDEDSEARCH_API_NAME, |
| 1812 IDS_FLAGS_ENABLE_EMBEDDEDSEARCH_API_DESCRIPTION, |
| 1813 kOsAndroid, |
| 1814 SINGLE_VALUE_TYPE(switches::kEnableEmbeddedSearchAPI) |
| 1815 }, |
| 1816 #endif |
1808 }; | 1817 }; |
1809 | 1818 |
1810 const Experiment* experiments = kExperiments; | 1819 const Experiment* experiments = kExperiments; |
1811 size_t num_experiments = arraysize(kExperiments); | 1820 size_t num_experiments = arraysize(kExperiments); |
1812 | 1821 |
1813 // Stores and encapsulates the little state that about:flags has. | 1822 // Stores and encapsulates the little state that about:flags has. |
1814 class FlagsState { | 1823 class FlagsState { |
1815 public: | 1824 public: |
1816 FlagsState() : needs_restart_(false) {} | 1825 FlagsState() : needs_restart_(false) {} |
1817 void ConvertFlagsToSwitches(FlagsStorage* flags_storage, | 1826 void ConvertFlagsToSwitches(FlagsStorage* flags_storage, |
(...skipping 504 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2322 } | 2331 } |
2323 | 2332 |
2324 const Experiment* GetExperiments(size_t* count) { | 2333 const Experiment* GetExperiments(size_t* count) { |
2325 *count = num_experiments; | 2334 *count = num_experiments; |
2326 return experiments; | 2335 return experiments; |
2327 } | 2336 } |
2328 | 2337 |
2329 } // namespace testing | 2338 } // namespace testing |
2330 | 2339 |
2331 } // namespace about_flags | 2340 } // namespace about_flags |
OLD | NEW |