| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 377 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 388 kOsAll, | 388 kOsAll, |
| 389 SINGLE_VALUE_TYPE(switches::kEnableVideoTrack) | 389 SINGLE_VALUE_TYPE(switches::kEnableVideoTrack) |
| 390 }, | 390 }, |
| 391 { | 391 { |
| 392 "extension-alerts", | 392 "extension-alerts", |
| 393 IDS_FLAGS_ENABLE_EXTENSION_ALERTS_NAME, | 393 IDS_FLAGS_ENABLE_EXTENSION_ALERTS_NAME, |
| 394 IDS_FLAGS_ENABLE_EXTENSION_ALERTS_DESCRIPTION, | 394 IDS_FLAGS_ENABLE_EXTENSION_ALERTS_DESCRIPTION, |
| 395 kOsAll, | 395 kOsAll, |
| 396 SINGLE_VALUE_TYPE(switches::kEnableExtensionAlerts) | 396 SINGLE_VALUE_TYPE(switches::kEnableExtensionAlerts) |
| 397 }, | 397 }, |
| 398 { | |
| 399 "enable-http-pipelining", | |
| 400 IDS_FLAGS_ENABLE_HTTP_PIPELINING_NAME, | |
| 401 IDS_FLAGS_ENABLE_HTTP_PIPELINING_DESCRIPTION, | |
| 402 kOsAll, | |
| 403 SINGLE_VALUE_TYPE(switches::kEnableHttpPipelining) | |
| 404 }, | |
| 405 #if defined(OS_CHROMEOS) | 398 #if defined(OS_CHROMEOS) |
| 406 { | 399 { |
| 407 "enable-photo-editor", | 400 "enable-photo-editor", |
| 408 IDS_FLAGS_ENABLE_PHOTO_EDITOR_NAME, | 401 IDS_FLAGS_ENABLE_PHOTO_EDITOR_NAME, |
| 409 IDS_FLAGS_ENABLE_PHOTO_EDITOR_DESCRIPTION, | 402 IDS_FLAGS_ENABLE_PHOTO_EDITOR_DESCRIPTION, |
| 410 kOsCrOS, | 403 kOsCrOS, |
| 411 SINGLE_VALUE_TYPE(switches::kEnablePhotoEditor) | 404 SINGLE_VALUE_TYPE(switches::kEnablePhotoEditor) |
| 412 }, | 405 }, |
| 413 #endif | 406 #endif |
| 414 { | 407 { |
| (...skipping 448 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 863 } | 856 } |
| 864 | 857 |
| 865 const Experiment* GetExperiments(size_t* count) { | 858 const Experiment* GetExperiments(size_t* count) { |
| 866 *count = num_experiments; | 859 *count = num_experiments; |
| 867 return experiments; | 860 return experiments; |
| 868 } | 861 } |
| 869 | 862 |
| 870 } // namespace testing | 863 } // namespace testing |
| 871 | 864 |
| 872 } // namespace about_flags | 865 } // namespace about_flags |
| OLD | NEW |