chrome/browser/ui/cocoa/constrained_window/constrained_window_button.mm - Issue 17593006: mac: Update clients of scoped_nsobject.h.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/cocoa/constrained_window/constrained_window_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

« chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_window.mm ('K') | « chrome/browser/ui/cocoa/constrained_window/constrained_window_animation_unittest.mm ('k') | chrome/browser/ui/cocoa/constrained_window/constrained_window_button_unittest.mm » ('j') | chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_cell.mm » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/cocoa/constrained_window/constrained_window_button.mm

diff --git a/chrome/browser/ui/cocoa/constrained_window/constrained_window_button.mm b/chrome/browser/ui/cocoa/constrained_window/constrained_window_button.mm

index fb07d84e51cb6193c3b23af91572c9dbcc84df5c..39e4a3f6e5b3185f0e642638b9fa4b3d0fe7a4d0 100644

--- a/chrome/browser/ui/cocoa/constrained_window/constrained_window_button.mm

+++ b/chrome/browser/ui/cocoa/constrained_window/constrained_window_button.mm

@@ -4,7 +4,7 @@

#import "chrome/browser/ui/cocoa/constrained_window/constrained_window_button.h"

-#include "base/memory/scoped_nsobject.h"

+#include "base/mac/scoped_nsobject.h"

#import "chrome/browser/ui/cocoa/key_equivalent_constants.h"

#include "skia/ext/skia_utils_mac.h"

#import "third_party/molokocacao/NSBezierPath+MCAdditions.h"

@@ -88,13 +88,13 @@ NSAttributedString* GetButtonAttributedString(NSString* title,

const SkColor shadow_color[] =

{0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0xFFFFFFFF};

- scoped_nsobject<NSShadow> shadow([[NSShadow alloc] init]);

+ base::scoped_nsobject<NSShadow> shadow([[NSShadow alloc] init]);

[shadow setShadowColor:

gfx::SkColorToCalibratedNSColor(shadow_color[button_state])];

[shadow setShadowOffset:NSMakeSize(0, -1)];

[shadow setShadowBlurRadius:0];

- scoped_nsobject<NSMutableParagraphStyle> paragraphStyle(

+ base::scoped_nsobject<NSMutableParagraphStyle> paragraphStyle(

[[NSMutableParagraphStyle alloc] init]);

[paragraphStyle setAlignment:NSCenterTextAlignment];