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

Unified Diff: ui/message_center/cocoa/notification_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/message_center/cocoa/notification_controller.mm
diff --git a/ui/message_center/cocoa/notification_controller.mm b/ui/message_center/cocoa/notification_controller.mm
index 87b4a8f4c5b2690e33caaf1f125a72edc2e1c943..afea9e6ca4e6a57b0a240c842f641c8e29010f90 100644
--- a/ui/message_center/cocoa/notification_controller.mm
+++ b/ui/message_center/cocoa/notification_controller.mm
@@ -207,9 +207,8 @@
NSRect rootFrame = NSMakeRect(0, 0,
message_center::kNotificationPreferredImageSize,
message_center::kNotificationIconSize);
- scoped_nsobject<MCNotificationView> rootView(
- [[MCNotificationView alloc] initWithController:self
- frame:rootFrame]);
+ base::scoped_nsobject<MCNotificationView> rootView(
+ [[MCNotificationView alloc] initWithController:self frame:rootFrame]);
[self configureCustomBox:rootView];
[rootView setFillColor:gfx::SkColorToCalibratedNSColor(
message_center::kNotificationBackgroundColor)];
@@ -346,9 +345,9 @@
NSRect buttonFrame = frame;
buttonFrame.origin = NSMakePoint(0, y);
buttonFrame.size.height = message_center::kButtonHeight;
- scoped_nsobject<NSButton> button(
+ base::scoped_nsobject<NSButton> button(
[[NSButton alloc] initWithFrame:buttonFrame]);
- scoped_nsobject<MCNotificationButtonCell> cell(
+ base::scoped_nsobject<MCNotificationButtonCell> cell(
[[MCNotificationButtonCell alloc]
initTextCell:base::SysUTF16ToNSString(buttonInfo.title)]);
[cell setShowsBorderOnlyWhileMouseInside:YES];
@@ -366,7 +365,7 @@
NSRect separatorFrame = frame;
separatorFrame.origin = NSMakePoint(0, y);
separatorFrame.size.height = 1;
- scoped_nsobject<NSBox> separator(
+ base::scoped_nsobject<NSBox> separator(
[[AccessibilityIgnoredBox alloc] initWithFrame:separatorFrame]);
[self configureCustomBox:separator];
[separator setFillColor:gfx::SkColorToCalibratedNSColor(
@@ -383,7 +382,7 @@
imageFrame.origin = NSMakePoint(0, y);
imageFrame.size = NSSizeFromCGSize(message_center::GetImageSizeForWidth(
NSWidth(frame), notification->image().Size()).ToCGSize());
- scoped_nsobject<NSImageView> imageView(
+ base::scoped_nsobject<NSImageView> imageView(
[[NSImageView alloc] initWithFrame:imageFrame]);
[imageView setImage:image];
[imageView setImageScaling:NSImageScaleProportionallyUpOrDown];
@@ -440,7 +439,7 @@
NSMutableAttributedString* formattedText =
[[[NSMutableAttributedString alloc] initWithString:text] autorelease];
- scoped_nsobject<NSMutableParagraphStyle> paragraphStyle(
+ base::scoped_nsobject<NSMutableParagraphStyle> paragraphStyle(
[[NSParagraphStyle defaultParagraphStyle] mutableCopy]);
[paragraphStyle setLineBreakMode:NSLineBreakByTruncatingTail];
NSDictionary* sharedAttribs = @{
@@ -481,7 +480,7 @@
NSRect imageFrame = NSMakeRect(0, 0,
message_center::kNotificationIconSize,
message_center::kNotificationIconSize);
- scoped_nsobject<NSBox> imageBox(
+ base::scoped_nsobject<NSBox> imageBox(
[[AccessibilityIgnoredBox alloc] initWithFrame:imageFrame]);
[self configureCustomBox:imageBox];
[imageBox setFillColor:gfx::SkColorToCalibratedNSColor(

Powered by Google App Engine
This is Rietveld 408576698