Index: chrome/browser/ui/cocoa/autofill/autofill_suggestion_container.mm |
diff --git a/chrome/browser/ui/cocoa/autofill/autofill_suggestion_container.mm b/chrome/browser/ui/cocoa/autofill/autofill_suggestion_container.mm |
index 6522e691c0840c8cb2bafbf65f78c5781762f9fc..9989f83fd0f37147a31b8f3d014a68fb50504107 100644 |
--- a/chrome/browser/ui/cocoa/autofill/autofill_suggestion_container.mm |
+++ b/chrome/browser/ui/cocoa/autofill/autofill_suggestion_container.mm |
@@ -8,7 +8,7 @@ |
#include <cmath> |
#include "base/logging.h" |
-#include "base/memory/scoped_nsobject.h" |
+#include "base/mac/scoped_nsobject.h" |
#include "base/strings/sys_string_conversions.h" |
#include "chrome/browser/ui/autofill/autofill_dialog_controller.h" |
#include "chrome/browser/ui/chrome_style.h" |
@@ -38,7 +38,7 @@ NSRect CenterVertically(NSRect rect1, NSRect rect2) { |
@implementation AutofillSuggestionContainer |
- (NSTextField*)makeDetailSectionLabel:(NSString*)labelText { |
- scoped_nsobject<NSTextField> label([[NSTextField alloc] init]); |
+ base::scoped_nsobject<NSTextField> label([[NSTextField alloc] init]); |
[label setFont: |
[[NSFontManager sharedFontManager] convertFont:[label font] |
toHaveTrait:NSBoldFontMask]]; |
@@ -60,14 +60,14 @@ NSRect CenterVertically(NSRect rect1, NSRect rect2) { |
inputField_.reset([[AutofillTextField alloc] initWithFrame:NSZeroRect]); |
[inputField_ setHidden:YES]; |
- scoped_nsobject<NSView> view([[NSView alloc] initWithFrame:NSZeroRect]); |
+ base::scoped_nsobject<NSView> view([[NSView alloc] initWithFrame:NSZeroRect]); |
[view setSubviews: |
@[iconImageView_, label_, inputField_, label2_ ]]; |
[self setView:view]; |
} |
- (NSTextField*)createLabelWithFrame:(NSRect)frame { |
- scoped_nsobject<NSTextField> label( |
+ base::scoped_nsobject<NSTextField> label( |
[[NSTextField alloc] initWithFrame:frame]); |
[label setEditable:NO]; |
[label setDrawsBackground:NO]; |
@@ -174,4 +174,4 @@ NSRect CenterVertically(NSRect rect1, NSRect rect2) { |
[[self view] setFrameSize:preferredContainerSize]; |
} |
-@end |
+@end |