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 1244 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1255 kOsAndroid, | 1255 kOsAndroid, |
1256 MULTI_VALUE_TYPE(kImplSidePaintingChoices) | 1256 MULTI_VALUE_TYPE(kImplSidePaintingChoices) |
1257 }, | 1257 }, |
1258 { | 1258 { |
1259 "track-active-visit-time", | 1259 "track-active-visit-time", |
1260 IDS_FLAGS_TRACK_ACTIVE_VISIT_TIME_NAME, | 1260 IDS_FLAGS_TRACK_ACTIVE_VISIT_TIME_NAME, |
1261 IDS_FLAGS_TRACK_ACTIVE_VISIT_TIME_DESCRIPTION, | 1261 IDS_FLAGS_TRACK_ACTIVE_VISIT_TIME_DESCRIPTION, |
1262 kOsWin, | 1262 kOsWin, |
1263 SINGLE_VALUE_TYPE(switches::kTrackActiveVisitTime) | 1263 SINGLE_VALUE_TYPE(switches::kTrackActiveVisitTime) |
1264 }, | 1264 }, |
| 1265 #if defined(ENABLE_GOOGLE_NOW) |
| 1266 { |
| 1267 "enable-google-now", |
| 1268 IDS_FLAGS_ENABLE_GOOGLE_NOW_INTEGRATION_NAME, |
| 1269 IDS_FLAGS_ENABLE_GOOGLE_NOW_INTEGRATION_DESCRIPTION, |
| 1270 kOsDesktop, |
| 1271 SINGLE_VALUE_TYPE(switches::kEnableGoogleNowIntegration) |
| 1272 }, |
| 1273 #endif |
1265 }; | 1274 }; |
1266 | 1275 |
1267 const Experiment* experiments = kExperiments; | 1276 const Experiment* experiments = kExperiments; |
1268 size_t num_experiments = arraysize(kExperiments); | 1277 size_t num_experiments = arraysize(kExperiments); |
1269 | 1278 |
1270 // Stores and encapsulates the little state that about:flags has. | 1279 // Stores and encapsulates the little state that about:flags has. |
1271 class FlagsState { | 1280 class FlagsState { |
1272 public: | 1281 public: |
1273 FlagsState() : needs_restart_(false) {} | 1282 FlagsState() : needs_restart_(false) {} |
1274 void ConvertFlagsToSwitches(PrefService* prefs, CommandLine* command_line); | 1283 void ConvertFlagsToSwitches(PrefService* prefs, CommandLine* command_line); |
(...skipping 472 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1747 } | 1756 } |
1748 | 1757 |
1749 const Experiment* GetExperiments(size_t* count) { | 1758 const Experiment* GetExperiments(size_t* count) { |
1750 *count = num_experiments; | 1759 *count = num_experiments; |
1751 return experiments; | 1760 return experiments; |
1752 } | 1761 } |
1753 | 1762 |
1754 } // namespace testing | 1763 } // namespace testing |
1755 | 1764 |
1756 } // namespace about_flags | 1765 } // namespace about_flags |
OLD | NEW |