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

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

Issue 10834171: Revert 143421 to disable Chrome to Mobile by default on trunk (for M22 branch). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: 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
« no previous file with comments | « no previous file | chrome/browser/chrome_to_mobile_service.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 651 matching lines...) Expand 10 before | Expand all | Expand 10 after
662 SINGLE_VALUE_TYPE(switches::kEnableSuggestionsTabPage) 662 SINGLE_VALUE_TYPE(switches::kEnableSuggestionsTabPage)
663 }, 663 },
664 { 664 {
665 "enable-discovery-ntp", 665 "enable-discovery-ntp",
666 IDS_FLAGS_ENABLE_NTP_DISCOVERY_NAME, 666 IDS_FLAGS_ENABLE_NTP_DISCOVERY_NAME,
667 IDS_FLAGS_ENABLE_NTP_DISCOVERY_DESCRIPTION, 667 IDS_FLAGS_ENABLE_NTP_DISCOVERY_DESCRIPTION,
668 kOsAll, 668 kOsAll,
669 SINGLE_VALUE_TYPE(switches::kEnableDiscoveryInNewTabPage) 669 SINGLE_VALUE_TYPE(switches::kEnableDiscoveryInNewTabPage)
670 }, 670 },
671 { 671 {
672 "disable-chrome-to-mobile", // FLAGS:RECORD_UMA 672 "enable-chrome-to-mobile", // FLAGS:RECORD_UMA
673 IDS_FLAGS_DISABLE_CHROME_TO_MOBILE_NAME, 673 IDS_FLAGS_ENABLE_CHROME_TO_MOBILE_NAME,
674 IDS_FLAGS_DISABLE_CHROME_TO_MOBILE_DESCRIPTION, 674 IDS_FLAGS_ENABLE_CHROME_TO_MOBILE_DESCRIPTION,
675 kOsAll, 675 kOsAll,
676 SINGLE_VALUE_TYPE(switches::kDisableChromeToMobile) 676 SINGLE_VALUE_TYPE(switches::kEnableChromeToMobile)
677 }, 677 },
678 #if defined(GOOGLE_CHROME_BUILD) 678 #if defined(GOOGLE_CHROME_BUILD)
679 { 679 {
680 "disable-asynchronous-spellchecking", 680 "disable-asynchronous-spellchecking",
681 IDS_FLAGS_DISABLE_ASYNCHRONOUS_SPELLCHECKING, 681 IDS_FLAGS_DISABLE_ASYNCHRONOUS_SPELLCHECKING,
682 IDS_FLAGS_DISABLE_ASYNCHRONOUS_SPELLCHECKING_DESCRIPTION, 682 IDS_FLAGS_DISABLE_ASYNCHRONOUS_SPELLCHECKING_DESCRIPTION,
683 kOsWin | kOsLinux | kOsCrOS, 683 kOsWin | kOsLinux | kOsCrOS,
684 SINGLE_VALUE_TYPE(switches::kDisableAsynchronousSpellChecking) 684 SINGLE_VALUE_TYPE(switches::kDisableAsynchronousSpellChecking)
685 }, 685 },
686 #endif 686 #endif
(...skipping 626 matching lines...) Expand 10 before | Expand all | Expand 10 after
1313 } 1313 }
1314 1314
1315 const Experiment* GetExperiments(size_t* count) { 1315 const Experiment* GetExperiments(size_t* count) {
1316 *count = num_experiments; 1316 *count = num_experiments;
1317 return experiments; 1317 return experiments;
1318 } 1318 }
1319 1319
1320 } // namespace testing 1320 } // namespace testing
1321 1321
1322 } // namespace about_flags 1322 } // namespace about_flags
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/chrome_to_mobile_service.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698