Chromium Code Reviews| 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 1240 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1251 MULTI_VALUE_TYPE(kImplSidePaintingChoices) | 1251 MULTI_VALUE_TYPE(kImplSidePaintingChoices) |
| 1252 }, | 1252 }, |
| 1253 { | 1253 { |
| 1254 "max-prepaint-tile-distance", | 1254 "max-prepaint-tile-distance", |
| 1255 IDS_FLAGS_MAX_PREPAINT_TILE_DISTANCE_NAME, | 1255 IDS_FLAGS_MAX_PREPAINT_TILE_DISTANCE_NAME, |
| 1256 IDS_FLAGS_MAX_PREPAINT_TILE_DISTANCE_DESCRIPTION, | 1256 IDS_FLAGS_MAX_PREPAINT_TILE_DISTANCE_DESCRIPTION, |
| 1257 kOsAndroid | kOsLinux | kOsCrOS, | 1257 kOsAndroid | kOsLinux | kOsCrOS, |
| 1258 MULTI_VALUE_TYPE(kMaxPrepaintTileDistanceChoices) | 1258 MULTI_VALUE_TYPE(kMaxPrepaintTileDistanceChoices) |
| 1259 }, | 1259 }, |
| 1260 { | 1260 { |
| 1261 "enable-websocket-experimental-implementation", | |
| 1262 IDS_FLAGS_ENABLE_EXPERIMENTAL_WEBSOCKET_NAME, | |
| 1263 IDS_FLAGS_ENABLE_EXPERIMENTAL_WEBSOCKET_DESCRIPTION, | |
| 1264 kOsLinux, | |
|
Adam Rice
2013/04/09 12:21:45
I think this can be kOsDesktop or maybe even kOsAl
yhirano
2013/04/10 00:52:45
Done.
| |
| 1265 SINGLE_VALUE_TYPE(switches::kEnableExperimentalWebSocket) | |
| 1266 }, | |
| 1267 { | |
| 1261 "max-tiles-for-interest-area", | 1268 "max-tiles-for-interest-area", |
| 1262 IDS_FLAGS_MAX_TILES_FOR_INTEREST_AREA_NAME, | 1269 IDS_FLAGS_MAX_TILES_FOR_INTEREST_AREA_NAME, |
| 1263 IDS_FLAGS_MAX_TILES_FOR_INTEREST_AREA_DESCRIPTION, | 1270 IDS_FLAGS_MAX_TILES_FOR_INTEREST_AREA_DESCRIPTION, |
| 1264 kOsAndroid | kOsLinux | kOsCrOS, | 1271 kOsAndroid | kOsLinux | kOsCrOS, |
| 1265 MULTI_VALUE_TYPE(kMaxTilesForInterestAreaChoices) | 1272 MULTI_VALUE_TYPE(kMaxTilesForInterestAreaChoices) |
| 1266 }, | 1273 }, |
| 1267 // TODO(sky): ifdef needed until focus sorted out in DesktopNativeWidgetAura. | 1274 // TODO(sky): ifdef needed until focus sorted out in DesktopNativeWidgetAura. |
| 1268 #if !defined(USE_AURA) | 1275 #if !defined(USE_AURA) |
| 1269 { | 1276 { |
| 1270 "track-active-visit-time", | 1277 "track-active-visit-time", |
| (...skipping 523 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1794 } | 1801 } |
| 1795 | 1802 |
| 1796 const Experiment* GetExperiments(size_t* count) { | 1803 const Experiment* GetExperiments(size_t* count) { |
| 1797 *count = num_experiments; | 1804 *count = num_experiments; |
| 1798 return experiments; | 1805 return experiments; |
| 1799 } | 1806 } |
| 1800 | 1807 |
| 1801 } // namespace testing | 1808 } // namespace testing |
| 1802 | 1809 |
| 1803 } // namespace about_flags | 1810 } // namespace about_flags |
| OLD | NEW |