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

Unified Diff: chrome/browser/ui/cocoa/profile_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: chrome/browser/ui/cocoa/profile_menu_controller.mm
diff --git a/chrome/browser/ui/cocoa/profile_menu_controller.mm b/chrome/browser/ui/cocoa/profile_menu_controller.mm
index 4f08ec40664978406aac5d981716844251e88df8..0ef2503e916de5b1fa5bab5c644b009ddd789325 100644
--- a/chrome/browser/ui/cocoa/profile_menu_controller.mm
+++ b/chrome/browser/ui/cocoa/profile_menu_controller.mm
@@ -66,8 +66,7 @@ class Observer : public chrome::BrowserListObserver,
if ((self = [super init])) {
mainMenuItem_ = item;
- scoped_nsobject<NSMenu> menu(
- [[NSMenu alloc] initWithTitle:
+ base::scoped_nsobject<NSMenu> menu([[NSMenu alloc] initWithTitle:
l10n_util::GetNSStringWithFixup(IDS_PROFILES_OPTIONS_GROUP_NAME)]);
[mainMenuItem_ setSubmenu:menu];
@@ -110,7 +109,7 @@ class Observer : public chrome::BrowserListObserver,
if (dock) {
NSString* headerName =
l10n_util::GetNSStringWithFixup(IDS_PROFILES_OPTIONS_GROUP_NAME);
- scoped_nsobject<NSMenuItem> header(
+ base::scoped_nsobject<NSMenuItem> header(
[[NSMenuItem alloc] initWithTitle:headerName
action:NULL
keyEquivalent:@""]);
@@ -213,7 +212,7 @@ class Observer : public chrome::BrowserListObserver,
}
- (NSMenuItem*)createItemWithTitle:(NSString*)title action:(SEL)sel {
- scoped_nsobject<NSMenuItem> item(
+ base::scoped_nsobject<NSMenuItem> item(
[[NSMenuItem alloc] initWithTitle:title action:sel keyEquivalent:@""]);
[item setTarget:self];
return [item.release() autorelease];

Powered by Google App Engine
This is Rietveld 408576698