Chromium Code Reviews| Index: chrome/browser/ui/cocoa/omnibox/omnibox_popup_cell.h |
| diff --git a/chrome/browser/ui/cocoa/omnibox/omnibox_popup_cell.h b/chrome/browser/ui/cocoa/omnibox/omnibox_popup_cell.h |
| index 6d98c21d972f3168b345270adf00ed6d3c43bf9b..237458a0abec435b778c849583858a0779c5da8e 100644 |
| --- a/chrome/browser/ui/cocoa/omnibox/omnibox_popup_cell.h |
| +++ b/chrome/browser/ui/cocoa/omnibox/omnibox_popup_cell.h |
| @@ -7,6 +7,7 @@ |
| #import <Cocoa/Cocoa.h> |
| +#include "base/mac/objc_property_releaser.h" |
| #include "base/mac/scoped_nsobject.h" |
| #include "components/omnibox/browser/autocomplete_match.h" |
| @@ -14,43 +15,33 @@ class OmniboxPopupViewMac; |
| @interface OmniboxPopupCellData : NSObject<NSCopying> { |
| @private |
| - // Left hand side of the separator (e.g. a hyphen). |
| - NSAttributedString* contents_; |
| - // Right hand side of the separator (e.g. a hyphen). |
| - NSAttributedString* description_; |
| - |
| - // NOTE: While |prefix_| is used only for postfix suggestions, it still needs |
| - // to be a member of the class. This allows the |NSAttributedString| instance |
| - // to stay alive between the call to |drawTitle| and the actual paint event |
| - // which accesses the |NSAttributedString| instance. |
| - NSAttributedString* prefix_; |
| - |
| - // Common icon that shows next to most rows in the list. |
| - NSImage* image_; |
| - // Uncommon icon that only shows on answer rows (e.g. weather). |
| - NSImage* answerImage_; |
| - |
| - // The offset at which the infinite suggestion contents should be displayed. |
| - CGFloat contentsOffset_; |
| - |
| - BOOL isContentsRTL_; |
| - |
| - // Is this suggestion an answer or calculator result. |
| - bool isAnswer_; |
| - |
| - AutocompleteMatch::Type matchType_; |
| - |
| - int maxLines_; |
| + base::mac::ObjCPropertyReleaser propertyReleaser_OmniboxPopupCellData_; |
|
Robert Sesek
2016/08/11 15:17:03
While we're modernizing, might as well just push t
erikchen
2016/08/11 17:47:52
Done.
|
| } |
| +// Left hand side of the separator (e.g. a hyphen). |
| @property(readonly, retain, nonatomic) NSAttributedString* contents; |
| + |
| +// Right hand side of the separator (e.g. a hyphen). |
| @property(readonly, retain, nonatomic) NSAttributedString* description; |
| + |
| +// NOTE: While |prefix_| is used only for postfix suggestions, it still needs |
| +// to be a member of the class. This allows the |NSAttributedString| instance |
| +// to stay alive between the call to |drawTitle| and the actual paint event |
| +// which accesses the |NSAttributedString| instance. |
| @property(readonly, retain, nonatomic) NSAttributedString* prefix; |
| + |
| +// Common icon that shows next to most rows in the list. |
| @property(readonly, retain, nonatomic) NSImage* image; |
| @property(retain, nonatomic) NSImage* incognitoImage; |
| + |
| +// Uncommon icon that only shows on answer rows (e.g. weather). |
| @property(readonly, retain, nonatomic) NSImage* answerImage; |
| + |
| +// The offset at which the infinite suggestion contents should be displayed. |
| @property(readonly, nonatomic) CGFloat contentsOffset; |
| @property(readonly, nonatomic) BOOL isContentsRTL; |
| + |
| +// Is this suggestion an answer or calculator result. |
| @property(readonly, nonatomic) bool isAnswer; |
| @property(readonly, nonatomic) AutocompleteMatch::Type matchType; |
| @property(readonly, nonatomic) int maxLines; |