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 763 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
774 #endif // defined(USE_ASH) | 774 #endif // defined(USE_ASH) |
775 #if defined(OS_CHROMEOS) | 775 #if defined(OS_CHROMEOS) |
776 { | 776 { |
777 "experimental-wallpaper-ui", | 777 "experimental-wallpaper-ui", |
778 IDS_FLAGS_EXPERIMENTAL_WALLPAPER_UI_NAME, | 778 IDS_FLAGS_EXPERIMENTAL_WALLPAPER_UI_NAME, |
779 IDS_FLAGS_EXPERIMENTAL_WALLPAPER_UI_DESCRIPTION, | 779 IDS_FLAGS_EXPERIMENTAL_WALLPAPER_UI_DESCRIPTION, |
780 kOsCrOS, | 780 kOsCrOS, |
781 SINGLE_VALUE_TYPE(switches::kExperimentalWallpaperUI) | 781 SINGLE_VALUE_TYPE(switches::kExperimentalWallpaperUI) |
782 }, | 782 }, |
783 { | 783 { |
| 784 "enable-drive-v2-api", |
| 785 IDS_FLAGS_ENABLE_DRIVE_V2_API, |
| 786 IDS_FLAGS_ENABLE_DRIVE_V2_API_DESCRIPTION, |
| 787 kOsCrOS, |
| 788 SINGLE_VALUE_TYPE(switches::kEnableDriveV2Api), |
| 789 }, |
| 790 { |
784 "enable-html5-camera", | 791 "enable-html5-camera", |
785 IDS_FLAGS_ENABLE_HTML5_CAMERA, | 792 IDS_FLAGS_ENABLE_HTML5_CAMERA, |
786 IDS_FLAGS_ENABLE_HTML5_CAMERA_DESCRIPTION, | 793 IDS_FLAGS_ENABLE_HTML5_CAMERA_DESCRIPTION, |
787 kOsCrOS, | 794 kOsCrOS, |
788 SINGLE_VALUE_TYPE(switches::kEnableHtml5Camera), | 795 SINGLE_VALUE_TYPE(switches::kEnableHtml5Camera), |
789 }, | 796 }, |
790 { | 797 { |
791 "enable-new-oobe", | 798 "enable-new-oobe", |
792 IDS_FLAGS_ENABLE_NEW_OOBE, | 799 IDS_FLAGS_ENABLE_NEW_OOBE, |
793 IDS_FLAGS_ENABLE_NEW_OOBE_DESCRIPTION, | 800 IDS_FLAGS_ENABLE_NEW_OOBE_DESCRIPTION, |
(...skipping 481 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1275 } | 1282 } |
1276 | 1283 |
1277 const Experiment* GetExperiments(size_t* count) { | 1284 const Experiment* GetExperiments(size_t* count) { |
1278 *count = num_experiments; | 1285 *count = num_experiments; |
1279 return experiments; | 1286 return experiments; |
1280 } | 1287 } |
1281 | 1288 |
1282 } // namespace testing | 1289 } // namespace testing |
1283 | 1290 |
1284 } // namespace about_flags | 1291 } // namespace about_flags |
OLD | NEW |