| Index: chrome/browser/cocoa/bookmark_bar_controller.mm
|
| diff --git a/chrome/browser/cocoa/bookmark_bar_controller.mm b/chrome/browser/cocoa/bookmark_bar_controller.mm
|
| index 3214a67cf22170ccad743ef1e24264b0ff239d52..14fdecb0740790d135d35233626330b365ea89a2 100644
|
| --- a/chrome/browser/cocoa/bookmark_bar_controller.mm
|
| +++ b/chrome/browser/cocoa/bookmark_bar_controller.mm
|
| @@ -984,7 +984,7 @@ const NSTimeInterval kBookmarkBarAnimationDuration = 0.12;
|
| // Add a tooltip
|
| std::string url_string = child->GetURL().possibly_invalid_spec();
|
| NSString* tooltip = [NSString stringWithFormat:@"%@\n%s",
|
| - base::SysWideToNSString(child->GetTitle()),
|
| + base::SysUTF16ToNSString(child->GetTitleAsString16()),
|
| url_string.c_str()];
|
| [item setToolTip:tooltip];
|
| }
|
| @@ -1013,7 +1013,7 @@ const NSTimeInterval kBookmarkBarAnimationDuration = 0.12;
|
| - (NSMenu *)menuForFolderNode:(const BookmarkNode*)node {
|
| if (!node->is_folder())
|
| return nil;
|
| - NSString* title = base::SysWideToNSString(node->GetTitle());
|
| + NSString* title = base::SysUTF16ToNSString(node->GetTitleAsString16());
|
| NSMenu* menu = [[[NSMenu alloc] initWithTitle:title] autorelease];
|
| [self addFolderNode:node toMenu:menu];
|
|
|
| @@ -1105,7 +1105,7 @@ const NSTimeInterval kBookmarkBarAnimationDuration = 0.12;
|
| [button setTarget:self];
|
| [button setAction:@selector(openBookmark:)];
|
| // Add a tooltip.
|
| - NSString* title = base::SysWideToNSString(node->GetTitle());
|
| + NSString* title = base::SysUTF16ToNSString(node->GetTitleAsString16());
|
| std::string url_string = node->GetURL().possibly_invalid_spec();
|
| NSString* tooltip = [NSString stringWithFormat:@"%@\n%s", title,
|
| url_string.c_str()];
|
|
|