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

Unified Diff: chrome/browser/app_controller_mac.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/app_controller_mac.mm
diff --git a/chrome/browser/app_controller_mac.mm b/chrome/browser/app_controller_mac.mm
index 9ceb4635e03949dcb9de5e7dee94323999643770..b826354036cccdb759e162d615228b1b7d1949fd 100644
--- a/chrome/browser/app_controller_mac.mm
+++ b/chrome/browser/app_controller_mac.mm
@@ -1226,7 +1226,7 @@ void RecordLastRunAppBundlePath() {
[dockMenu addItem:[NSMenuItem separatorItem]];
NSString* titleStr = l10n_util::GetNSStringWithFixup(IDS_NEW_WINDOW_MAC);
- scoped_nsobject<NSMenuItem> item(
+ base::scoped_nsobject<NSMenuItem> item(
[[NSMenuItem alloc] initWithTitle:titleStr
action:@selector(commandFromDock:)
keyEquivalent:@""]);
@@ -1255,7 +1255,8 @@ void RecordLastRunAppBundlePath() {
int position = 0;
NSString* menuStr =
l10n_util::GetNSStringWithFixup(IDS_BACKGROUND_APPS_MAC);
- scoped_nsobject<NSMenu> appMenu([[NSMenu alloc] initWithTitle:menuStr]);
+ base::scoped_nsobject<NSMenu> appMenu(
+ [[NSMenu alloc] initWithTitle:menuStr]);
for (extensions::ExtensionList::const_iterator cursor =
applications.begin();
cursor != applications.end();
@@ -1263,10 +1264,10 @@ void RecordLastRunAppBundlePath() {
DCHECK_EQ(applications.GetPosition(*cursor), position);
NSString* itemStr =
base::SysUTF16ToNSString(UTF8ToUTF16((*cursor)->name()));
- scoped_nsobject<NSMenuItem> appItem([[NSMenuItem alloc]
- initWithTitle:itemStr
- action:@selector(executeApplication:)
- keyEquivalent:@""]);
+ base::scoped_nsobject<NSMenuItem> appItem(
+ [[NSMenuItem alloc] initWithTitle:itemStr
+ action:@selector(executeApplication:)
+ keyEquivalent:@""]);
[appItem setTarget:self];
[appItem setTag:position];
[appMenu addItem:appItem];

Powered by Google App Engine
This is Rietveld 408576698