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

Unified Diff: chrome/browser/ui/cocoa/browser/password_generation_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/edit_search_engine_cocoa_controller_unittest.mm ('k') | chrome/browser/ui/cocoa/browser/zoom_bubble_controller.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/password_generation_bubble_controller.mm

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

index 4662fc6156e028db5233575e92c7f9d1583199b9..736ae92fc579dcfbc13023dc0fda52289b7c98d7 100644

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

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

@@ -69,8 +69,8 @@ const CGFloat kIconSize = 26.0;

@private

PasswordGenerationBubbleController* controller_;

BOOL hovering_;

- scoped_nsobject<NSImage> normalImage_;

- scoped_nsobject<NSImage> hoverImage_;

+ base::scoped_nsobject<NSImage> normalImage_;

+ base::scoped_nsobject<NSImage> hoverImage_;

}

- (void)setUpWithController:(PasswordGenerationBubbleController*)controller

@@ -260,12 +260,10 @@ const CGFloat kIconSize = 26.0;

- (void)setUpTrackingAreaInRect:(NSRect)frame

ofView:(PasswordGenerationTextField*)view {

NSRect iconFrame = [self getIconFrame:frame];

- scoped_nsobject<CrTrackingArea> area(

+ base::scoped_nsobject<CrTrackingArea> area(

[[CrTrackingArea alloc] initWithRect:iconFrame

options:NSTrackingMouseEnteredAndExited |

- NSTrackingActiveAlways

- owner:view

- userInfo:nil]);

+ NSTrackingActiveAlways owner:view userInfo:nil]);

[view addTrackingArea:area];

}

@@ -308,7 +306,7 @@ const CGFloat kIconSize = 26.0;

kTopBorderOffset +

info_bubble::kBubbleArrowHeight);

NSRect contentRect = NSMakeRect(0, 0, width, height);

- scoped_nsobject<InfoBubbleWindow> window(

+ base::scoped_nsobject<InfoBubbleWindow> window(

[[InfoBubbleWindow alloc] initWithContentRect:contentRect

styleMask:NSBorderlessWindowMask

backing:NSBackingStoreBuffered

@@ -364,12 +362,11 @@ const CGFloat kIconSize = 26.0;

[button setAction:@selector(fillPassword:)];

[contentView addSubview:button];

- scoped_nsobject<NSTextField> title([[NSTextField alloc]

- initWithFrame:NSMakeRect(

- kBorderSize,

- kBorderSize + kTextFieldHeight + kVerticalSpacing,

- kTitleWidth,

- kTitleHeight)]);

+ base::scoped_nsobject<NSTextField> title([[NSTextField alloc] initWithFrame:

+ NSMakeRect(kBorderSize,

+ kBorderSize + kTextFieldHeight + kVerticalSpacing,

+ kTitleWidth,

+ kTitleHeight)]);

[title setEditable:NO];

[title setBordered:NO];

[title setStringValue:l10n_util::GetNSString(