| Index: chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.mm
|
| diff --git a/chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.mm b/chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.mm
|
| index 68ba860e3678338596a5b801fbaa0280134941f6..27711fd6e56f3571c8aac3419c85baca064ec912 100644
|
| --- a/chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.mm
|
| +++ b/chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.mm
|
| @@ -149,8 +149,8 @@ OmniboxViewMac::OmniboxViewMac(OmniboxEditController* controller,
|
| [field_ setAllowsEditingTextAttributes:YES];
|
|
|
| // Get the appropriate line height for the font that we use.
|
| - scoped_nsobject<NSLayoutManager>
|
| - layoutManager([[NSLayoutManager alloc] init]);
|
| + base::scoped_nsobject<NSLayoutManager> layoutManager(
|
| + [[NSLayoutManager alloc] init]);
|
| [layoutManager setUsesScreenFonts:YES];
|
| }
|
|
|
| @@ -435,8 +435,8 @@ void OmniboxViewMac::ApplyTextAttributes(const string16& display_text,
|
|
|
| // Make a paragraph style locking in the standard line height as the maximum,
|
| // otherwise the baseline may shift "downwards".
|
| - scoped_nsobject<NSMutableParagraphStyle>
|
| - paragraph_style([[NSMutableParagraphStyle alloc] init]);
|
| + base::scoped_nsobject<NSMutableParagraphStyle> paragraph_style(
|
| + [[NSMutableParagraphStyle alloc] init]);
|
| CGFloat line_height = [[field_ cell] lineHeight];
|
| [paragraph_style setMaximumLineHeight:line_height];
|
| [paragraph_style setMinimumLineHeight:line_height];
|
|
|