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

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

Issue 756333003: Prompt for unmasking Wallet credit card on Android (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix compile post-merge 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/android/chrome_jni_registrar.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 1674 matching lines...) Expand 10 before | Expand all | Expand 10 after
1685 { 1685 {
1686 "enable-single-click-autofill", 1686 "enable-single-click-autofill",
1687 IDS_FLAGS_ENABLE_SINGLE_CLICK_AUTOFILL_NAME, 1687 IDS_FLAGS_ENABLE_SINGLE_CLICK_AUTOFILL_NAME,
1688 IDS_FLAGS_ENABLE_SINGLE_CLICK_AUTOFILL_DESCRIPTION, 1688 IDS_FLAGS_ENABLE_SINGLE_CLICK_AUTOFILL_DESCRIPTION,
1689 kOsCrOS | kOsMac | kOsWin | kOsLinux | kOsAndroid, 1689 kOsCrOS | kOsMac | kOsWin | kOsLinux | kOsAndroid,
1690 ENABLE_DISABLE_VALUE_TYPE( 1690 ENABLE_DISABLE_VALUE_TYPE(
1691 autofill::switches::kEnableSingleClickAutofill, 1691 autofill::switches::kEnableSingleClickAutofill,
1692 autofill::switches::kDisableSingleClickAutofill) 1692 autofill::switches::kDisableSingleClickAutofill)
1693 }, 1693 },
1694 { 1694 {
1695 "enable-wallet-card-import",
1696 IDS_FLAGS_ENABLE_WALLET_CARD_IMPORT_NAME,
1697 IDS_FLAGS_ENABLE_WALLET_CARD_IMPORT_DESCRIPTION,
1698 kOsAndroid,
1699 SINGLE_VALUE_TYPE(autofill::switches::kEnableWalletCardImport)
1700 },
1701 {
1695 "enable-permissions-bubbles", 1702 "enable-permissions-bubbles",
1696 IDS_FLAGS_ENABLE_PERMISSIONS_BUBBLES_NAME, 1703 IDS_FLAGS_ENABLE_PERMISSIONS_BUBBLES_NAME,
1697 IDS_FLAGS_ENABLE_PERMISSIONS_BUBBLES_DESCRIPTION, 1704 IDS_FLAGS_ENABLE_PERMISSIONS_BUBBLES_DESCRIPTION,
1698 kOsCrOS | kOsMac | kOsWin | kOsLinux, 1705 kOsCrOS | kOsMac | kOsWin | kOsLinux,
1699 ENABLE_DISABLE_VALUE_TYPE(switches::kEnablePermissionsBubbles, 1706 ENABLE_DISABLE_VALUE_TYPE(switches::kEnablePermissionsBubbles,
1700 switches::kDisablePermissionsBubbles) 1707 switches::kDisablePermissionsBubbles)
1701 }, 1708 },
1702 { 1709 {
1703 "enable-session-crashed-bubble", 1710 "enable-session-crashed-bubble",
1704 IDS_FLAGS_ENABLE_SESSION_CRASHED_BUBBLE_NAME, 1711 IDS_FLAGS_ENABLE_SESSION_CRASHED_BUBBLE_NAME,
(...skipping 945 matching lines...) Expand 10 before | Expand all | Expand 10 after
2650 } 2657 }
2651 2658
2652 const Experiment* GetExperiments(size_t* count) { 2659 const Experiment* GetExperiments(size_t* count) {
2653 *count = num_experiments; 2660 *count = num_experiments;
2654 return experiments; 2661 return experiments;
2655 } 2662 }
2656 2663
2657 } // namespace testing 2664 } // namespace testing
2658 2665
2659 } // namespace about_flags 2666 } // namespace about_flags
OLDNEW
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/android/chrome_jni_registrar.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698