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

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

Issue 797693002: easy-unlock: Get rid of extra flag. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix typo Created 6 years 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
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/signin/easy_unlock_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 <iterator> 7 #include <iterator>
8 #include <map> 8 #include <map>
9 #include <set> 9 #include <set>
10 #include <utility> 10 #include <utility>
(...skipping 833 matching lines...) Expand 10 before | Expand all | Expand 10 after
844 SINGLE_VALUE_TYPE(chromeos::switches::kEnableTouchpadThreeFingerClick) 844 SINGLE_VALUE_TYPE(chromeos::switches::kEnableTouchpadThreeFingerClick)
845 }, 845 },
846 { 846 {
847 "disable-easy-unlock", 847 "disable-easy-unlock",
848 IDS_FLAGS_DISABLE_EASY_UNLOCK_NAME, 848 IDS_FLAGS_DISABLE_EASY_UNLOCK_NAME,
849 IDS_FLAGS_DISABLE_EASY_UNLOCK_DESCRIPTION, 849 IDS_FLAGS_DISABLE_EASY_UNLOCK_DESCRIPTION,
850 kOsCrOS, 850 kOsCrOS,
851 SINGLE_VALUE_TYPE(proximity_auth::switches::kDisableEasyUnlock) 851 SINGLE_VALUE_TYPE(proximity_auth::switches::kDisableEasyUnlock)
852 }, 852 },
853 { 853 {
854 "disable-easy-signin",
855 IDS_FLAGS_DISABLE_EASY_SIGNIN_NAME,
856 IDS_FLAGS_DISABLE_EASY_SIGNIN_DESCRIPTION,
857 kOsCrOSOwnerOnly,
858 SINGLE_VALUE_TYPE(proximity_auth::switches::kDisableEasySignin)
859 },
860 {
861 "enable-easy-unlock-proximity-detection", 854 "enable-easy-unlock-proximity-detection",
862 IDS_FLAGS_ENABLE_EASY_UNLOCK_PROXIMITY_DETECTION_NAME, 855 IDS_FLAGS_ENABLE_EASY_UNLOCK_PROXIMITY_DETECTION_NAME,
863 IDS_FLAGS_ENABLE_EASY_UNLOCK_PROXIMITY_DETECTION_DESCRIPTION, 856 IDS_FLAGS_ENABLE_EASY_UNLOCK_PROXIMITY_DETECTION_DESCRIPTION,
864 kOsCrOS, 857 kOsCrOS,
865 SINGLE_VALUE_TYPE(proximity_auth::switches::kEnableProximityDetection) 858 SINGLE_VALUE_TYPE(proximity_auth::switches::kEnableProximityDetection)
866 }, 859 },
867 #endif 860 #endif
868 #if defined(USE_ASH) 861 #if defined(USE_ASH)
869 { 862 {
870 "disable-minimize-on-second-launcher-item-click", 863 "disable-minimize-on-second-launcher-item-click",
(...skipping 1771 matching lines...) Expand 10 before | Expand all | Expand 10 after
2642 } 2635 }
2643 2636
2644 const Experiment* GetExperiments(size_t* count) { 2637 const Experiment* GetExperiments(size_t* count) {
2645 *count = num_experiments; 2638 *count = num_experiments;
2646 return experiments; 2639 return experiments;
2647 } 2640 }
2648 2641
2649 } // namespace testing 2642 } // namespace testing
2650 2643
2651 } // namespace about_flags 2644 } // namespace about_flags
OLDNEW
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/signin/easy_unlock_service.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698