OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 298 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
309 SINGLE_VALUE_TYPE(switches::kEnableSyncOAuth) | 309 SINGLE_VALUE_TYPE(switches::kEnableSyncOAuth) |
310 }, | 310 }, |
311 { | 311 { |
312 "sync-sessions", | 312 "sync-sessions", |
313 IDS_FLAGS_SYNC_SESSIONS_NAME, | 313 IDS_FLAGS_SYNC_SESSIONS_NAME, |
314 IDS_FLAGS_SYNC_SESSIONS_DESCRIPTION, | 314 IDS_FLAGS_SYNC_SESSIONS_DESCRIPTION, |
315 kOsAll, | 315 kOsAll, |
316 SINGLE_VALUE_TYPE(switches::kEnableSyncSessions) | 316 SINGLE_VALUE_TYPE(switches::kEnableSyncSessions) |
317 }, | 317 }, |
318 { | 318 { |
| 319 "sync-search-engines", |
| 320 IDS_FLAGS_SYNC_SEARCH_ENGINES_NAME, |
| 321 IDS_FLAGS_SYNC_SEARCH_ENGINES_DESCRIPTION, |
| 322 kOsAll, |
| 323 SINGLE_VALUE_TYPE(switches::kEnableSyncSearchEngines) |
| 324 }, |
| 325 { |
319 "enable-smooth-scrolling", // FLAGS:RECORD_UMA | 326 "enable-smooth-scrolling", // FLAGS:RECORD_UMA |
320 IDS_FLAGS_ENABLE_SMOOTH_SCROLLING_NAME, | 327 IDS_FLAGS_ENABLE_SMOOTH_SCROLLING_NAME, |
321 IDS_FLAGS_ENABLE_SMOOTH_SCROLLING_DESCRIPTION, | 328 IDS_FLAGS_ENABLE_SMOOTH_SCROLLING_DESCRIPTION, |
322 // Can't expose the switch unless the code is compiled in. | 329 // Can't expose the switch unless the code is compiled in. |
323 #if defined(ENABLE_SMOOTH_SCROLLING) | 330 #if defined(ENABLE_SMOOTH_SCROLLING) |
324 kOsAll, | 331 kOsAll, |
325 #else | 332 #else |
326 0, | 333 0, |
327 #endif | 334 #endif |
328 SINGLE_VALUE_TYPE(switches::kEnableSmoothScrolling) | 335 SINGLE_VALUE_TYPE(switches::kEnableSmoothScrolling) |
(...skipping 476 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
805 } | 812 } |
806 | 813 |
807 const Experiment* GetExperiments(size_t* count) { | 814 const Experiment* GetExperiments(size_t* count) { |
808 *count = num_experiments; | 815 *count = num_experiments; |
809 return experiments; | 816 return experiments; |
810 } | 817 } |
811 | 818 |
812 } // namespace testing | 819 } // namespace testing |
813 | 820 |
814 } // namespace about_flags | 821 } // namespace about_flags |
OLD | NEW |