Chromium Code Reviews| Index: chrome/browser/ui/cocoa/autofill/autofill_popup_base_view_cocoa.h |
| diff --git a/chrome/browser/ui/cocoa/autofill/autofill_popup_base_view_cocoa.h b/chrome/browser/ui/cocoa/autofill/autofill_popup_base_view_cocoa.h |
| index d9ea64bbf658e4443a5ee69bce115777c526d868..4b59b37e9b1030503ad1bc74dde387d43c75ca1f 100644 |
| --- a/chrome/browser/ui/cocoa/autofill/autofill_popup_base_view_cocoa.h |
| +++ b/chrome/browser/ui/cocoa/autofill/autofill_popup_base_view_cocoa.h |
| @@ -15,7 +15,7 @@ class AutofillPopupViewDelegate; |
| @interface AutofillPopupBaseViewCocoa : BaseView { |
| @private |
| - autofill::AutofillPopupViewDelegate* delegate_; // weak |
| + autofill::AutofillPopupViewDelegate* popup_delegate_; // weak |
|
Ilya Sherman
2016/01/20 23:25:18
Why did you change this name?
Mathieu
2016/01/21 01:25:08
It conflicts with the |delegate_| in AutofillPopup
Ilya Sherman
2016/01/21 01:27:03
How does it conflict, exactly? That variable is i
|
| } |
| - (NSColor*)backgroundColor; |