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 <string.h> | 7 #include <string.h> |
8 | 8 |
9 #include <algorithm> | 9 #include <algorithm> |
10 #include <iterator> | 10 #include <iterator> |
(...skipping 1260 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1271 SINGLE_VALUE_TYPE(switches::kAppsDevtool) | 1271 SINGLE_VALUE_TYPE(switches::kAppsDevtool) |
1272 }, | 1272 }, |
1273 { | 1273 { |
1274 "impl-side-painting", | 1274 "impl-side-painting", |
1275 IDS_FLAGS_IMPL_SIDE_PAINTING_NAME, | 1275 IDS_FLAGS_IMPL_SIDE_PAINTING_NAME, |
1276 IDS_FLAGS_IMPL_SIDE_PAINTING_DESCRIPTION, | 1276 IDS_FLAGS_IMPL_SIDE_PAINTING_DESCRIPTION, |
1277 kOsAndroid | kOsLinux | kOsCrOS, | 1277 kOsAndroid | kOsLinux | kOsCrOS, |
1278 MULTI_VALUE_TYPE(kImplSidePaintingChoices) | 1278 MULTI_VALUE_TYPE(kImplSidePaintingChoices) |
1279 }, | 1279 }, |
1280 { | 1280 { |
| 1281 "enable-websocket-experimental-implementation", |
| 1282 IDS_FLAGS_ENABLE_EXPERIMENTAL_WEBSOCKET_NAME, |
| 1283 IDS_FLAGS_ENABLE_EXPERIMENTAL_WEBSOCKET_DESCRIPTION, |
| 1284 kOsAll, |
| 1285 SINGLE_VALUE_TYPE(switches::kEnableExperimentalWebSocket) |
| 1286 }, |
| 1287 { |
1281 "max-tiles-for-interest-area", | 1288 "max-tiles-for-interest-area", |
1282 IDS_FLAGS_MAX_TILES_FOR_INTEREST_AREA_NAME, | 1289 IDS_FLAGS_MAX_TILES_FOR_INTEREST_AREA_NAME, |
1283 IDS_FLAGS_MAX_TILES_FOR_INTEREST_AREA_DESCRIPTION, | 1290 IDS_FLAGS_MAX_TILES_FOR_INTEREST_AREA_DESCRIPTION, |
1284 kOsAndroid | kOsLinux | kOsCrOS, | 1291 kOsAndroid | kOsLinux | kOsCrOS, |
1285 MULTI_VALUE_TYPE(kMaxTilesForInterestAreaChoices) | 1292 MULTI_VALUE_TYPE(kMaxTilesForInterestAreaChoices) |
1286 }, | 1293 }, |
1287 // TODO(sky): ifdef needed until focus sorted out in DesktopNativeWidgetAura. | 1294 // TODO(sky): ifdef needed until focus sorted out in DesktopNativeWidgetAura. |
1288 #if !defined(USE_AURA) | 1295 #if !defined(USE_AURA) |
1289 { | 1296 { |
1290 "track-active-visit-time", | 1297 "track-active-visit-time", |
(...skipping 553 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1844 } | 1851 } |
1845 | 1852 |
1846 const Experiment* GetExperiments(size_t* count) { | 1853 const Experiment* GetExperiments(size_t* count) { |
1847 *count = num_experiments; | 1854 *count = num_experiments; |
1848 return experiments; | 1855 return experiments; |
1849 } | 1856 } |
1850 | 1857 |
1851 } // namespace testing | 1858 } // namespace testing |
1852 | 1859 |
1853 } // namespace about_flags | 1860 } // namespace about_flags |
OLD | NEW |