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 329 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
340 switches::kEnableZeroSuggestMostVisited, ""}, | 340 switches::kEnableZeroSuggestMostVisited, ""}, |
341 { IDS_FLAGS_ZERO_SUGGEST_ETHER_SERP, | 341 { IDS_FLAGS_ZERO_SUGGEST_ETHER_SERP, |
342 switches::kEnableZeroSuggestEtherSerp, ""}, | 342 switches::kEnableZeroSuggestEtherSerp, ""}, |
343 { IDS_FLAGS_ZERO_SUGGEST_ETHER_NO_SERP, | 343 { IDS_FLAGS_ZERO_SUGGEST_ETHER_NO_SERP, |
344 switches::kEnableZeroSuggestEtherNoSerp, ""}, | 344 switches::kEnableZeroSuggestEtherNoSerp, ""}, |
345 { IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED, | 345 { IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED, |
346 switches::kDisableZeroSuggest, ""} | 346 switches::kDisableZeroSuggest, ""} |
347 }; | 347 }; |
348 #endif | 348 #endif |
349 | 349 |
350 | |
oshima
2014/02/20 19:00:54
nit: remove extra line
ygorshenin1
2014/02/20 19:18:45
Done.
| |
350 const Experiment::Choice kNumRasterThreadsChoices[] = { | 351 const Experiment::Choice kNumRasterThreadsChoices[] = { |
351 { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" }, | 352 { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" }, |
352 { IDS_FLAGS_NUM_RASTER_THREADS_ONE, switches::kNumRasterThreads, "1" }, | 353 { IDS_FLAGS_NUM_RASTER_THREADS_ONE, switches::kNumRasterThreads, "1" }, |
353 { IDS_FLAGS_NUM_RASTER_THREADS_TWO, switches::kNumRasterThreads, "2" }, | 354 { IDS_FLAGS_NUM_RASTER_THREADS_TWO, switches::kNumRasterThreads, "2" }, |
354 { IDS_FLAGS_NUM_RASTER_THREADS_THREE, switches::kNumRasterThreads, "3" }, | 355 { IDS_FLAGS_NUM_RASTER_THREADS_THREE, switches::kNumRasterThreads, "3" }, |
355 { IDS_FLAGS_NUM_RASTER_THREADS_FOUR, switches::kNumRasterThreads, "4" } | 356 { IDS_FLAGS_NUM_RASTER_THREADS_FOUR, switches::kNumRasterThreads, "4" } |
356 }; | 357 }; |
357 | 358 |
358 // We're using independent flags here (as opposed to a common flag with | 359 // We're using independent flags here (as opposed to a common flag with |
359 // different values) to be able to enable/disable the entire experience | 360 // different values) to be able to enable/disable the entire experience |
(...skipping 671 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1031 }, | 1032 }, |
1032 { | 1033 { |
1033 "ash-enable-immersive-fullscreen-all-windows2", | 1034 "ash-enable-immersive-fullscreen-all-windows2", |
1034 IDS_FLAGS_IMMERSIVE_FULLSCREEN_FOR_ALL_WINDOWS_NAME, | 1035 IDS_FLAGS_IMMERSIVE_FULLSCREEN_FOR_ALL_WINDOWS_NAME, |
1035 IDS_FLAGS_IMMERSIVE_FULLSCREEN_FOR_ALL_WINDOWS_DESCRIPTION, | 1036 IDS_FLAGS_IMMERSIVE_FULLSCREEN_FOR_ALL_WINDOWS_DESCRIPTION, |
1036 kOsCrOS, | 1037 kOsCrOS, |
1037 ENABLE_DISABLE_VALUE_TYPE( | 1038 ENABLE_DISABLE_VALUE_TYPE( |
1038 ash::switches::kAshEnableImmersiveFullscreenForAllWindows, | 1039 ash::switches::kAshEnableImmersiveFullscreenForAllWindows, |
1039 ash::switches::kAshEnableImmersiveFullscreenForBrowserOnly) | 1040 ash::switches::kAshEnableImmersiveFullscreenForBrowserOnly) |
1040 }, | 1041 }, |
1042 { | |
1043 "network-portal-notification", | |
1044 IDS_FLAGS_NETWORK_PORTAL_NOTIFICATION_NAME, | |
1045 IDS_FLAGS_NETWORK_PORTAL_NOTIFICATION_DESCRIPTION, | |
1046 kOsCrOS, | |
1047 ENABLE_DISABLE_VALUE_TYPE( | |
1048 chromeos::switches::kEnableNetworkPortalNotification, | |
1049 chromeos::switches::kDisableNetworkPortalNotification) | |
1050 }, | |
1041 #endif | 1051 #endif |
1042 { | 1052 { |
1043 "enable-download-resumption", | 1053 "enable-download-resumption", |
1044 IDS_FLAGS_ENABLE_DOWNLOAD_RESUMPTION_NAME, | 1054 IDS_FLAGS_ENABLE_DOWNLOAD_RESUMPTION_NAME, |
1045 IDS_FLAGS_ENABLE_DOWNLOAD_RESUMPTION_DESCRIPTION, | 1055 IDS_FLAGS_ENABLE_DOWNLOAD_RESUMPTION_DESCRIPTION, |
1046 kOsDesktop, | 1056 kOsDesktop, |
1047 SINGLE_VALUE_TYPE(switches::kEnableDownloadResumption) | 1057 SINGLE_VALUE_TYPE(switches::kEnableDownloadResumption) |
1048 }, | 1058 }, |
1049 { | 1059 { |
1050 "allow-nacl-socket-api", | 1060 "allow-nacl-socket-api", |
(...skipping 1462 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
2513 } | 2523 } |
2514 | 2524 |
2515 const Experiment* GetExperiments(size_t* count) { | 2525 const Experiment* GetExperiments(size_t* count) { |
2516 *count = num_experiments; | 2526 *count = num_experiments; |
2517 return experiments; | 2527 return experiments; |
2518 } | 2528 } |
2519 | 2529 |
2520 } // namespace testing | 2530 } // namespace testing |
2521 | 2531 |
2522 } // namespace about_flags | 2532 } // namespace about_flags |
OLD | NEW |