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

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

Issue 10800010: Revert 140439 - Make OTP sign in on by default. It can be turned off in about:flags (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Fix error handling for ASPs Created 8 years, 5 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 | « chrome/app/generated_resources.grd ('k') | chrome/browser/resources/sync_setup_overlay.js » ('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 712 matching lines...) Expand 10 before | Expand all | Expand 10 after
723 #if defined(OS_CHROMEOS) 723 #if defined(OS_CHROMEOS)
724 { 724 {
725 "allow-touchpad-three-finger-click", 725 "allow-touchpad-three-finger-click",
726 IDS_FLAGS_ALLOW_TOUCHPAD_THREE_FINGER_CLICK_NAME, 726 IDS_FLAGS_ALLOW_TOUCHPAD_THREE_FINGER_CLICK_NAME,
727 IDS_FLAGS_ALLOW_TOUCHPAD_THREE_FINGER_CLICK_DESCRIPTION, 727 IDS_FLAGS_ALLOW_TOUCHPAD_THREE_FINGER_CLICK_DESCRIPTION,
728 kOsCrOS, 728 kOsCrOS,
729 SINGLE_VALUE_TYPE(switches::kEnableTouchpadThreeFingerClick) 729 SINGLE_VALUE_TYPE(switches::kEnableTouchpadThreeFingerClick)
730 }, 730 },
731 #endif 731 #endif
732 { 732 {
733 "disable-client-oauth-signin", 733 "enable-client-oauth-signin",
734 IDS_FLAGS_DISABLE_CLIENT_OAUTH_SIGNIN_NAME, 734 IDS_FLAGS_ENABLE_CLIENT_OAUTH_SIGNIN_NAME,
735 IDS_FLAGS_DISABLE_CLIENT_OAUTH_SIGNIN_DESCRIPTION, 735 IDS_FLAGS_ENABLE_CLIENT_OAUTH_SIGNIN_DESCRIPTION,
736 kOsMac | kOsWin | kOsLinux, 736 kOsMac | kOsWin | kOsLinux,
737 SINGLE_VALUE_TYPE(switches::kDisableClientOAuthSignin) 737 SINGLE_VALUE_TYPE(switches::kEnableClientOAuthSignin)
738 }, 738 },
739 #if defined(USE_ASH) 739 #if defined(USE_ASH)
740 { 740 {
741 "show-launcher-alignment-menu", 741 "show-launcher-alignment-menu",
742 IDS_FLAGS_SHOW_LAUNCHER_ALIGNMENT_MENU_NAME, 742 IDS_FLAGS_SHOW_LAUNCHER_ALIGNMENT_MENU_NAME,
743 IDS_FLAGS_SHOW_LAUNCHER_ALIGNMENT_MENU_DESCRIPTION, 743 IDS_FLAGS_SHOW_LAUNCHER_ALIGNMENT_MENU_DESCRIPTION,
744 kOsAll, 744 kOsAll,
745 SINGLE_VALUE_TYPE(switches::kShowLauncherAlignmentMenu) 745 SINGLE_VALUE_TYPE(switches::kShowLauncherAlignmentMenu)
746 }, 746 },
747 { 747 {
(...skipping 542 matching lines...) Expand 10 before | Expand all | Expand 10 after
1290 } 1290 }
1291 1291
1292 const Experiment* GetExperiments(size_t* count) { 1292 const Experiment* GetExperiments(size_t* count) {
1293 *count = num_experiments; 1293 *count = num_experiments;
1294 return experiments; 1294 return experiments;
1295 } 1295 }
1296 1296
1297 } // namespace testing 1297 } // namespace testing
1298 1298
1299 } // namespace about_flags 1299 } // namespace about_flags
OLDNEW
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/resources/sync_setup_overlay.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698