OLD | NEW |
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/ui/autofill/autofill_popup_controller_impl.h" | 5 #include "chrome/browser/ui/autofill/autofill_popup_controller_impl.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <utility> | 8 #include <utility> |
9 | 9 |
10 #include "base/logging.h" | 10 #include "base/logging.h" |
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
52 }; | 52 }; |
53 | 53 |
54 const DataResource kDataResources[] = { | 54 const DataResource kDataResources[] = { |
55 { "americanExpressCC", IDR_AUTOFILL_CC_AMEX }, | 55 { "americanExpressCC", IDR_AUTOFILL_CC_AMEX }, |
56 { "dinersCC", IDR_AUTOFILL_CC_DINERS }, | 56 { "dinersCC", IDR_AUTOFILL_CC_DINERS }, |
57 { "discoverCC", IDR_AUTOFILL_CC_DISCOVER }, | 57 { "discoverCC", IDR_AUTOFILL_CC_DISCOVER }, |
58 { "genericCC", IDR_AUTOFILL_CC_GENERIC }, | 58 { "genericCC", IDR_AUTOFILL_CC_GENERIC }, |
59 { "jcbCC", IDR_AUTOFILL_CC_JCB }, | 59 { "jcbCC", IDR_AUTOFILL_CC_JCB }, |
60 { "masterCardCC", IDR_AUTOFILL_CC_MASTERCARD }, | 60 { "masterCardCC", IDR_AUTOFILL_CC_MASTERCARD }, |
61 { "visaCC", IDR_AUTOFILL_CC_VISA }, | 61 { "visaCC", IDR_AUTOFILL_CC_VISA }, |
| 62 { "scanCreditCardIcon", IDR_AUTOFILL_CC_SCAN_NEW }, |
62 #if defined(OS_MACOSX) && !defined(OS_IOS) | 63 #if defined(OS_MACOSX) && !defined(OS_IOS) |
63 { "macContactsIcon", IDR_AUTOFILL_MAC_CONTACTS_ICON }, | 64 { "macContactsIcon", IDR_AUTOFILL_MAC_CONTACTS_ICON }, |
64 #endif // defined(OS_MACOSX) && !defined(OS_IOS) | 65 #endif // defined(OS_MACOSX) && !defined(OS_IOS) |
65 }; | 66 }; |
66 | 67 |
67 } // namespace | 68 } // namespace |
68 | 69 |
69 // static | 70 // static |
70 WeakPtr<AutofillPopupControllerImpl> AutofillPopupControllerImpl::GetOrCreate( | 71 WeakPtr<AutofillPopupControllerImpl> AutofillPopupControllerImpl::GetOrCreate( |
71 WeakPtr<AutofillPopupControllerImpl> previous, | 72 WeakPtr<AutofillPopupControllerImpl> previous, |
(...skipping 565 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
637 names_.clear(); | 638 names_.clear(); |
638 subtexts_.clear(); | 639 subtexts_.clear(); |
639 icons_.clear(); | 640 icons_.clear(); |
640 identifiers_.clear(); | 641 identifiers_.clear(); |
641 full_names_.clear(); | 642 full_names_.clear(); |
642 | 643 |
643 selected_line_ = kNoSelection; | 644 selected_line_ = kNoSelection; |
644 } | 645 } |
645 | 646 |
646 } // namespace autofill | 647 } // namespace autofill |
OLD | NEW |