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 <algorithm> | 7 #include <algorithm> |
8 #include <iterator> | 8 #include <iterator> |
9 #include <map> | 9 #include <map> |
10 #include <set> | 10 #include <set> |
(...skipping 317 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
328 switches::kEnableZeroSuggestMostVisited, ""}, | 328 switches::kEnableZeroSuggestMostVisited, ""}, |
329 { IDS_FLAGS_ZERO_SUGGEST_ETHER_SERP, | 329 { IDS_FLAGS_ZERO_SUGGEST_ETHER_SERP, |
330 switches::kEnableZeroSuggestEtherSerp, ""}, | 330 switches::kEnableZeroSuggestEtherSerp, ""}, |
331 { IDS_FLAGS_ZERO_SUGGEST_ETHER_NO_SERP, | 331 { IDS_FLAGS_ZERO_SUGGEST_ETHER_NO_SERP, |
332 switches::kEnableZeroSuggestEtherNoSerp, ""}, | 332 switches::kEnableZeroSuggestEtherNoSerp, ""}, |
333 { IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED, | 333 { IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED, |
334 switches::kDisableZeroSuggest, ""} | 334 switches::kDisableZeroSuggest, ""} |
335 }; | 335 }; |
336 #endif | 336 #endif |
337 | 337 |
338 #if defined(OS_CHROMEOS) | |
339 const Experiment::Choice kNetworkPortalNotificationChoices[] = { | |
Jun Mukai
2014/02/19 19:17:25
Instead of declaring this, isn't it sufficient to
ygorshenin1
2014/02/20 16:31:39
Done.
| |
340 { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" }, | |
341 { IDS_GENERIC_EXPERIMENT_CHOICE_ENABLED, | |
342 chromeos::switches::kEnableNetworkPortalNotification, "" }, | |
343 { IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED, | |
344 chromeos::switches::kDisableNetworkPortalNotification, "" } | |
345 }; | |
346 #endif | |
347 | |
338 const Experiment::Choice kNumRasterThreadsChoices[] = { | 348 const Experiment::Choice kNumRasterThreadsChoices[] = { |
339 { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" }, | 349 { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" }, |
340 { IDS_FLAGS_NUM_RASTER_THREADS_ONE, switches::kNumRasterThreads, "1" }, | 350 { IDS_FLAGS_NUM_RASTER_THREADS_ONE, switches::kNumRasterThreads, "1" }, |
341 { IDS_FLAGS_NUM_RASTER_THREADS_TWO, switches::kNumRasterThreads, "2" }, | 351 { IDS_FLAGS_NUM_RASTER_THREADS_TWO, switches::kNumRasterThreads, "2" }, |
342 { IDS_FLAGS_NUM_RASTER_THREADS_THREE, switches::kNumRasterThreads, "3" }, | 352 { IDS_FLAGS_NUM_RASTER_THREADS_THREE, switches::kNumRasterThreads, "3" }, |
343 { IDS_FLAGS_NUM_RASTER_THREADS_FOUR, switches::kNumRasterThreads, "4" } | 353 { IDS_FLAGS_NUM_RASTER_THREADS_FOUR, switches::kNumRasterThreads, "4" } |
344 }; | 354 }; |
345 | 355 |
346 // We're using independent flags here (as opposed to a common flag with | 356 // We're using independent flags here (as opposed to a common flag with |
347 // different values) to be able to enable/disable the entire experience | 357 // different values) to be able to enable/disable the entire experience |
(...skipping 678 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1026 }, | 1036 }, |
1027 { | 1037 { |
1028 "ash-enable-immersive-fullscreen-all-windows2", | 1038 "ash-enable-immersive-fullscreen-all-windows2", |
1029 IDS_FLAGS_IMMERSIVE_FULLSCREEN_FOR_ALL_WINDOWS_NAME, | 1039 IDS_FLAGS_IMMERSIVE_FULLSCREEN_FOR_ALL_WINDOWS_NAME, |
1030 IDS_FLAGS_IMMERSIVE_FULLSCREEN_FOR_ALL_WINDOWS_DESCRIPTION, | 1040 IDS_FLAGS_IMMERSIVE_FULLSCREEN_FOR_ALL_WINDOWS_DESCRIPTION, |
1031 kOsCrOS, | 1041 kOsCrOS, |
1032 ENABLE_DISABLE_VALUE_TYPE( | 1042 ENABLE_DISABLE_VALUE_TYPE( |
1033 ash::switches::kAshEnableImmersiveFullscreenForAllWindows, | 1043 ash::switches::kAshEnableImmersiveFullscreenForAllWindows, |
1034 ash::switches::kAshEnableImmersiveFullscreenForBrowserOnly) | 1044 ash::switches::kAshEnableImmersiveFullscreenForBrowserOnly) |
1035 }, | 1045 }, |
1046 { | |
1047 "network-portal-notification", | |
1048 IDS_FLAGS_NETWORK_PORTAL_NOTIFICATION_NAME, | |
1049 IDS_FLAGS_NETWORK_PORTAL_NOTIFICATION_DESCRIPTION, | |
1050 kOsCrOS, | |
1051 MULTI_VALUE_TYPE(kNetworkPortalNotificationChoices) | |
1052 }, | |
1036 #endif | 1053 #endif |
1037 { | 1054 { |
1038 "enable-download-resumption", | 1055 "enable-download-resumption", |
1039 IDS_FLAGS_ENABLE_DOWNLOAD_RESUMPTION_NAME, | 1056 IDS_FLAGS_ENABLE_DOWNLOAD_RESUMPTION_NAME, |
1040 IDS_FLAGS_ENABLE_DOWNLOAD_RESUMPTION_DESCRIPTION, | 1057 IDS_FLAGS_ENABLE_DOWNLOAD_RESUMPTION_DESCRIPTION, |
1041 kOsDesktop, | 1058 kOsDesktop, |
1042 SINGLE_VALUE_TYPE(switches::kEnableDownloadResumption) | 1059 SINGLE_VALUE_TYPE(switches::kEnableDownloadResumption) |
1043 }, | 1060 }, |
1044 { | 1061 { |
1045 "allow-nacl-socket-api", | 1062 "allow-nacl-socket-api", |
(...skipping 1464 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
2510 } | 2527 } |
2511 | 2528 |
2512 const Experiment* GetExperiments(size_t* count) { | 2529 const Experiment* GetExperiments(size_t* count) { |
2513 *count = num_experiments; | 2530 *count = num_experiments; |
2514 return experiments; | 2531 return experiments; |
2515 } | 2532 } |
2516 | 2533 |
2517 } // namespace testing | 2534 } // namespace testing |
2518 | 2535 |
2519 } // namespace about_flags | 2536 } // namespace about_flags |
OLD | NEW |