Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(981)

Side by Side Diff: chrome/browser/about_flags.cc

Issue 10795038: Enable captive portal detection by default. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Missed the browser_tests Created 8 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 649 matching lines...) Expand 10 before | Expand all | Expand 10 after
660 kOsAll, 660 kOsAll,
661 SINGLE_VALUE_TYPE(switches::kEnableDiscoveryInNewTabPage) 661 SINGLE_VALUE_TYPE(switches::kEnableDiscoveryInNewTabPage)
662 }, 662 },
663 { 663 {
664 "disable-chrome-to-mobile", // FLAGS:RECORD_UMA 664 "disable-chrome-to-mobile", // FLAGS:RECORD_UMA
665 IDS_FLAGS_DISABLE_CHROME_TO_MOBILE_NAME, 665 IDS_FLAGS_DISABLE_CHROME_TO_MOBILE_NAME,
666 IDS_FLAGS_DISABLE_CHROME_TO_MOBILE_DESCRIPTION, 666 IDS_FLAGS_DISABLE_CHROME_TO_MOBILE_DESCRIPTION,
667 kOsAll, 667 kOsAll,
668 SINGLE_VALUE_TYPE(switches::kDisableChromeToMobile) 668 SINGLE_VALUE_TYPE(switches::kDisableChromeToMobile)
669 }, 669 },
670 {
671 "enable-captive-portal-detection",
672 IDS_FLAGS_CAPTIVE_PORTAL_CHECK_ON_ERROR_NAME,
673 IDS_FLAGS_CAPTIVE_PORTAL_CHECK_ON_ERROR_DESCRIPTION,
674 kOsMac | kOsWin | kOsLinux | kOsCrOS,
675 SINGLE_VALUE_TYPE(switches::kCaptivePortalDetection)
676 },
677 #if defined(GOOGLE_CHROME_BUILD) 670 #if defined(GOOGLE_CHROME_BUILD)
678 { 671 {
679 "disable-asynchronous-spellchecking", 672 "disable-asynchronous-spellchecking",
680 IDS_FLAGS_DISABLE_ASYNCHRONOUS_SPELLCHECKING, 673 IDS_FLAGS_DISABLE_ASYNCHRONOUS_SPELLCHECKING,
681 IDS_FLAGS_DISABLE_ASYNCHRONOUS_SPELLCHECKING_DESCRIPTION, 674 IDS_FLAGS_DISABLE_ASYNCHRONOUS_SPELLCHECKING_DESCRIPTION,
682 kOsWin | kOsLinux | kOsCrOS, 675 kOsWin | kOsLinux | kOsCrOS,
683 SINGLE_VALUE_TYPE(switches::kDisableAsynchronousSpellChecking) 676 SINGLE_VALUE_TYPE(switches::kDisableAsynchronousSpellChecking)
684 }, 677 },
685 #endif 678 #endif
686 { 679 {
(...skipping 611 matching lines...) Expand 10 before | Expand all | Expand 10 after
1298 } 1291 }
1299 1292
1300 const Experiment* GetExperiments(size_t* count) { 1293 const Experiment* GetExperiments(size_t* count) {
1301 *count = num_experiments; 1294 *count = num_experiments;
1302 return experiments; 1295 return experiments;
1303 } 1296 }
1304 1297
1305 } // namespace testing 1298 } // namespace testing
1306 1299
1307 } // namespace about_flags 1300 } // namespace about_flags
OLDNEW
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/captive_portal/captive_portal_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698