| 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 642 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 653 kOsAll, | 653 kOsAll, |
| 654 SINGLE_VALUE_TYPE(switches::kEnableDiscoveryInNewTabPage) | 654 SINGLE_VALUE_TYPE(switches::kEnableDiscoveryInNewTabPage) |
| 655 }, | 655 }, |
| 656 { | 656 { |
| 657 "disable-chrome-to-mobile", // FLAGS:RECORD_UMA | 657 "disable-chrome-to-mobile", // FLAGS:RECORD_UMA |
| 658 IDS_FLAGS_DISABLE_CHROME_TO_MOBILE_NAME, | 658 IDS_FLAGS_DISABLE_CHROME_TO_MOBILE_NAME, |
| 659 IDS_FLAGS_DISABLE_CHROME_TO_MOBILE_DESCRIPTION, | 659 IDS_FLAGS_DISABLE_CHROME_TO_MOBILE_DESCRIPTION, |
| 660 kOsAll, | 660 kOsAll, |
| 661 SINGLE_VALUE_TYPE(switches::kDisableChromeToMobile) | 661 SINGLE_VALUE_TYPE(switches::kDisableChromeToMobile) |
| 662 }, | 662 }, |
| 663 { | |
| 664 "enable-captive-portal-detection", | |
| 665 IDS_FLAGS_CAPTIVE_PORTAL_CHECK_ON_ERROR_NAME, | |
| 666 IDS_FLAGS_CAPTIVE_PORTAL_CHECK_ON_ERROR_DESCRIPTION, | |
| 667 kOsMac | kOsWin | kOsLinux | kOsCrOS, | |
| 668 SINGLE_VALUE_TYPE(switches::kCaptivePortalDetection) | |
| 669 }, | |
| 670 #if defined(GOOGLE_CHROME_BUILD) | 663 #if defined(GOOGLE_CHROME_BUILD) |
| 671 { | 664 { |
| 672 "disable-asynchronous-spellchecking", | 665 "disable-asynchronous-spellchecking", |
| 673 IDS_FLAGS_DISABLE_ASYNCHRONOUS_SPELLCHECKING, | 666 IDS_FLAGS_DISABLE_ASYNCHRONOUS_SPELLCHECKING, |
| 674 IDS_FLAGS_DISABLE_ASYNCHRONOUS_SPELLCHECKING_DESCRIPTION, | 667 IDS_FLAGS_DISABLE_ASYNCHRONOUS_SPELLCHECKING_DESCRIPTION, |
| 675 kOsWin | kOsLinux | kOsCrOS, | 668 kOsWin | kOsLinux | kOsCrOS, |
| 676 SINGLE_VALUE_TYPE(switches::kDisableAsynchronousSpellChecking) | 669 SINGLE_VALUE_TYPE(switches::kDisableAsynchronousSpellChecking) |
| 677 }, | 670 }, |
| 678 #endif | 671 #endif |
| 679 { | 672 { |
| (...skipping 611 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1291 } | 1284 } |
| 1292 | 1285 |
| 1293 const Experiment* GetExperiments(size_t* count) { | 1286 const Experiment* GetExperiments(size_t* count) { |
| 1294 *count = num_experiments; | 1287 *count = num_experiments; |
| 1295 return experiments; | 1288 return experiments; |
| 1296 } | 1289 } |
| 1297 | 1290 |
| 1298 } // namespace testing | 1291 } // namespace testing |
| 1299 | 1292 |
| 1300 } // namespace about_flags | 1293 } // namespace about_flags |
| OLD | NEW |