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

Unified Diff: chrome/browser/ui/cocoa/dock_icon.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/dock_icon.mm
diff --git a/chrome/browser/ui/cocoa/dock_icon.mm b/chrome/browser/ui/cocoa/dock_icon.mm
index d70618df52af7e9193f1b0d72a440c57663e40d9..f6bf5aec5b3a85e0a0cf48aa4704cbe3e49879f7 100644
--- a/chrome/browser/ui/cocoa/dock_icon.mm
+++ b/chrome/browser/ui/cocoa/dock_icon.mm
@@ -6,7 +6,7 @@
#include "base/logging.h"
#include "base/mac/bundle_locations.h"
-#include "base/memory/scoped_nsobject.h"
+#include "base/mac/scoped_nsobject.h"
#include "content/public/browser/browser_thread.h"
#include "ui/gfx/scoped_ns_graphics_context_save_gstate_mac.h"
@@ -85,7 +85,7 @@ const int64 kUpdateFrequencyMs = 200;
NSColor* backgroundHighlight =
[backgroundColor blendedColorWithFraction:0.85
ofColor:[NSColor whiteColor]];
- scoped_nsobject<NSGradient> backgroundGradient(
+ base::scoped_nsobject<NSGradient> backgroundGradient(
[[NSGradient alloc] initWithStartingColor:backgroundHighlight
endingColor:backgroundColor]);
NSBezierPath* badgeEdge = [NSBezierPath bezierPathWithOvalInRect:badgeRect];
@@ -108,7 +108,7 @@ const int64 kUpdateFrequencyMs = 200;
NSColor* sliceHighlight =
[sliceColor blendedColorWithFraction:0.4
ofColor:[NSColor whiteColor]];
- scoped_nsobject<NSGradient> sliceGradient(
+ base::scoped_nsobject<NSGradient> sliceGradient(
[[NSGradient alloc] initWithStartingColor:sliceHighlight
endingColor:sliceColor]);
NSBezierPath* progressSlice;
@@ -140,7 +140,7 @@ const int64 kUpdateFrequencyMs = 200;
{
gfx::ScopedNSGraphicsContextSaveGState scopedGState;
[[NSColor whiteColor] set];
- scoped_nsobject<NSShadow> shadow([[NSShadow alloc] init]);
+ base::scoped_nsobject<NSShadow> shadow([[NSShadow alloc] init]);
[shadow.get() setShadowOffset:NSMakeSize(0, -2)];
[shadow setShadowBlurRadius:2];
[shadow set];
@@ -149,12 +149,12 @@ const int64 kUpdateFrequencyMs = 200;
}
// Download count
- scoped_nsobject<NSNumberFormatter> formatter(
+ base::scoped_nsobject<NSNumberFormatter> formatter(
[[NSNumberFormatter alloc] init]);
NSString* countString =
[formatter stringFromNumber:[NSNumber numberWithInt:downloads_]];
- scoped_nsobject<NSShadow> countShadow([[NSShadow alloc] init]);
+ base::scoped_nsobject<NSShadow> countShadow([[NSShadow alloc] init]);
[countShadow setShadowBlurRadius:3.0];
[countShadow.get() setShadowColor:[NSColor whiteColor]];
[countShadow.get() setShadowOffset:NSMakeSize(0.0, 0.0)];
@@ -165,7 +165,7 @@ const int64 kUpdateFrequencyMs = 200;
nil];
CGFloat countFontSize = badgeRadius;
NSSize countSize = NSZeroSize;
- scoped_nsobject<NSAttributedString> countAttrString;
+ base::scoped_nsobject<NSAttributedString> countAttrString;
while (1) {
NSFont* countFont = [NSFont fontWithName:@"Helvetica-Bold"
size:countFontSize];
@@ -207,7 +207,8 @@ const int64 kUpdateFrequencyMs = 200;
if (!icon) {
NSDockTile* dockTile = [[NSApplication sharedApplication] dockTile];
- scoped_nsobject<DockTileView> dockTileView([[DockTileView alloc] init]);
+ base::scoped_nsobject<DockTileView> dockTileView(
+ [[DockTileView alloc] init]);
[dockTile setContentView:dockTileView];
icon = [[DockIcon alloc] init];

Powered by Google App Engine
This is Rietveld 408576698