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

Unified Diff: chrome/browser/ui/cocoa/bookmarks/bookmark_button.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_button.mm
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_button.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_button.mm
index 876ac6dfdc33bb3f77332737852c11322b215382..92f6b8956e7d2ec6aea98d273a35e3b0daa0248a 100644
--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_button.mm
+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_button.mm
@@ -7,7 +7,7 @@
#include <cmath>
#include "base/logging.h"
-#import "base/memory/scoped_nsobject.h"
+#import "base/mac/scoped_nsobject.h"
#include "chrome/browser/bookmarks/bookmark_model.h"
#import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_window.h"
#import "chrome/browser/ui/cocoa/bookmarks/bookmark_button_cell.h"
@@ -415,10 +415,11 @@ BookmarkButton* gDraggedButton = nil; // Weak
// if the source view is clipped. Fortunately, we don't display clipped
// bookmark buttons.
[self lockFocus];
- scoped_nsobject<NSBitmapImageRep>
- bitmap([[NSBitmapImageRep alloc] initWithFocusedViewRect:bounds]);
+ base::scoped_nsobject<NSBitmapImageRep> bitmap(
+ [[NSBitmapImageRep alloc] initWithFocusedViewRect:bounds]);
[self unlockFocus];
- scoped_nsobject<NSImage> image([[NSImage alloc] initWithSize:[bitmap size]]);
+ base::scoped_nsobject<NSImage> image(
+ [[NSImage alloc] initWithSize:[bitmap size]]);
[image addRepresentation:bitmap];
// Make an autoreleased |NSImage|, which will be returned, and draw into it.

Powered by Google App Engine
This is Rietveld 408576698