| 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 402 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 413 {IDS_FLAGS_TOP_CHROME_MD_NON_MATERIAL, "", ""}, | 413 {IDS_FLAGS_TOP_CHROME_MD_NON_MATERIAL, "", ""}, |
| 414 {IDS_FLAGS_TOP_CHROME_MD_MATERIAL, | 414 {IDS_FLAGS_TOP_CHROME_MD_MATERIAL, |
| 415 switches::kTopChromeMD, | 415 switches::kTopChromeMD, |
| 416 switches::kTopChromeMDMaterial}, | 416 switches::kTopChromeMDMaterial}, |
| 417 {IDS_FLAGS_TOP_CHROME_MD_MATERIAL_HYBRID, | 417 {IDS_FLAGS_TOP_CHROME_MD_MATERIAL_HYBRID, |
| 418 switches::kTopChromeMD, | 418 switches::kTopChromeMD, |
| 419 switches::kTopChromeMDMaterialHybrid}}; | 419 switches::kTopChromeMDMaterialHybrid}}; |
| 420 #endif | 420 #endif |
| 421 | 421 |
| 422 #if defined(OS_CHROMEOS) | 422 #if defined(OS_CHROMEOS) |
| 423 | |
| 424 const Experiment::Choice kAshMaterialDesignInkDropAnimationSpeed[] = { | 423 const Experiment::Choice kAshMaterialDesignInkDropAnimationSpeed[] = { |
| 425 {IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", ""}, | 424 {IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", ""}, |
| 426 {IDS_FLAGS_MATERIAL_DESIGN_INK_DROP_ANIMATION_FAST, | 425 {IDS_FLAGS_MATERIAL_DESIGN_INK_DROP_ANIMATION_FAST, |
| 427 switches::kMaterialDesignInkDropAnimationSpeed, | 426 switches::kMaterialDesignInkDropAnimationSpeed, |
| 428 switches::kMaterialDesignInkDropAnimationSpeedFast}, | 427 switches::kMaterialDesignInkDropAnimationSpeedFast}, |
| 429 {IDS_FLAGS_MATERIAL_DESIGN_INK_DROP_ANIMATION_SLOW, | 428 {IDS_FLAGS_MATERIAL_DESIGN_INK_DROP_ANIMATION_SLOW, |
| 430 switches::kMaterialDesignInkDropAnimationSpeed, | 429 switches::kMaterialDesignInkDropAnimationSpeed, |
| 431 switches::kMaterialDesignInkDropAnimationSpeedSlow}}; | 430 switches::kMaterialDesignInkDropAnimationSpeedSlow}}; |
| 432 | 431 |
| 433 const Experiment::Choice kDataSaverPromptChoices[] = { | 432 const Experiment::Choice kDataSaverPromptChoices[] = { |
| (...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 473 | 472 |
| 474 const Experiment::Choice kGestureEditingChoices[] = { | 473 const Experiment::Choice kGestureEditingChoices[] = { |
| 475 { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" }, | 474 { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" }, |
| 476 { IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED, | 475 { IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED, |
| 477 keyboard::switches::kGestureEditing, | 476 keyboard::switches::kGestureEditing, |
| 478 keyboard::switches::kGestureEditingDisabled}, | 477 keyboard::switches::kGestureEditingDisabled}, |
| 479 { IDS_GENERIC_EXPERIMENT_CHOICE_ENABLED, | 478 { IDS_GENERIC_EXPERIMENT_CHOICE_ENABLED, |
| 480 keyboard::switches::kGestureEditing, | 479 keyboard::switches::kGestureEditing, |
| 481 keyboard::switches::kGestureEditingEnabled}, | 480 keyboard::switches::kGestureEditingEnabled}, |
| 482 }; | 481 }; |
| 483 #endif | |
| 484 | 482 |
| 485 const Experiment::Choice kDownloadNotificationChoices[] = { | 483 const Experiment::Choice kDownloadNotificationChoices[] = { |
| 486 { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" }, | 484 { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" }, |
| 487 { IDS_GENERIC_EXPERIMENT_CHOICE_ENABLED, | 485 { IDS_GENERIC_EXPERIMENT_CHOICE_ENABLED, |
| 488 switches::kEnableDownloadNotification, | 486 switches::kEnableDownloadNotification, |
| 489 "enabled" }, | 487 "enabled" }, |
| 490 { IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED, | 488 { IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED, |
| 491 switches::kEnableDownloadNotification, | 489 switches::kEnableDownloadNotification, |
| 492 "disabled" } | 490 "disabled" } |
| 493 }; | 491 }; |
| 492 #endif |
| 494 | 493 |
| 495 const Experiment::Choice kSupervisedUserSafeSitesChoices[] = { | 494 const Experiment::Choice kSupervisedUserSafeSitesChoices[] = { |
| 496 { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" }, | 495 { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" }, |
| 497 { IDS_GENERIC_EXPERIMENT_CHOICE_ENABLED, | 496 { IDS_GENERIC_EXPERIMENT_CHOICE_ENABLED, |
| 498 switches::kSupervisedUserSafeSites, | 497 switches::kSupervisedUserSafeSites, |
| 499 "enabled" }, | 498 "enabled" }, |
| 500 { IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED, | 499 { IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED, |
| 501 switches::kSupervisedUserSafeSites, | 500 switches::kSupervisedUserSafeSites, |
| 502 "disabled" }, | 501 "disabled" }, |
| 503 { IDS_SUPERVISED_USER_SAFESITES_BLACKLIST_ONLY, | 502 { IDS_SUPERVISED_USER_SAFESITES_BLACKLIST_ONLY, |
| (...skipping 363 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 867 kOsCrOS, | 866 kOsCrOS, |
| 868 ENABLE_DISABLE_VALUE_TYPE( | 867 ENABLE_DISABLE_VALUE_TYPE( |
| 869 chromeos::switches::kEnableNetworkPortalNotification, | 868 chromeos::switches::kEnableNetworkPortalNotification, |
| 870 chromeos::switches::kDisableNetworkPortalNotification)}, | 869 chromeos::switches::kDisableNetworkPortalNotification)}, |
| 871 #endif | 870 #endif |
| 872 {"enable-download-resumption", | 871 {"enable-download-resumption", |
| 873 IDS_FLAGS_ENABLE_DOWNLOAD_RESUMPTION_NAME, | 872 IDS_FLAGS_ENABLE_DOWNLOAD_RESUMPTION_NAME, |
| 874 IDS_FLAGS_ENABLE_DOWNLOAD_RESUMPTION_DESCRIPTION, | 873 IDS_FLAGS_ENABLE_DOWNLOAD_RESUMPTION_DESCRIPTION, |
| 875 kOsDesktop, | 874 kOsDesktop, |
| 876 SINGLE_VALUE_TYPE(switches::kEnableDownloadResumption)}, | 875 SINGLE_VALUE_TYPE(switches::kEnableDownloadResumption)}, |
| 876 #if defined(OS_CHROMEOS) |
| 877 {"enable-download-notification", | 877 {"enable-download-notification", |
| 878 IDS_FLAGS_ENABLE_DOWNLOAD_NOTIFICATION_NAME, | 878 IDS_FLAGS_ENABLE_DOWNLOAD_NOTIFICATION_NAME, |
| 879 IDS_FLAGS_ENABLE_DOWNLOAD_NOTIFICATION_DESCRIPTION, | 879 IDS_FLAGS_ENABLE_DOWNLOAD_NOTIFICATION_DESCRIPTION, |
| 880 kOsDesktop, | 880 kOsCrOS, |
| 881 MULTI_VALUE_TYPE(kDownloadNotificationChoices)}, | 881 MULTI_VALUE_TYPE(kDownloadNotificationChoices)}, |
| 882 #endif |
| 882 #if defined(ENABLE_PLUGINS) | 883 #if defined(ENABLE_PLUGINS) |
| 883 {"allow-nacl-socket-api", | 884 {"allow-nacl-socket-api", |
| 884 IDS_FLAGS_ALLOW_NACL_SOCKET_API_NAME, | 885 IDS_FLAGS_ALLOW_NACL_SOCKET_API_NAME, |
| 885 IDS_FLAGS_ALLOW_NACL_SOCKET_API_DESCRIPTION, | 886 IDS_FLAGS_ALLOW_NACL_SOCKET_API_DESCRIPTION, |
| 886 kOsDesktop, | 887 kOsDesktop, |
| 887 SINGLE_VALUE_TYPE_AND_VALUE(switches::kAllowNaClSocketAPI, "*")}, | 888 SINGLE_VALUE_TYPE_AND_VALUE(switches::kAllowNaClSocketAPI, "*")}, |
| 888 #endif | 889 #endif |
| 889 #if defined(OS_CHROMEOS) | 890 #if defined(OS_CHROMEOS) |
| 890 {"allow-touchpad-three-finger-click", | 891 {"allow-touchpad-three-finger-click", |
| 891 IDS_FLAGS_ALLOW_TOUCHPAD_THREE_FINGER_CLICK_NAME, | 892 IDS_FLAGS_ALLOW_TOUCHPAD_THREE_FINGER_CLICK_NAME, |
| (...skipping 1815 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2707 } | 2708 } |
| 2708 | 2709 |
| 2709 const Experiment* GetExperiments(size_t* count) { | 2710 const Experiment* GetExperiments(size_t* count) { |
| 2710 *count = num_experiments; | 2711 *count = num_experiments; |
| 2711 return experiments; | 2712 return experiments; |
| 2712 } | 2713 } |
| 2713 | 2714 |
| 2714 } // namespace testing | 2715 } // namespace testing |
| 2715 | 2716 |
| 2716 } // namespace about_flags | 2717 } // namespace about_flags |
| OLD | NEW |