diff options
| author | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-21 22:02:55 +0000 |
|---|---|---|
| committer | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-21 22:02:55 +0000 |
| commit | d6b671d0968013c3205c50ebaf45f356e34a58c5 (patch) | |
| tree | 52b215053c36e30e97de5ff97edb309700735ef0 /chrome/browser/autocomplete | |
| parent | c5af1c1af7e02b4998b085d29ecf8249f679e50a (diff) | |
| download | chromium_src-d6b671d0968013c3205c50ebaf45f356e34a58c5.zip chromium_src-d6b671d0968013c3205c50ebaf45f356e34a58c5.tar.gz chromium_src-d6b671d0968013c3205c50ebaf45f356e34a58c5.tar.bz2 | |
Convert gfx::ElideText from using wstrings to string16.
BUG=23581
Review URL: http://codereview.chromium.org/3885003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@63433 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/autocomplete')
| -rw-r--r-- | chrome/browser/autocomplete/autocomplete_popup_view_mac.mm | 4 | ||||
| -rw-r--r-- | chrome/browser/autocomplete/autocomplete_popup_view_mac_unittest.mm | 7 |
2 files changed, 8 insertions, 3 deletions
diff --git a/chrome/browser/autocomplete/autocomplete_popup_view_mac.mm b/chrome/browser/autocomplete/autocomplete_popup_view_mac.mm index 56b1854..1e4f42f 100644 --- a/chrome/browser/autocomplete/autocomplete_popup_view_mac.mm +++ b/chrome/browser/autocomplete/autocomplete_popup_view_mac.mm @@ -10,6 +10,7 @@ #include "app/text_elider.h" #include "base/stl_util-inl.h" #include "base/sys_string_conversions.h" +#include "base/utf_string_conversions.h" #include "chrome/browser/autocomplete/autocomplete_edit.h" #include "chrome/browser/autocomplete/autocomplete_edit_view_mac.h" #include "chrome/browser/autocomplete/autocomplete_popup_model.h" @@ -154,7 +155,8 @@ NSMutableAttributedString* AutocompletePopupViewMac::ElideString( } // If ElideText() decides to do nothing, nothing to be done. - const std::wstring elided(ElideText(originalString, font, width, false)); + const std::wstring elided(UTF16ToWideHack(ElideText( + WideToUTF16Hack(originalString), font, width, false))); if (0 == elided.compare(originalString)) { return aString; } diff --git a/chrome/browser/autocomplete/autocomplete_popup_view_mac_unittest.mm b/chrome/browser/autocomplete/autocomplete_popup_view_mac_unittest.mm index 3ad4b33..82d30e8 100644 --- a/chrome/browser/autocomplete/autocomplete_popup_view_mac_unittest.mm +++ b/chrome/browser/autocomplete/autocomplete_popup_view_mac_unittest.mm @@ -7,6 +7,7 @@ #include "app/text_elider.h" #include "base/scoped_ptr.h" #include "base/sys_string_conversions.h" +#include "base/utf_string_conversions.h" #include "chrome/browser/autocomplete/autocomplete.h" #include "testing/platform_test.h" @@ -460,14 +461,16 @@ TEST_F(AutocompletePopupViewMacTest, ElideString) { // When elided, result is the same as ElideText(). ret = AutocompletePopupViewMac::ElideString(as, wideContents, font_, kNarrow); - std::wstring elided(ElideText(wideContents, font_, kNarrow, false)); + std::wstring elided(UTF16ToWideHack(ElideText(WideToUTF16Hack( + wideContents), font_, kNarrow, false))); EXPECT_TRUE(ret == as); EXPECT_FALSE([[as string] isEqualToString:contents]); EXPECT_TRUE([[as string] isEqualToString:base::SysWideToNSString(elided)]); // When elided, result is the same as ElideText(). ret = AutocompletePopupViewMac::ElideString(as, wideContents, font_, 0.0); - elided = ElideText(wideContents, font_, 0.0, false); + elided = UTF16ToWideHack(ElideText(WideToUTF16Hack(wideContents), font_, + 0.0, false)); EXPECT_TRUE(ret == as); EXPECT_FALSE([[as string] isEqualToString:contents]); EXPECT_TRUE([[as string] isEqualToString:base::SysWideToNSString(elided)]); |