chrome/browser/ui/cocoa/browser/zoom_bubble_controller.mm - Issue 17593006: mac: Update clients of scoped_nsobject.h.

Unified Diff: chrome/browser/ui/cocoa/browser/zoom_bubble_controller.mm

Issue 17593006: mac: Update clients of scoped_nsobject.h. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: iwyu, scoped_nsprotocol Created 7 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 side-by-side diff with in-line comments

Download patch

« chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_window.mm ('K') | « chrome/browser/ui/cocoa/browser/zoom_bubble_controller.h ('k') | chrome/browser/ui/cocoa/browser_window_cocoa.h » ('j') | chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_cell.mm » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/cocoa/browser/zoom_bubble_controller.mm

diff --git a/chrome/browser/ui/cocoa/browser/zoom_bubble_controller.mm b/chrome/browser/ui/cocoa/browser/zoom_bubble_controller.mm

index a7c9b9e748ecb9db34018f8f39944b8b204e9e38..0f2baa2f6ae9d47f4a9fa1bfdde330e9e0ce3569 100644

--- a/chrome/browser/ui/cocoa/browser/zoom_bubble_controller.mm

+++ b/chrome/browser/ui/cocoa/browser/zoom_bubble_controller.mm

@@ -74,11 +74,11 @@ void SetZoomBubbleAutoCloseDelayForTesting(NSTimeInterval time_interval) {

- (id)initWithParentWindow:(NSWindow*)parentWindow

closeObserver:(void(^)(ZoomBubbleController*))closeObserver {

- scoped_nsobject<InfoBubbleWindow> window([[InfoBubbleWindow alloc]

- initWithContentRect:NSMakeRect(0, 0, 200, 100)

- styleMask:NSBorderlessWindowMask

- backing:NSBackingStoreBuffered

- defer:NO]);

+ base::scoped_nsobject<InfoBubbleWindow> window(

+ [[InfoBubbleWindow alloc] initWithContentRect:NSMakeRect(0, 0, 200, 100)

+ styleMask:NSBorderlessWindowMask

+ backing:NSBackingStoreBuffered

+ defer:NO]);

if ((self = [super initWithWindow:window

parentWindow:parentWindow

anchoredAt:NSZeroPoint])) {

@@ -208,7 +208,8 @@ void SetZoomBubbleAutoCloseDelayForTesting(NSTimeInterval time_interval) {

// Separator view.

rect.origin.x += NSWidth(rect);

rect.size.width = 1;

- scoped_nsobject<NSBox> separatorView([[NSBox alloc] initWithFrame:rect]);

+ base::scoped_nsobject<NSBox> separatorView(

+ [[NSBox alloc] initWithFrame:rect]);

[separatorView setBoxType:NSBoxCustom];

ui::NativeTheme* nativeTheme = ui::NativeTheme::instance();

[separatorView setBorderColor:

@@ -241,7 +242,7 @@ void SetZoomBubbleAutoCloseDelayForTesting(NSTimeInterval time_interval) {

- (NSAttributedString*)attributedStringWithString:(NSString*)string

fontSize:(CGFloat)fontSize {

- scoped_nsobject<NSMutableParagraphStyle> paragraphStyle(

+ base::scoped_nsobject<NSMutableParagraphStyle> paragraphStyle(

[[NSMutableParagraphStyle alloc] init]);

[paragraphStyle setAlignment:NSCenterTextAlignment];

NSDictionary* attributes = @{

@@ -260,7 +261,7 @@ void SetZoomBubbleAutoCloseDelayForTesting(NSTimeInterval time_interval) {

- (NSButton*)addButtonWithTitleID:(int)titleID

fontSize:(CGFloat)fontSize

action:(SEL)action {

- scoped_nsobject<NSButton> button(

+ base::scoped_nsobject<NSButton> button(

[[ZoomHoverButton alloc] initWithFrame:NSZeroRect]);

NSString* title = l10n_util::GetNSStringWithFixup(titleID);

[button setAttributedTitle:[self attributedStringWithString:title

@@ -273,7 +274,7 @@ void SetZoomBubbleAutoCloseDelayForTesting(NSTimeInterval time_interval) {

}

- (NSTextField*)addZoomPercentTextField {

- scoped_nsobject<NSTextField> textField(

+ base::scoped_nsobject<NSTextField> textField(

[[NSTextField alloc] initWithFrame:NSZeroRect]);

[textField setEditable:NO];

[textField setBordered:NO];