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

Unified Diff: chrome/browser/ui/cocoa/toolbar/toolbar_button_cocoa.mm

Issue 2028823003: Mac: Make ScopedTypeRef require explicit constructors (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove dependency Created 4 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/toolbar/toolbar_button_cocoa.mm
diff --git a/chrome/browser/ui/cocoa/toolbar/toolbar_button_cocoa.mm b/chrome/browser/ui/cocoa/toolbar/toolbar_button_cocoa.mm
index ddf3b6105337a6ef2b3b950614298d2db7c5ce45..b5c54fafd59adbccfd1223c35bc5f9573f2be763 100644
--- a/chrome/browser/ui/cocoa/toolbar/toolbar_button_cocoa.mm
+++ b/chrome/browser/ui/cocoa/toolbar/toolbar_button_cocoa.mm
@@ -231,10 +231,10 @@ - (SkColor)vectorIconColor:(BOOL)themeIsDark {
- (NSImage*)browserToolsIconForFillColor:(SkColor)fillColor {
// Create a |BrowserToolsImageRep| to draw the browser tools icon using
// the provided fill color.
- base::scoped_nsobject<BrowserToolsImageRep> imageRep =
- [[BrowserToolsImageRep alloc]
- initWithDrawSelector:@selector(drawBrowserToolsIcon:)
- delegate:[BrowserToolsImageRep class]];
+ base::scoped_nsobject<BrowserToolsImageRep> imageRep(
+ [[BrowserToolsImageRep alloc]
+ initWithDrawSelector:@selector(drawBrowserToolsIcon:)
+ delegate:[BrowserToolsImageRep class]]);
if (!ui::MaterialDesignController::IsModeMaterial()) {
[imageRep setFillColor:skia::SkColorToCalibratedNSColor(fillColor)];
} else {
@@ -254,10 +254,10 @@ - (NSImage*)imageForIcon:(NSImage*)iconImage
withBackgroundStyle:(ToolbarButtonImageBackgroundStyle)style {
// Create a |ToolbarButtonImageRep| to draw the button image using
// the provided icon and background style.
- base::scoped_nsobject<ToolbarButtonImageRep> imageRep =
+ base::scoped_nsobject<ToolbarButtonImageRep> imageRep(
[[ToolbarButtonImageRep alloc]
initWithDrawSelector:@selector(drawImage:)
- delegate:[ToolbarButtonImageRep class]];
+ delegate:[ToolbarButtonImageRep class]]);
[imageRep setIcon:iconImage];
[imageRep setStyle:style];
« no previous file with comments | « chrome/browser/ui/cocoa/tabs/tab_view.mm ('k') | components/bookmarks/browser/bookmark_pasteboard_helper_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698