Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(543)

Unified Diff: ui/base/cocoa/menu_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
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]
Nico 2013/06/25 01:09:50 clang-format gets this right as of clang r184804.
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];
}

Powered by Google App Engine
This is Rietveld 408576698