| Index: ui/base/cocoa/menu_controller.mm
|
| diff --git a/ui/base/cocoa/menu_controller.mm b/ui/base/cocoa/menu_controller.mm
|
| index cacb9b2249f0c77cd079ce8387e141d6ffb46c3f..1179284924b906875dbb7e652e21941cc18d0ba8 100644
|
| --- a/ui/base/cocoa/menu_controller.mm
|
| +++ b/ui/base/cocoa/menu_controller.mm
|
| @@ -107,7 +107,7 @@
|
| label16 = [MenuController elideMenuTitle:label16 toWidth:maxWidth];
|
|
|
| NSString* label = l10n_util::FixUpWindowsStyleLabel(label16);
|
| - scoped_nsobject<NSMenuItem> item(
|
| + base::scoped_nsobject<NSMenuItem> item(
|
| [[NSMenuItem alloc] initWithTitle:label
|
| action:@selector(itemSelected:)
|
| keyEquivalent:@""]);
|
| @@ -184,7 +184,7 @@
|
| NSDictionary *attributes =
|
| [NSDictionary dictionaryWithObject:font->GetNativeFont()
|
| forKey:NSFontAttributeName];
|
| - scoped_nsobject<NSAttributedString> title(
|
| + base::scoped_nsobject<NSAttributedString> title(
|
| [[NSAttributedString alloc] initWithString:[(id)item title]
|
| attributes:attributes]);
|
| [(id)item setAttributedTitle:title.get()];
|
| @@ -217,7 +217,7 @@
|
| // complicate creation logic, and since the tags are model indexes, they
|
| // are unaffected by the extra item.
|
| if (useWithPopUpButtonCell_) {
|
| - scoped_nsobject<NSMenuItem> blankItem(
|
| + base::scoped_nsobject<NSMenuItem> blankItem(
|
| [[NSMenuItem alloc] initWithTitle:@"" action:nil keyEquivalent:@""]);
|
| [menu_ insertItem:blankItem atIndex:0];
|
| }
|
|
|