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

Unified Diff: chrome/browser/ui/cocoa/bookmarks/bookmark_drag_drop_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/bookmarks/bookmark_drag_drop_cocoa.mm
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_drag_drop_cocoa.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_drag_drop_cocoa.mm
index 3c1889ddf1dc262ee942681f95acc57e849db50e..c69a17d38f95bed55857bf0ecd68a268d3352141 100644
--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_drag_drop_cocoa.mm
+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_drag_drop_cocoa.mm
@@ -9,7 +9,7 @@
#include <cmath>
#include "base/logging.h"
-#include "base/memory/scoped_nsobject.h"
+#include "base/mac/scoped_nsobject.h"
#include "base/message_loop.h"
#include "base/strings/string16.h"
#include "base/strings/sys_string_conversions.h"
@@ -69,9 +69,8 @@ void DrawTruncatedTitle(NSAttributedString* title, NSRect frame) {
NSColor* color = [NSColor blackColor];
NSColor* alpha_color = [color colorWithAlphaComponent:0.0];
- scoped_nsobject<NSGradient> mask(
- [[NSGradient alloc] initWithStartingColor:color
- endingColor:alpha_color]);
+ base::scoped_nsobject<NSGradient> mask(
+ [[NSGradient alloc] initWithStartingColor:color endingColor:alpha_color]);
// Draw the gradient mask.
CGContextSetBlendMode(context, kCGBlendModeDestinationIn);
[mask drawFromPoint:NSMakePoint(NSMaxX(frame) - gradient_width,
@@ -101,9 +100,8 @@ NSImage* DragImageForBookmark(NSImage* favicon, const string16& title) {
[NSDictionary dictionaryWithObject:[NSFont systemFontOfSize:
[NSFont smallSystemFontSize]]
forKey:NSFontAttributeName];
- scoped_nsobject<NSAttributedString> rich_title(
- [[NSAttributedString alloc] initWithString:ns_title
- attributes:attrs]);
+ base::scoped_nsobject<NSAttributedString> rich_title(
+ [[NSAttributedString alloc] initWithString:ns_title attributes:attrs]);
// Set up sizes and locations for rendering.
const CGFloat kIconMargin = 2.0; // Gap between icon and text.

Powered by Google App Engine
This is Rietveld 408576698