| 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 1241 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 1252     "delegated-renderer", | 1252     "delegated-renderer", | 
| 1253     IDS_FLAGS_DELEGATED_RENDERER_NAME, | 1253     IDS_FLAGS_DELEGATED_RENDERER_NAME, | 
| 1254     IDS_FLAGS_DELEGATED_RENDERER_DESCRIPTION, | 1254     IDS_FLAGS_DELEGATED_RENDERER_DESCRIPTION, | 
| 1255 #ifdef USE_AURA | 1255 #ifdef USE_AURA | 
| 1256     kOsWin | kOsLinux | | 1256     kOsWin | kOsLinux | | 
| 1257 #endif | 1257 #endif | 
| 1258     kOsAndroid | kOsCrOS, | 1258     kOsAndroid | kOsCrOS, | 
| 1259     MULTI_VALUE_TYPE(kDelegatedRendererChoices) | 1259     MULTI_VALUE_TYPE(kDelegatedRendererChoices) | 
| 1260   }, | 1260   }, | 
| 1261   { | 1261   { | 
| 1262     "enable-websocket-experimental-implementation", |  | 
| 1263     IDS_FLAGS_ENABLE_EXPERIMENTAL_WEBSOCKET_NAME, |  | 
| 1264     IDS_FLAGS_ENABLE_EXPERIMENTAL_WEBSOCKET_DESCRIPTION, |  | 
| 1265     kOsAll, |  | 
| 1266     SINGLE_VALUE_TYPE(switches::kEnableExperimentalWebSocket) |  | 
| 1267   }, |  | 
| 1268   { |  | 
| 1269     "max-tiles-for-interest-area", | 1262     "max-tiles-for-interest-area", | 
| 1270     IDS_FLAGS_MAX_TILES_FOR_INTEREST_AREA_NAME, | 1263     IDS_FLAGS_MAX_TILES_FOR_INTEREST_AREA_NAME, | 
| 1271     IDS_FLAGS_MAX_TILES_FOR_INTEREST_AREA_DESCRIPTION, | 1264     IDS_FLAGS_MAX_TILES_FOR_INTEREST_AREA_DESCRIPTION, | 
| 1272     kOsAll, | 1265     kOsAll, | 
| 1273     MULTI_VALUE_TYPE(kMaxTilesForInterestAreaChoices) | 1266     MULTI_VALUE_TYPE(kMaxTilesForInterestAreaChoices) | 
| 1274   }, | 1267   }, | 
| 1275   { | 1268   { | 
| 1276     "enable-offline-mode", | 1269     "enable-offline-mode", | 
| 1277     IDS_FLAGS_ENABLE_OFFLINE_MODE_NAME, | 1270     IDS_FLAGS_ENABLE_OFFLINE_MODE_NAME, | 
| 1278     IDS_FLAGS_ENABLE_OFFLINE_MODE_DESCRIPTION, | 1271     IDS_FLAGS_ENABLE_OFFLINE_MODE_DESCRIPTION, | 
| (...skipping 1076 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 2355 } | 2348 } | 
| 2356 | 2349 | 
| 2357 const Experiment* GetExperiments(size_t* count) { | 2350 const Experiment* GetExperiments(size_t* count) { | 
| 2358   *count = num_experiments; | 2351   *count = num_experiments; | 
| 2359   return experiments; | 2352   return experiments; | 
| 2360 } | 2353 } | 
| 2361 | 2354 | 
| 2362 }  // namespace testing | 2355 }  // namespace testing | 
| 2363 | 2356 | 
| 2364 }  // namespace about_flags | 2357 }  // namespace about_flags | 
| OLD | NEW | 
|---|