| 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 316 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 327 | 327 |
| 328 // See comment above for kSearchButtonInOmniboxChoices. The same reasoning | 328 // See comment above for kSearchButtonInOmniboxChoices. The same reasoning |
| 329 // applies here. | 329 // applies here. |
| 330 const Experiment::Choice kOriginChipChoices[] = { | 330 const Experiment::Choice kOriginChipChoices[] = { |
| 331 { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" }, | 331 { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" }, |
| 332 { IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED, switches::kDisableOriginChip, ""}, | 332 { IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED, switches::kDisableOriginChip, ""}, |
| 333 { IDS_FLAGS_ORIGIN_CHIP_ALWAYS, switches::kEnableOriginChipAlways, ""}, | 333 { IDS_FLAGS_ORIGIN_CHIP_ALWAYS, switches::kEnableOriginChipAlways, ""}, |
| 334 { IDS_FLAGS_ORIGIN_CHIP_ON_SRP, switches::kEnableOriginChipOnSrp, ""} | 334 { IDS_FLAGS_ORIGIN_CHIP_ON_SRP, switches::kEnableOriginChipOnSrp, ""} |
| 335 }; | 335 }; |
| 336 | 336 |
| 337 const Experiment::Choice kTouchScrollingModeChoices[] = { | |
| 338 { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" }, | |
| 339 { IDS_FLAGS_TOUCH_SCROLLING_MODE_TOUCHCANCEL, | |
| 340 switches::kTouchScrollingMode, | |
| 341 switches::kTouchScrollingModeTouchcancel }, | |
| 342 { IDS_FLAGS_TOUCH_SCROLLING_MODE_ASYNC_TOUCHMOVE, | |
| 343 switches::kTouchScrollingMode, | |
| 344 switches::kTouchScrollingModeAsyncTouchmove }, | |
| 345 { IDS_FLAGS_TOUCH_SCROLLING_MODE_SYNC_TOUCHMOVE, | |
| 346 switches::kTouchScrollingMode, | |
| 347 switches::kTouchScrollingModeSyncTouchmove }, | |
| 348 }; | |
| 349 | |
| 350 const Experiment::Choice kExtensionContentVerificationChoices[] = { | 337 const Experiment::Choice kExtensionContentVerificationChoices[] = { |
| 351 { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" }, | 338 { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" }, |
| 352 { IDS_FLAGS_EXTENSION_CONTENT_VERIFICATION_BOOTSTRAP, | 339 { IDS_FLAGS_EXTENSION_CONTENT_VERIFICATION_BOOTSTRAP, |
| 353 switches::kExtensionContentVerification, | 340 switches::kExtensionContentVerification, |
| 354 switches::kExtensionContentVerificationBootstrap }, | 341 switches::kExtensionContentVerificationBootstrap }, |
| 355 { IDS_FLAGS_EXTENSION_CONTENT_VERIFICATION_ENFORCE, | 342 { IDS_FLAGS_EXTENSION_CONTENT_VERIFICATION_ENFORCE, |
| 356 switches::kExtensionContentVerification, | 343 switches::kExtensionContentVerification, |
| 357 switches::kExtensionContentVerificationEnforce }, | 344 switches::kExtensionContentVerificationEnforce }, |
| 358 { IDS_FLAGS_EXTENSION_CONTENT_VERIFICATION_ENFORCE_STRICT, | 345 { IDS_FLAGS_EXTENSION_CONTENT_VERIFICATION_ENFORCE_STRICT, |
| 359 switches::kExtensionContentVerification, | 346 switches::kExtensionContentVerification, |
| (...skipping 1407 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1767 }, | 1754 }, |
| 1768 { | 1755 { |
| 1769 "enable-centered-app-list", | 1756 "enable-centered-app-list", |
| 1770 IDS_FLAGS_ENABLE_CENTERED_APP_LIST_NAME, | 1757 IDS_FLAGS_ENABLE_CENTERED_APP_LIST_NAME, |
| 1771 IDS_FLAGS_ENABLE_CENTERED_APP_LIST_DESCRIPTION, | 1758 IDS_FLAGS_ENABLE_CENTERED_APP_LIST_DESCRIPTION, |
| 1772 kOsWin | kOsLinux | kOsCrOS, | 1759 kOsWin | kOsLinux | kOsCrOS, |
| 1773 SINGLE_VALUE_TYPE(app_list::switches::kEnableCenteredAppList) | 1760 SINGLE_VALUE_TYPE(app_list::switches::kEnableCenteredAppList) |
| 1774 }, | 1761 }, |
| 1775 #endif | 1762 #endif |
| 1776 { | 1763 { |
| 1777 "touch-scrolling-mode", | |
| 1778 IDS_FLAGS_TOUCH_SCROLLING_MODE_NAME, | |
| 1779 IDS_FLAGS_TOUCH_SCROLLING_MODE_DESCRIPTION, | |
| 1780 kOsWin | kOsLinux | kOsCrOS | kOsAndroid, | |
| 1781 MULTI_VALUE_TYPE(kTouchScrollingModeChoices) | |
| 1782 }, | |
| 1783 { | |
| 1784 "disable-threaded-scrolling", | 1764 "disable-threaded-scrolling", |
| 1785 IDS_FLAGS_DISABLE_THREADED_SCROLLING_NAME, | 1765 IDS_FLAGS_DISABLE_THREADED_SCROLLING_NAME, |
| 1786 IDS_FLAGS_DISABLE_THREADED_SCROLLING_DESCRIPTION, | 1766 IDS_FLAGS_DISABLE_THREADED_SCROLLING_DESCRIPTION, |
| 1787 kOsWin | kOsLinux | kOsCrOS | kOsAndroid, | 1767 kOsWin | kOsLinux | kOsCrOS | kOsAndroid, |
| 1788 SINGLE_VALUE_TYPE(switches::kDisableThreadedScrolling) | 1768 SINGLE_VALUE_TYPE(switches::kDisableThreadedScrolling) |
| 1789 }, | 1769 }, |
| 1790 { | 1770 { |
| 1791 "bleeding-edge-renderer-mode", | 1771 "bleeding-edge-renderer-mode", |
| 1792 IDS_FLAGS_BLEEDING_RENDERER_NAME, | 1772 IDS_FLAGS_BLEEDING_RENDERER_NAME, |
| 1793 IDS_FLAGS_BLEEDING_RENDERER_DESCRIPTION, | 1773 IDS_FLAGS_BLEEDING_RENDERER_DESCRIPTION, |
| (...skipping 936 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2730 } | 2710 } |
| 2731 | 2711 |
| 2732 const Experiment* GetExperiments(size_t* count) { | 2712 const Experiment* GetExperiments(size_t* count) { |
| 2733 *count = num_experiments; | 2713 *count = num_experiments; |
| 2734 return experiments; | 2714 return experiments; |
| 2735 } | 2715 } |
| 2736 | 2716 |
| 2737 } // namespace testing | 2717 } // namespace testing |
| 2738 | 2718 |
| 2739 } // namespace about_flags | 2719 } // namespace about_flags |
| OLD | NEW |