| 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 407 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 418 #endif | 418 #endif |
| 419 | 419 |
| 420 #if defined(OS_CHROMEOS) | 420 #if defined(OS_CHROMEOS) |
| 421 const Experiment::Choice kEnableFileManagerMTPChoices[] = { | 421 const Experiment::Choice kEnableFileManagerMTPChoices[] = { |
| 422 { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" }, | 422 { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" }, |
| 423 { IDS_GENERIC_EXPERIMENT_CHOICE_ENABLED, | 423 { IDS_GENERIC_EXPERIMENT_CHOICE_ENABLED, |
| 424 chromeos::switches::kEnableFileManagerMTP, "true" }, | 424 chromeos::switches::kEnableFileManagerMTP, "true" }, |
| 425 { IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED, | 425 { IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED, |
| 426 chromeos::switches::kEnableFileManagerMTP, "false" } | 426 chromeos::switches::kEnableFileManagerMTP, "false" } |
| 427 }; | 427 }; |
| 428 | |
| 429 const Experiment::Choice kEnableFileManagerNewGalleryChoices[] = { | |
| 430 { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", ""}, | |
| 431 { IDS_GENERIC_EXPERIMENT_CHOICE_ENABLED, | |
| 432 chromeos::switches::kFileManagerEnableNewGallery, "true"}, | |
| 433 { IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED, | |
| 434 chromeos::switches::kFileManagerEnableNewGallery, "false"} | |
| 435 }; | |
| 436 #endif | 428 #endif |
| 437 | 429 |
| 438 const Experiment::Choice kEnableSettingsWindowChoices[] = { | 430 const Experiment::Choice kEnableSettingsWindowChoices[] = { |
| 439 { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" }, | 431 { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" }, |
| 440 { IDS_GENERIC_EXPERIMENT_CHOICE_ENABLED, | 432 { IDS_GENERIC_EXPERIMENT_CHOICE_ENABLED, |
| 441 ::switches::kEnableSettingsWindow, "" }, | 433 ::switches::kEnableSettingsWindow, "" }, |
| 442 { IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED, | 434 { IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED, |
| 443 ::switches::kDisableSettingsWindow, "" }, | 435 ::switches::kDisableSettingsWindow, "" }, |
| 444 }; | 436 }; |
| 445 | 437 |
| (...skipping 542 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 988 }, | 980 }, |
| 989 #if defined(OS_CHROMEOS) | 981 #if defined(OS_CHROMEOS) |
| 990 { | 982 { |
| 991 "disable-boot-animation", | 983 "disable-boot-animation", |
| 992 IDS_FLAGS_DISABLE_BOOT_ANIMATION, | 984 IDS_FLAGS_DISABLE_BOOT_ANIMATION, |
| 993 IDS_FLAGS_DISABLE_BOOT_ANIMATION_DESCRIPTION, | 985 IDS_FLAGS_DISABLE_BOOT_ANIMATION_DESCRIPTION, |
| 994 kOsCrOSOwnerOnly, | 986 kOsCrOSOwnerOnly, |
| 995 SINGLE_VALUE_TYPE(chromeos::switches::kDisableBootAnimation), | 987 SINGLE_VALUE_TYPE(chromeos::switches::kDisableBootAnimation), |
| 996 }, | 988 }, |
| 997 { | 989 { |
| 998 "enable-new-gallery", | |
| 999 IDS_FLAGS_FILE_MANAGER_ENABLE_NEW_GALLERY_NAME, | |
| 1000 IDS_FLAGS_FILE_MANAGER_ENABLE_NEW_GALLERY_DESCRIPTION, | |
| 1001 kOsCrOS, | |
| 1002 MULTI_VALUE_TYPE(kEnableFileManagerNewGalleryChoices) | |
| 1003 }, | |
| 1004 { | |
| 1005 "enable-video-player-chromecast-support", | 990 "enable-video-player-chromecast-support", |
| 1006 IDS_FLAGS_ENABLE_VIDEO_PLAYER_CHROMECAST_SUPPORT_NAME, | 991 IDS_FLAGS_ENABLE_VIDEO_PLAYER_CHROMECAST_SUPPORT_NAME, |
| 1007 IDS_FLAGS_ENABLE_VIDEO_PLAYER_CHROMECAST_SUPPORT_DESCRIPTION, | 992 IDS_FLAGS_ENABLE_VIDEO_PLAYER_CHROMECAST_SUPPORT_DESCRIPTION, |
| 1008 kOsCrOS, | 993 kOsCrOS, |
| 1009 SINGLE_VALUE_TYPE(chromeos::switches::kEnableVideoPlayerChromecastSupport) | 994 SINGLE_VALUE_TYPE(chromeos::switches::kEnableVideoPlayerChromecastSupport) |
| 1010 }, | 995 }, |
| 1011 { | 996 { |
| 1012 "disable-office-editing-component-app", | 997 "disable-office-editing-component-app", |
| 1013 IDS_FLAGS_DISABLE_OFFICE_EDITING_COMPONENT_APP_NAME, | 998 IDS_FLAGS_DISABLE_OFFICE_EDITING_COMPONENT_APP_NAME, |
| 1014 IDS_FLAGS_DISABLE_OFFICE_EDITING_COMPONENT_APP_DESCRIPTION, | 999 IDS_FLAGS_DISABLE_OFFICE_EDITING_COMPONENT_APP_DESCRIPTION, |
| (...skipping 1471 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2486 } | 2471 } |
| 2487 | 2472 |
| 2488 const Experiment* GetExperiments(size_t* count) { | 2473 const Experiment* GetExperiments(size_t* count) { |
| 2489 *count = num_experiments; | 2474 *count = num_experiments; |
| 2490 return experiments; | 2475 return experiments; |
| 2491 } | 2476 } |
| 2492 | 2477 |
| 2493 } // namespace testing | 2478 } // namespace testing |
| 2494 | 2479 |
| 2495 } // namespace about_flags | 2480 } // namespace about_flags |
| OLD | NEW |