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

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

Issue 10827285: Revert 150041 to re-enable Chrome to Mobile by default on trunk (after 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 658 matching lines...) Expand 10 before | Expand all | Expand 10 after
669 SINGLE_VALUE_TYPE(switches::kEnableSuggestionsTabPage) 669 SINGLE_VALUE_TYPE(switches::kEnableSuggestionsTabPage)
670 }, 670 },
671 { 671 {
672 "enable-discovery-ntp", 672 "enable-discovery-ntp",
673 IDS_FLAGS_ENABLE_NTP_DISCOVERY_NAME, 673 IDS_FLAGS_ENABLE_NTP_DISCOVERY_NAME,
674 IDS_FLAGS_ENABLE_NTP_DISCOVERY_DESCRIPTION, 674 IDS_FLAGS_ENABLE_NTP_DISCOVERY_DESCRIPTION,
675 kOsAll, 675 kOsAll,
676 SINGLE_VALUE_TYPE(switches::kEnableDiscoveryInNewTabPage) 676 SINGLE_VALUE_TYPE(switches::kEnableDiscoveryInNewTabPage)
677 }, 677 },
678 { 678 {
679 "enable-chrome-to-mobile", // FLAGS:RECORD_UMA 679 "disable-chrome-to-mobile", // FLAGS:RECORD_UMA
680 IDS_FLAGS_ENABLE_CHROME_TO_MOBILE_NAME, 680 IDS_FLAGS_DISABLE_CHROME_TO_MOBILE_NAME,
681 IDS_FLAGS_ENABLE_CHROME_TO_MOBILE_DESCRIPTION, 681 IDS_FLAGS_DISABLE_CHROME_TO_MOBILE_DESCRIPTION,
682 kOsAll, 682 kOsAll,
683 SINGLE_VALUE_TYPE(switches::kEnableChromeToMobile) 683 SINGLE_VALUE_TYPE(switches::kDisableChromeToMobile)
684 }, 684 },
685 #if defined(GOOGLE_CHROME_BUILD) 685 #if defined(GOOGLE_CHROME_BUILD)
686 { 686 {
687 "disable-asynchronous-spellchecking", 687 "disable-asynchronous-spellchecking",
688 IDS_FLAGS_DISABLE_ASYNCHRONOUS_SPELLCHECKING, 688 IDS_FLAGS_DISABLE_ASYNCHRONOUS_SPELLCHECKING,
689 IDS_FLAGS_DISABLE_ASYNCHRONOUS_SPELLCHECKING_DESCRIPTION, 689 IDS_FLAGS_DISABLE_ASYNCHRONOUS_SPELLCHECKING_DESCRIPTION,
690 kOsWin | kOsLinux | kOsCrOS, 690 kOsWin | kOsLinux | kOsCrOS,
691 SINGLE_VALUE_TYPE(switches::kDisableAsynchronousSpellChecking) 691 SINGLE_VALUE_TYPE(switches::kDisableAsynchronousSpellChecking)
692 }, 692 },
693 #endif 693 #endif
(...skipping 640 matching lines...) Expand 10 before | Expand all | Expand 10 after
1334 } 1334 }
1335 1335
1336 const Experiment* GetExperiments(size_t* count) { 1336 const Experiment* GetExperiments(size_t* count) {
1337 *count = num_experiments; 1337 *count = num_experiments;
1338 return experiments; 1338 return experiments;
1339 } 1339 }
1340 1340
1341 } // namespace testing 1341 } // namespace testing
1342 1342
1343 } // namespace about_flags 1343 } // 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