| 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 409 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 420 #if defined(OS_ANDROID) | 420 #if defined(OS_ANDROID) |
| 421 const Experiment::Choice kAnswersInSuggestChoices[] = { | 421 const Experiment::Choice kAnswersInSuggestChoices[] = { |
| 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 switches::kEnableAnswersInSuggest, ""}, | 424 switches::kEnableAnswersInSuggest, ""}, |
| 425 { IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED, | 425 { IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED, |
| 426 switches::kDisableAnswersInSuggest, ""} | 426 switches::kDisableAnswersInSuggest, ""} |
| 427 }; | 427 }; |
| 428 #endif | 428 #endif |
| 429 | 429 |
| 430 #if defined(OS_CHROMEOS) | |
| 431 const Experiment::Choice kEnableFileManagerMTPChoices[] = { | |
| 432 { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" }, | |
| 433 { IDS_GENERIC_EXPERIMENT_CHOICE_ENABLED, | |
| 434 chromeos::switches::kEnableFileManagerMTP, "true" }, | |
| 435 { IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED, | |
| 436 chromeos::switches::kEnableFileManagerMTP, "false" } | |
| 437 }; | |
| 438 #endif | |
| 439 | |
| 440 const Experiment::Choice kEnableSettingsWindowChoices[] = { | 430 const Experiment::Choice kEnableSettingsWindowChoices[] = { |
| 441 { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" }, | 431 { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" }, |
| 442 { IDS_GENERIC_EXPERIMENT_CHOICE_ENABLED, | 432 { IDS_GENERIC_EXPERIMENT_CHOICE_ENABLED, |
| 443 ::switches::kEnableSettingsWindow, "" }, | 433 ::switches::kEnableSettingsWindow, "" }, |
| 444 { IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED, | 434 { IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED, |
| 445 ::switches::kDisableSettingsWindow, "" }, | 435 ::switches::kDisableSettingsWindow, "" }, |
| 446 }; | 436 }; |
| 447 | 437 |
| 448 // Note that the value is specified in seconds (where 0 is equivalent to | 438 // Note that the value is specified in seconds (where 0 is equivalent to |
| 449 // disabled). | 439 // disabled). |
| (...skipping 1303 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1753 }, | 1743 }, |
| 1754 #endif | 1744 #endif |
| 1755 { | 1745 { |
| 1756 "enable-save-password-bubble", | 1746 "enable-save-password-bubble", |
| 1757 IDS_FLAGS_ENABLE_SAVE_PASSWORD_BUBBLE_NAME, | 1747 IDS_FLAGS_ENABLE_SAVE_PASSWORD_BUBBLE_NAME, |
| 1758 IDS_FLAGS_ENABLE_SAVE_PASSWORD_BUBBLE_DESCRIPTION, | 1748 IDS_FLAGS_ENABLE_SAVE_PASSWORD_BUBBLE_DESCRIPTION, |
| 1759 kOsWin | kOsLinux | kOsCrOS | kOsMac, | 1749 kOsWin | kOsLinux | kOsCrOS | kOsMac, |
| 1760 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableSavePasswordBubble, | 1750 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableSavePasswordBubble, |
| 1761 switches::kDisableSavePasswordBubble) | 1751 switches::kDisableSavePasswordBubble) |
| 1762 }, | 1752 }, |
| 1763 #if defined(OS_CHROMEOS) | |
| 1764 { | |
| 1765 "enable-filemanager-mtp", | |
| 1766 IDS_FLAGS_ENABLE_FILE_MANAGER_MTP_NAME, | |
| 1767 IDS_FLAGS_ENABLE_FILE_MANAGER_MTP_DESCRIPTION, | |
| 1768 kOsCrOS, | |
| 1769 MULTI_VALUE_TYPE(kEnableFileManagerMTPChoices) | |
| 1770 }, | |
| 1771 #endif | |
| 1772 // TODO(tyoshino): Remove this temporary flag and command line switch. See | 1753 // TODO(tyoshino): Remove this temporary flag and command line switch. See |
| 1773 // crbug.com/366483 for the target milestone. | 1754 // crbug.com/366483 for the target milestone. |
| 1774 { | 1755 { |
| 1775 "allow-insecure-websocket-from-https-origin", | 1756 "allow-insecure-websocket-from-https-origin", |
| 1776 IDS_FLAGS_ALLOW_INSECURE_WEBSOCKET_FROM_HTTPS_ORIGIN_NAME, | 1757 IDS_FLAGS_ALLOW_INSECURE_WEBSOCKET_FROM_HTTPS_ORIGIN_NAME, |
| 1777 IDS_FLAGS_ALLOW_INSECURE_WEBSOCKET_FROM_HTTPS_ORIGIN_DESCRIPTION, | 1758 IDS_FLAGS_ALLOW_INSECURE_WEBSOCKET_FROM_HTTPS_ORIGIN_DESCRIPTION, |
| 1778 kOsAll, | 1759 kOsAll, |
| 1779 SINGLE_VALUE_TYPE(switches::kAllowInsecureWebSocketFromHttpsOrigin) | 1760 SINGLE_VALUE_TYPE(switches::kAllowInsecureWebSocketFromHttpsOrigin) |
| 1780 }, | 1761 }, |
| 1781 { | 1762 { |
| (...skipping 709 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2491 } | 2472 } |
| 2492 | 2473 |
| 2493 const Experiment* GetExperiments(size_t* count) { | 2474 const Experiment* GetExperiments(size_t* count) { |
| 2494 *count = num_experiments; | 2475 *count = num_experiments; |
| 2495 return experiments; | 2476 return experiments; |
| 2496 } | 2477 } |
| 2497 | 2478 |
| 2498 } // namespace testing | 2479 } // namespace testing |
| 2499 | 2480 |
| 2500 } // namespace about_flags | 2481 } // namespace about_flags |
| OLD | NEW |