| 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 771 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 782 #endif // defined(USE_ASH) | 782 #endif // defined(USE_ASH) |
| 783 #if defined(OS_CHROMEOS) | 783 #if defined(OS_CHROMEOS) |
| 784 { | 784 { |
| 785 "disable-new-wallpaper-picker-ui", | 785 "disable-new-wallpaper-picker-ui", |
| 786 IDS_FLAGS_DISABLE_NEW_WALLPAPER_UI_NAME, | 786 IDS_FLAGS_DISABLE_NEW_WALLPAPER_UI_NAME, |
| 787 IDS_FLAGS_DISABLE_NEW_WALLPAPER_UI_DESCRIPTION, | 787 IDS_FLAGS_DISABLE_NEW_WALLPAPER_UI_DESCRIPTION, |
| 788 kOsCrOS, | 788 kOsCrOS, |
| 789 SINGLE_VALUE_TYPE(switches::kDisableNewWallpaperUI) | 789 SINGLE_VALUE_TYPE(switches::kDisableNewWallpaperUI) |
| 790 }, | 790 }, |
| 791 { | 791 { |
| 792 "enable-drive-v2-api", | |
| 793 IDS_FLAGS_ENABLE_DRIVE_V2_API, | |
| 794 IDS_FLAGS_ENABLE_DRIVE_V2_API_DESCRIPTION, | |
| 795 kOsCrOS, | |
| 796 SINGLE_VALUE_TYPE(switches::kEnableDriveV2Api), | |
| 797 }, | |
| 798 { | |
| 799 "disable-html5-camera", | 792 "disable-html5-camera", |
| 800 IDS_FLAGS_DISABLE_HTML5_CAMERA, | 793 IDS_FLAGS_DISABLE_HTML5_CAMERA, |
| 801 IDS_FLAGS_DISABLE_HTML5_CAMERA_DESCRIPTION, | 794 IDS_FLAGS_DISABLE_HTML5_CAMERA_DESCRIPTION, |
| 802 kOsCrOS, | 795 kOsCrOS, |
| 803 SINGLE_VALUE_TYPE(switches::kDisableHtml5Camera), | 796 SINGLE_VALUE_TYPE(switches::kDisableHtml5Camera), |
| 804 }, | 797 }, |
| 805 { | 798 { |
| 806 "disable-new-oobe", | 799 "disable-new-oobe", |
| 807 IDS_FLAGS_DISABLE_NEW_OOBE, | 800 IDS_FLAGS_DISABLE_NEW_OOBE, |
| 808 IDS_FLAGS_DISABLE_NEW_OOBE_DESCRIPTION, | 801 IDS_FLAGS_DISABLE_NEW_OOBE_DESCRIPTION, |
| (...skipping 548 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1357 } | 1350 } |
| 1358 | 1351 |
| 1359 const Experiment* GetExperiments(size_t* count) { | 1352 const Experiment* GetExperiments(size_t* count) { |
| 1360 *count = num_experiments; | 1353 *count = num_experiments; |
| 1361 return experiments; | 1354 return experiments; |
| 1362 } | 1355 } |
| 1363 | 1356 |
| 1364 } // namespace testing | 1357 } // namespace testing |
| 1365 | 1358 |
| 1366 } // namespace about_flags | 1359 } // namespace about_flags |
| OLD | NEW |