[Merge to 2785] Fix many memory leaks in chrome/browser/ui/cocoa/omnibox.

chrome/browser/ui/cocoa/omnibox/omnibox_popup_cell.h

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_UI_COCOA_OMNIBOX_OMNIBOX_POPUP_CELL_H_
 #define CHROME_BROWSER_UI_COCOA_OMNIBOX_OMNIBOX_POPUP_CELL_H_
 
 #import <Cocoa/Cocoa.h>
 
 #include "base/mac/scoped_nsobject.h"
 #include "components/omnibox/browser/autocomplete_match.h"
 
 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_;
+@interface OmniboxPopupCellData : NSObject<NSCopying>
 
-  // 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_;
+// Left hand side of the separator (e.g. a hyphen).
+@property(readonly, retain, nonatomic) NSAttributedString* contents;
 
-  // 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_;
+// Right hand side of the separator (e.g. a hyphen).
+@property(readonly, retain, nonatomic) NSAttributedString* description;
 
-  // The offset at which the infinite suggestion contents should be displayed.
-  CGFloat contentsOffset_;
+// 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;
 
-  BOOL isContentsRTL_;
-
-  // Is this suggestion an answer or calculator result.
-  bool isAnswer_;
-
-  AutocompleteMatch::Type matchType_;
-
-  int max_lines_;
-}
-
-@property(readonly, retain, nonatomic) NSAttributedString* contents;
-@property(readonly, retain, nonatomic) NSAttributedString* description;
-@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 max_lines;
 
 - (instancetype)initWithMatch:(const AutocompleteMatch&)match
                contentsOffset:(CGFloat)contentsOffset
                         image:(NSImage*)image
                   answerImage:(NSImage*)answerImage
                  forDarkTheme:(BOOL)isDarkTheme;
 
@@ skipping 15 matching lines @@
 
 + (NSAttributedString*)createSeparatorStringForDarkTheme:(BOOL)isDarkTheme;
 
 + (CGFloat)getContentAreaWidth:(NSRect)cellFrame;
 
 @end
 
 const CGFloat kContentLineHeight = 25.0;
 
 #endif  // CHROME_BROWSER_UI_COCOA_OMNIBOX_OMNIBOX_POPUP_CELL_H_