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

Unified Diff: chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa.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/content_settings/content_setting_bubble_cocoa.mm
diff --git a/chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa.mm b/chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa.mm
index 7d1c13cad603aa50e06c525fbf48a00a1c7d8d26..5040e5bdb3db14a8ab1a06fcf3643ab1868bd82b 100644
--- a/chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa.mm
+++ b/chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa.mm
@@ -90,7 +90,7 @@ NSTextField* LabelWithFrame(NSString* text, const NSRect& frame) {
// Sets the title for the popup button.
void SetTitleForPopUpButton(NSPopUpButton* button, NSString* title) {
- scoped_nsobject<NSMenuItem> titleItem([[NSMenuItem alloc] init]);
+ base::scoped_nsobject<NSMenuItem> titleItem([[NSMenuItem alloc] init]);
[titleItem setTitle:title];
[[button cell] setUsesItemFromMenu:NO];
[[button cell] setMenuItem:titleItem.get()];
@@ -293,8 +293,8 @@ MediaMenuParts::~MediaMenuParts() {}
title:(NSString*)title
icon:(NSImage*)icon
referenceFrame:(NSRect)referenceFrame {
- scoped_nsobject<HyperlinkButtonCell> cell([[HyperlinkButtonCell alloc]
- initTextCell:title]);
+ base::scoped_nsobject<HyperlinkButtonCell> cell(
+ [[HyperlinkButtonCell alloc] initTextCell:title]);
[cell.get() setAlignment:NSNaturalTextAlignment];
if (icon) {
[cell.get() setImagePosition:NSImageLeft];
@@ -410,7 +410,7 @@ MediaMenuParts::~MediaMenuParts() {}
// "Clear" button / text field.
if (!content.custom_link.empty()) {
- scoped_nsobject<NSControl> control;
+ base::scoped_nsobject<NSControl> control;
if(content.custom_link_enabled) {
NSRect buttonFrame = NSMakeRect(0, 0,
NSWidth(containerFrame),
@@ -512,7 +512,7 @@ MediaMenuParts::~MediaMenuParts() {}
// |buttonFrame| will be resized and repositioned later on.
NSRect buttonFrame = NSMakeRect(NSMinX(radioFrame), 0, 0, 0);
- scoped_nsobject<NSPopUpButton> button(
+ base::scoped_nsobject<NSPopUpButton> button(
[[NSPopUpButton alloc] initWithFrame:buttonFrame]);
[button setTarget:self];

Powered by Google App Engine
This is Rietveld 408576698