chrome/browser/ui/cocoa/profile_signin_confirmation_view_controller.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/profile_signin_confirmation_view_controller.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/location_bar/autocomplete_text_field_cell.mm ('K') | « chrome/browser/ui/cocoa/profile_signin_confirmation_view_controller.h ('k') | chrome/browser/ui/cocoa/profile_signin_confirmation_view_controller_browsertest.mm » ('j') | content/browser/gamepad/gamepad_platform_data_fetcher_mac.mm » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/cocoa/profile_signin_confirmation_view_controller.mm

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

index 1aacda3d8a8cd94cf83544af87b9bc4dbfae9e66..367556bb0c72e3d462448863d6f839258425dc62 100644

--- a/chrome/browser/ui/cocoa/profile_signin_confirmation_view_controller.mm

+++ b/chrome/browser/ui/cocoa/profile_signin_confirmation_view_controller.mm

@@ -59,7 +59,7 @@ NSRect ComputeFrame(NSAttributedString* text, CGFloat width, CGFloat height) {

// Make the indicated range of characters in a text view bold.

void MakeTextBold(NSTextField* textField, int offset, int length) {

- scoped_nsobject<NSMutableAttributedString> text(

+ base::scoped_nsobject<NSMutableAttributedString> text(

[[textField attributedStringValue] mutableCopy]);

NSFont* currentFont =

[text attribute:NSFontAttributeName

@@ -96,7 +96,7 @@ NSTextView* AddTextView(

const string16& link,

int offset,

const ui::ResourceBundle::FontStyle& font_style) {

- scoped_nsobject<HyperlinkTextView> textView(

+ base::scoped_nsobject<HyperlinkTextView> textView(

[[HyperlinkTextView alloc] initWithFrame:NSZeroRect]);

NSFont* font = ui::ResourceBundle::GetSharedInstance().GetFont(

font_style).GetNativeFont();