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 1027 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1038 #endif // defined(USE_ASH) | 1038 #endif // defined(USE_ASH) |
1039 #if defined(OS_CHROMEOS) | 1039 #if defined(OS_CHROMEOS) |
1040 { | 1040 { |
1041 "enable-carrier-switching", | 1041 "enable-carrier-switching", |
1042 IDS_FLAGS_ENABLE_CARRIER_SWITCHING, | 1042 IDS_FLAGS_ENABLE_CARRIER_SWITCHING, |
1043 IDS_FLAGS_ENABLE_CARRIER_SWITCHING_DESCRIPTION, | 1043 IDS_FLAGS_ENABLE_CARRIER_SWITCHING_DESCRIPTION, |
1044 kOsCrOS, | 1044 kOsCrOS, |
1045 SINGLE_VALUE_TYPE(chromeos::switches::kEnableCarrierSwitching) | 1045 SINGLE_VALUE_TYPE(chromeos::switches::kEnableCarrierSwitching) |
1046 }, | 1046 }, |
1047 { | 1047 { |
| 1048 "enable-cloud-import", |
| 1049 IDS_FLAGS_ENABLE_CLOUD_IMPORT, |
| 1050 IDS_FLAGS_ENABLE_CLOUD_IMPORT_DESCRIPTION, |
| 1051 kOsCrOS, |
| 1052 SINGLE_VALUE_TYPE(chromeos::switches::kEnableCloudImport) |
| 1053 }, |
| 1054 { |
1048 "enable-request-tablet-site", | 1055 "enable-request-tablet-site", |
1049 IDS_FLAGS_ENABLE_REQUEST_TABLET_SITE_NAME, | 1056 IDS_FLAGS_ENABLE_REQUEST_TABLET_SITE_NAME, |
1050 IDS_FLAGS_ENABLE_REQUEST_TABLET_SITE_DESCRIPTION, | 1057 IDS_FLAGS_ENABLE_REQUEST_TABLET_SITE_DESCRIPTION, |
1051 kOsCrOS, | 1058 kOsCrOS, |
1052 SINGLE_VALUE_TYPE(chromeos::switches::kEnableRequestTabletSite) | 1059 SINGLE_VALUE_TYPE(chromeos::switches::kEnableRequestTabletSite) |
1053 }, | 1060 }, |
1054 #endif | 1061 #endif |
1055 { | 1062 { |
1056 "debug-packed-apps", | 1063 "debug-packed-apps", |
1057 IDS_FLAGS_DEBUG_PACKED_APP_NAME, | 1064 IDS_FLAGS_DEBUG_PACKED_APP_NAME, |
(...skipping 1499 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2557 } | 2564 } |
2558 | 2565 |
2559 const Experiment* GetExperiments(size_t* count) { | 2566 const Experiment* GetExperiments(size_t* count) { |
2560 *count = num_experiments; | 2567 *count = num_experiments; |
2561 return experiments; | 2568 return experiments; |
2562 } | 2569 } |
2563 | 2570 |
2564 } // namespace testing | 2571 } // namespace testing |
2565 | 2572 |
2566 } // namespace about_flags | 2573 } // namespace about_flags |
OLD | NEW |