| 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 357 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 368 IDS_FLAGS_WEBUI_LOCK_NAME, | 368 IDS_FLAGS_WEBUI_LOCK_NAME, |
| 369 IDS_FLAGS_WEBUI_LOCK_DESCRIPTION, | 369 IDS_FLAGS_WEBUI_LOCK_DESCRIPTION, |
| 370 kOsCrOS, | 370 kOsCrOS, |
| 371 #if defined(OS_CHROMEOS) | 371 #if defined(OS_CHROMEOS) |
| 372 SINGLE_VALUE_TYPE(switches::kDisableWebUILockScreen) | 372 SINGLE_VALUE_TYPE(switches::kDisableWebUILockScreen) |
| 373 #else | 373 #else |
| 374 SINGLE_VALUE_TYPE("") | 374 SINGLE_VALUE_TYPE("") |
| 375 #endif | 375 #endif |
| 376 }, | 376 }, |
| 377 { | 377 { |
| 378 "enable-ntp-bookmark-features", | |
| 379 IDS_FLAGS_ENABLE_NTP_BOOKMARK_FEATURES_NAME, | |
| 380 IDS_FLAGS_ENABLE_NTP_BOOKMARK_FEATURES_DESCRIPTION, | |
| 381 kOsAll, | |
| 382 SINGLE_VALUE_TYPE(switches::kEnableNTPBookmarkFeatures) | |
| 383 }, | |
| 384 { | |
| 385 "enable-video-track", | 378 "enable-video-track", |
| 386 IDS_FLAGS_ENABLE_VIDEO_TRACK_NAME, | 379 IDS_FLAGS_ENABLE_VIDEO_TRACK_NAME, |
| 387 IDS_FLAGS_ENABLE_VIDEO_TRACK_DESCRIPTION, | 380 IDS_FLAGS_ENABLE_VIDEO_TRACK_DESCRIPTION, |
| 388 kOsAll, | 381 kOsAll, |
| 389 SINGLE_VALUE_TYPE(switches::kEnableVideoTrack) | 382 SINGLE_VALUE_TYPE(switches::kEnableVideoTrack) |
| 390 }, | 383 }, |
| 391 { | 384 { |
| 392 "extension-alerts", | 385 "extension-alerts", |
| 393 IDS_FLAGS_ENABLE_EXTENSION_ALERTS_NAME, | 386 IDS_FLAGS_ENABLE_EXTENSION_ALERTS_NAME, |
| 394 IDS_FLAGS_ENABLE_EXTENSION_ALERTS_DESCRIPTION, | 387 IDS_FLAGS_ENABLE_EXTENSION_ALERTS_DESCRIPTION, |
| (...skipping 468 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 |