diff options
| author | joi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-12 15:16:04 +0000 |
|---|---|---|
| committer | joi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-12 15:16:04 +0000 |
| commit | b22558a183cefa554a1730188a51994504100351 (patch) | |
| tree | 1761e4f23e2e9060ff7bfa5a9026a4937d73e312 /chrome/browser/autocomplete | |
| parent | 3f891cf79f72f4768a15bfae051e08b9211ed8c3 (diff) | |
| download | chromium_src-b22558a183cefa554a1730188a51994504100351.zip chromium_src-b22558a183cefa554a1730188a51994504100351.tar.gz chromium_src-b22558a183cefa554a1730188a51994504100351.tar.bz2 | |
Revert 71167 - Remove wstring from gfx.
BUG=68882
TEST=no visible changes; all tests pass
Review URL: http://codereview.chromium.org/6121004
TBR=avi@chromium.org
Review URL: http://codereview.chromium.org/6134010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@71169 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/autocomplete')
| -rw-r--r-- | chrome/browser/autocomplete/autocomplete_popup_view_mac.mm | 2 | ||||
| -rw-r--r-- | chrome/browser/autocomplete/autocomplete_popup_view_mac_unittest.mm | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/autocomplete/autocomplete_popup_view_mac.mm b/chrome/browser/autocomplete/autocomplete_popup_view_mac.mm index 20a979e..d0b84e7 100644 --- a/chrome/browser/autocomplete/autocomplete_popup_view_mac.mm +++ b/chrome/browser/autocomplete/autocomplete_popup_view_mac.mm @@ -449,7 +449,7 @@ void AutocompletePopupViewMac::UpdatePopupAppearance() { // The popup's font is a slightly smaller version of the field's. NSFont* fieldFont = AutocompleteEditViewMac::GetFieldFont(); const CGFloat resultFontSize = [fieldFont pointSize] + kEditFontAdjust; - gfx::Font resultFont(base::SysNSStringToUTF16([fieldFont fontName]), + gfx::Font resultFont(base::SysNSStringToWide([fieldFont fontName]), static_cast<int>(resultFontSize)); AutocompleteMatrix* matrix = GetAutocompleteMatrix(); diff --git a/chrome/browser/autocomplete/autocomplete_popup_view_mac_unittest.mm b/chrome/browser/autocomplete/autocomplete_popup_view_mac_unittest.mm index 0e1bab7..82d30e8 100644 --- a/chrome/browser/autocomplete/autocomplete_popup_view_mac_unittest.mm +++ b/chrome/browser/autocomplete/autocomplete_popup_view_mac_unittest.mm @@ -27,7 +27,7 @@ class AutocompletePopupViewMacTest : public PlatformTest { color_ = [NSColor blackColor]; dimColor_ = [NSColor darkGrayColor]; font_ = gfx::Font( - base::SysNSStringToUTF16([[NSFont userFontOfSize:12] fontName]), 12); + base::SysNSStringToWide([[NSFont userFontOfSize:12] fontName]), 12); } // Returns the length of the run starting at |location| for which |