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

Side by Side Diff: chrome/browser/ui/autofill/autofill_popup_controller_impl.cc

Issue 301343002: mac: Clean up autofill integration with Address Book. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@autofill_cleanup2_base
Patch Set: Remove comments after #else statements. Created 6 years, 6 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
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/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
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 { "macContactsIcon", IDR_AUTOFILL_MAC_CONTACTS_ICON },
62 }; 63 };
63 64
64 } // namespace 65 } // namespace
65 66
66 // static 67 // static
67 WeakPtr<AutofillPopupControllerImpl> AutofillPopupControllerImpl::GetOrCreate( 68 WeakPtr<AutofillPopupControllerImpl> AutofillPopupControllerImpl::GetOrCreate(
68 WeakPtr<AutofillPopupControllerImpl> previous, 69 WeakPtr<AutofillPopupControllerImpl> previous,
69 WeakPtr<AutofillPopupDelegate> delegate, 70 WeakPtr<AutofillPopupDelegate> delegate,
70 content::WebContents* web_contents, 71 content::WebContents* web_contents,
71 gfx::NativeView container_view, 72 gfx::NativeView container_view,
(...skipping 554 matching lines...) Expand 10 before | Expand all | Expand 10 after
626 names_.clear(); 627 names_.clear();
627 subtexts_.clear(); 628 subtexts_.clear();
628 icons_.clear(); 629 icons_.clear();
629 identifiers_.clear(); 630 identifiers_.clear();
630 full_names_.clear(); 631 full_names_.clear();
631 632
632 selected_line_ = kNoSelection; 633 selected_line_ = kNoSelection;
633 } 634 }
634 635
635 } // namespace autofill 636 } // namespace autofill
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698