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

Unified Diff: chrome/browser/cocoa/bookmark_menu_cocoa_controller.mm

Issue 3113028: Remove wstrings from bookmarks, part 8. (Closed)
Patch Set: Created 10 years, 4 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/cocoa/bookmark_menu_cocoa_controller.mm
diff --git a/chrome/browser/cocoa/bookmark_menu_cocoa_controller.mm b/chrome/browser/cocoa/bookmark_menu_cocoa_controller.mm
index adae210c114367ee9ae798e6022893cdfa4fb781..0acbc4bf5eda9959794a8d9cf2e866930777202e 100644
--- a/chrome/browser/cocoa/bookmark_menu_cocoa_controller.mm
+++ b/chrome/browser/cocoa/bookmark_menu_cocoa_controller.mm
@@ -6,6 +6,7 @@
#include "app/text_elider.h"
#include "base/sys_string_conversions.h"
+#include "base/utf_string_conversions.h"
#include "chrome/app/chrome_dll_resource.h" // IDC_BOOKMARK_MENU
#import "chrome/browser/app_controller_mac.h"
#include "chrome/browser/bookmarks/bookmark_model.h"
@@ -30,7 +31,8 @@ const NSUInteger kMaximumMenuPixelsWide = 300;
NSFont* nsfont = [NSFont menuBarFontOfSize:0]; // 0 means "default"
gfx::Font font(base::SysNSStringToWide([nsfont fontName]),
static_cast<int>([nsfont pointSize]));
- std::wstring title = gfx::ElideText(node->GetTitle(),
+ std::wstring title = gfx::ElideText(UTF16ToWideHack(
+ node->GetTitleAsString16()),
font,
kMaximumMenuPixelsWide,
false);
« no previous file with comments | « chrome/browser/cocoa/bookmark_menu_bridge.mm ('k') | chrome/browser/cocoa/bookmark_name_folder_controller.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698