| 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 343 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 354 { IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED, | 354 { IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED, |
| 355 switches::kDisableSearchButtonInOmnibox, ""}, | 355 switches::kDisableSearchButtonInOmnibox, ""}, |
| 356 { IDS_FLAGS_SEARCH_BUTTON_IN_OMNIBOX_ENABLE_FOR_STR, | 356 { IDS_FLAGS_SEARCH_BUTTON_IN_OMNIBOX_ENABLE_FOR_STR, |
| 357 switches::kEnableSearchButtonInOmniboxForStr, ""}, | 357 switches::kEnableSearchButtonInOmniboxForStr, ""}, |
| 358 { IDS_FLAGS_SEARCH_BUTTON_IN_OMNIBOX_ENABLE_FOR_STR_OR_IIP, | 358 { IDS_FLAGS_SEARCH_BUTTON_IN_OMNIBOX_ENABLE_FOR_STR_OR_IIP, |
| 359 switches::kEnableSearchButtonInOmniboxForStrOrIip, ""}, | 359 switches::kEnableSearchButtonInOmniboxForStrOrIip, ""}, |
| 360 { IDS_FLAGS_SEARCH_BUTTON_IN_OMNIBOX_ENABLED, | 360 { IDS_FLAGS_SEARCH_BUTTON_IN_OMNIBOX_ENABLED, |
| 361 switches::kEnableSearchButtonInOmniboxAlways, ""} | 361 switches::kEnableSearchButtonInOmniboxAlways, ""} |
| 362 }; | 362 }; |
| 363 | 363 |
| 364 // See comment above for kSearchButtonInOmniboxChoices. The same reasoning | |
| 365 // applies here. | |
| 366 const Experiment::Choice kOriginChipChoices[] = { | |
| 367 { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" }, | |
| 368 { IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED, switches::kDisableOriginChip, ""}, | |
| 369 { IDS_FLAGS_ORIGIN_CHIP_ALWAYS, switches::kEnableOriginChipAlways, ""}, | |
| 370 { IDS_FLAGS_ORIGIN_CHIP_ON_SRP, switches::kEnableOriginChipOnSrp, ""} | |
| 371 }; | |
| 372 | |
| 373 const Experiment::Choice kTouchScrollingModeChoices[] = { | 364 const Experiment::Choice kTouchScrollingModeChoices[] = { |
| 374 { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" }, | 365 { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" }, |
| 375 { IDS_FLAGS_TOUCH_SCROLLING_MODE_TOUCHCANCEL, | 366 { IDS_FLAGS_TOUCH_SCROLLING_MODE_TOUCHCANCEL, |
| 376 switches::kTouchScrollingMode, | 367 switches::kTouchScrollingMode, |
| 377 switches::kTouchScrollingModeTouchcancel }, | 368 switches::kTouchScrollingModeTouchcancel }, |
| 378 { IDS_FLAGS_TOUCH_SCROLLING_MODE_ASYNC_TOUCHMOVE, | 369 { IDS_FLAGS_TOUCH_SCROLLING_MODE_ASYNC_TOUCHMOVE, |
| 379 switches::kTouchScrollingMode, | 370 switches::kTouchScrollingMode, |
| 380 switches::kTouchScrollingModeAsyncTouchmove }, | 371 switches::kTouchScrollingModeAsyncTouchmove }, |
| 381 { IDS_FLAGS_TOUCH_SCROLLING_MODE_SYNC_TOUCHMOVE, | 372 { IDS_FLAGS_TOUCH_SCROLLING_MODE_SYNC_TOUCHMOVE, |
| 382 switches::kTouchScrollingMode, | 373 switches::kTouchScrollingMode, |
| (...skipping 1329 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1712 }, | 1703 }, |
| 1713 #endif | 1704 #endif |
| 1714 { | 1705 { |
| 1715 "num-raster-threads", | 1706 "num-raster-threads", |
| 1716 IDS_FLAGS_NUM_RASTER_THREADS_NAME, | 1707 IDS_FLAGS_NUM_RASTER_THREADS_NAME, |
| 1717 IDS_FLAGS_NUM_RASTER_THREADS_DESCRIPTION, | 1708 IDS_FLAGS_NUM_RASTER_THREADS_DESCRIPTION, |
| 1718 kOsAll, | 1709 kOsAll, |
| 1719 MULTI_VALUE_TYPE(kNumRasterThreadsChoices) | 1710 MULTI_VALUE_TYPE(kNumRasterThreadsChoices) |
| 1720 }, | 1711 }, |
| 1721 { | 1712 { |
| 1722 "origin-chip-in-omnibox", | |
| 1723 IDS_FLAGS_ORIGIN_CHIP_NAME, | |
| 1724 IDS_FLAGS_ORIGIN_CHIP_DESCRIPTION, | |
| 1725 kOsCrOS | kOsMac | kOsWin | kOsLinux, | |
| 1726 MULTI_VALUE_TYPE(kOriginChipChoices) | |
| 1727 }, | |
| 1728 { | |
| 1729 "search-button-in-omnibox", | 1713 "search-button-in-omnibox", |
| 1730 IDS_FLAGS_SEARCH_BUTTON_IN_OMNIBOX_NAME, | 1714 IDS_FLAGS_SEARCH_BUTTON_IN_OMNIBOX_NAME, |
| 1731 IDS_FLAGS_SEARCH_BUTTON_IN_OMNIBOX_DESCRIPTION, | 1715 IDS_FLAGS_SEARCH_BUTTON_IN_OMNIBOX_DESCRIPTION, |
| 1732 kOsCrOS | kOsMac | kOsWin | kOsLinux, | 1716 kOsCrOS | kOsMac | kOsWin | kOsLinux, |
| 1733 MULTI_VALUE_TYPE(kSearchButtonInOmniboxChoices) | 1717 MULTI_VALUE_TYPE(kSearchButtonInOmniboxChoices) |
| 1734 }, | 1718 }, |
| 1735 { | 1719 { |
| 1736 "ignore-autocomplete-off-autofill", | 1720 "ignore-autocomplete-off-autofill", |
| 1737 IDS_FLAGS_IGNORE_AUTOCOMPLETE_OFF_AUTOFILL_NAME, | 1721 IDS_FLAGS_IGNORE_AUTOCOMPLETE_OFF_AUTOFILL_NAME, |
| 1738 IDS_FLAGS_IGNORE_AUTOCOMPLETE_OFF_AUTOFILL_DESCRIPTION, | 1722 IDS_FLAGS_IGNORE_AUTOCOMPLETE_OFF_AUTOFILL_DESCRIPTION, |
| (...skipping 913 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2652 } | 2636 } |
| 2653 | 2637 |
| 2654 const Experiment* GetExperiments(size_t* count) { | 2638 const Experiment* GetExperiments(size_t* count) { |
| 2655 *count = num_experiments; | 2639 *count = num_experiments; |
| 2656 return experiments; | 2640 return experiments; |
| 2657 } | 2641 } |
| 2658 | 2642 |
| 2659 } // namespace testing | 2643 } // namespace testing |
| 2660 | 2644 |
| 2661 } // namespace about_flags | 2645 } // namespace about_flags |
| OLD | NEW |