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

Unified Diff: chrome/browser/ui/cocoa/wrench_menu/wrench_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/wrench_menu/wrench_menu_controller.mm
diff --git a/chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller.mm b/chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller.mm
index cfa847e046493af070060709271d9402256d5589..2e41dd898a31a075e5124ca77204acd198fe5276 100644
--- a/chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller.mm
+++ b/chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller.mm
@@ -122,10 +122,8 @@ class ZoomLevelObserver {
// Handle the special-cased menu items.
int command_id = model->GetCommandIdAt(index);
- scoped_nsobject<NSMenuItem> customItem(
- [[NSMenuItem alloc] initWithTitle:@""
- action:nil
- keyEquivalent:@""]);
+ base::scoped_nsobject<NSMenuItem> customItem(
+ [[NSMenuItem alloc] initWithTitle:@"" action:nil keyEquivalent:@""]);
MenuTrackedRootView* view;
switch (command_id) {
case IDC_EDIT_MENU:
@@ -162,9 +160,9 @@ class ZoomLevelObserver {
if (model && model == [self recentTabsMenuModel] &&
model->GetLabelFontAt([item tag])) {
DCHECK([menuItem attributedTitle]);
- scoped_nsobject<NSMutableAttributedString> title(
- [[NSMutableAttributedString alloc] initWithAttributedString:
- [menuItem attributedTitle]]);
+ base::scoped_nsobject<NSMutableAttributedString> title(
+ [[NSMutableAttributedString alloc]
+ initWithAttributedString:[menuItem attributedTitle]]);
[title addAttribute:NSForegroundColorAttributeName
value:[NSColor blackColor]
range:NSMakeRange(0, [title length])];

Powered by Google App Engine
This is Rietveld 408576698