| 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 1772 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1783 }, | 1783 }, |
| 1784 #if defined(GOOGLE_CHROME_BUILD) | 1784 #if defined(GOOGLE_CHROME_BUILD) |
| 1785 { | 1785 { |
| 1786 "enable-easy-unlock", | 1786 "enable-easy-unlock", |
| 1787 IDS_FLAGS_ENABLE_EASY_UNLOCK_NAME, | 1787 IDS_FLAGS_ENABLE_EASY_UNLOCK_NAME, |
| 1788 IDS_FLAGS_ENABLE_EASY_UNLOCK_DESCRIPTION, | 1788 IDS_FLAGS_ENABLE_EASY_UNLOCK_DESCRIPTION, |
| 1789 kOsCrOS, | 1789 kOsCrOS, |
| 1790 SINGLE_VALUE_TYPE(switches::kEnableEasyUnlock) | 1790 SINGLE_VALUE_TYPE(switches::kEnableEasyUnlock) |
| 1791 }, | 1791 }, |
| 1792 #endif | 1792 #endif |
| 1793 { | |
| 1794 "disable-embedded-shared-worker", | |
| 1795 IDS_FLAGS_DISABLE_EMBEDDED_SHARED_WORKER_NAME, | |
| 1796 IDS_FLAGS_DISABLE_EMBEDDED_SHARED_WORKER_DESCRIPTION, | |
| 1797 kOsDesktop, | |
| 1798 SINGLE_VALUE_TYPE(switches::kDisableEmbeddedSharedWorker) | |
| 1799 }, | |
| 1800 #if defined(OS_CHROMEOS) | 1793 #if defined(OS_CHROMEOS) |
| 1801 { | 1794 { |
| 1802 "enable-filemanager-mtp", | 1795 "enable-filemanager-mtp", |
| 1803 IDS_FLAGS_ENABLE_FILE_MANAGER_MTP_NAME, | 1796 IDS_FLAGS_ENABLE_FILE_MANAGER_MTP_NAME, |
| 1804 IDS_FLAGS_ENABLE_FILE_MANAGER_MTP_DESCRIPTION, | 1797 IDS_FLAGS_ENABLE_FILE_MANAGER_MTP_DESCRIPTION, |
| 1805 kOsCrOS, | 1798 kOsCrOS, |
| 1806 MULTI_VALUE_TYPE(kEnableFileManagerMTPChoices) | 1799 MULTI_VALUE_TYPE(kEnableFileManagerMTPChoices) |
| 1807 }, | 1800 }, |
| 1808 #endif | 1801 #endif |
| 1809 // TODO(tyoshino): Remove this temporary flag and command line switch. See | 1802 // TODO(tyoshino): Remove this temporary flag and command line switch. See |
| (...skipping 644 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2454 } | 2447 } |
| 2455 | 2448 |
| 2456 const Experiment* GetExperiments(size_t* count) { | 2449 const Experiment* GetExperiments(size_t* count) { |
| 2457 *count = num_experiments; | 2450 *count = num_experiments; |
| 2458 return experiments; | 2451 return experiments; |
| 2459 } | 2452 } |
| 2460 | 2453 |
| 2461 } // namespace testing | 2454 } // namespace testing |
| 2462 | 2455 |
| 2463 } // namespace about_flags | 2456 } // namespace about_flags |
| OLD | NEW |