| 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 278 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|   289   { IDS_GENERIC_EXPERIMENT_CHOICE_ENABLED, |   289   { IDS_GENERIC_EXPERIMENT_CHOICE_ENABLED, | 
|   290     switches::kEnableGpuRasterization, "" }, |   290     switches::kEnableGpuRasterization, "" }, | 
|   291   { IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED, |   291   { IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED, | 
|   292     switches::kDisableGpuRasterization, "" }, |   292     switches::kDisableGpuRasterization, "" }, | 
|   293   { IDS_FLAGS_FORCE_GPU_RASTERIZATION, |   293   { IDS_FLAGS_FORCE_GPU_RASTERIZATION, | 
|   294     switches::kForceGpuRasterization, "" }, |   294     switches::kForceGpuRasterization, "" }, | 
|   295 }; |   295 }; | 
|   296  |   296  | 
|   297 #if defined(OS_CHROMEOS) |   297 #if defined(OS_CHROMEOS) | 
|   298 const Experiment::Choice kMemoryPressureThresholdChoices[] = { |   298 const Experiment::Choice kMemoryPressureThresholdChoices[] = { | 
|   299   { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" }, |   299     { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" }, | 
|   300   { IDS_FLAGS_CONSERVATIVE_THRESHOLDS, |   300     { IDS_FLAGS_CONSERVATIVE_THRESHOLDS, | 
|   301     chromeos::switches::kMemoryPressureThresholds, "1" }, |   301       chromeos::switches::kMemoryPressureThresholds, | 
|   302   { IDS_FLAGS_AGGRESSIVE_CACHE_DISCARD_THRESHOLDS, |   302       kConservativeThreshold }, | 
|   303     chromeos::switches::kMemoryPressureThresholds, "2" }, |   303     { IDS_FLAGS_AGGRESSIVE_CACHE_DISCARD_THRESHOLDS, | 
|   304   { IDS_FLAGS_AGGRESSIVE_TAB_DISCARD_THRESHOLDS, |   304       chromeos::switches::kMemoryPressureThresholds, | 
|   305     chromeos::switches::kMemoryPressureThresholds, "3" }, |   305       kAggressiveCacheDiscardThreshold }, | 
|   306   { IDS_FLAGS_AGGRESSIVE_THRESHOLDS, |   306     { IDS_FLAGS_AGGRESSIVE_TAB_DISCARD_THRESHOLDS, | 
|   307     chromeos::switches::kMemoryPressureThresholds, "4" }, |   307       chromeos::switches::kMemoryPressureThresholds, | 
 |   308       kAggressiveTabDiscardThreshold }, | 
 |   309     { IDS_FLAGS_AGGRESSIVE_THRESHOLDS, | 
 |   310       chromeos::switches::kMemoryPressureThresholds, | 
 |   311       kAggressiveThreshold }, | 
|   308 }; |   312 }; | 
|   309 #endif |   313 #endif | 
|   310  |   314  | 
|   311 // We're using independent flags here (as opposed to a common flag with |   315 // We're using independent flags here (as opposed to a common flag with | 
|   312 // different values) to be able to enable/disable the entire experience |   316 // different values) to be able to enable/disable the entire experience | 
|   313 // associated with this feature server-side from the FieldTrial (the complete |   317 // associated with this feature server-side from the FieldTrial (the complete | 
|   314 // experience includes other flag changes as well). It is not currently possible |   318 // experience includes other flag changes as well). It is not currently possible | 
|   315 // to do that with "flag=value" flags. |   319 // to do that with "flag=value" flags. | 
|   316 const Experiment::Choice kSearchButtonInOmniboxChoices[] = { |   320 const Experiment::Choice kSearchButtonInOmniboxChoices[] = { | 
|   317   { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" }, |   321   { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" }, | 
| (...skipping 2421 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  2739 } |  2743 } | 
|  2740  |  2744  | 
|  2741 const Experiment* GetExperiments(size_t* count) { |  2745 const Experiment* GetExperiments(size_t* count) { | 
|  2742   *count = num_experiments; |  2746   *count = num_experiments; | 
|  2743   return experiments; |  2747   return experiments; | 
|  2744 } |  2748 } | 
|  2745  |  2749  | 
|  2746 }  // namespace testing |  2750 }  // namespace testing | 
|  2747  |  2751  | 
|  2748 }  // namespace about_flags |  2752 }  // namespace about_flags | 
| OLD | NEW |