summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authortony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-18 17:35:12 +0000
committertony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-18 17:35:12 +0000
commit22b28c134e75d3f48479a42531f07776fd466d0f (patch)
tree84376af62d5b8ec1ba457b927658034e767ec6b7 /chrome
parentb1357f5d438d1ee75973684e0bbd9445907c19aa (diff)
downloadchromium_src-22b28c134e75d3f48479a42531f07776fd466d0f.zip
chromium_src-22b28c134e75d3f48479a42531f07776fd466d0f.tar.gz
chromium_src-22b28c134e75d3f48479a42531f07776fd466d0f.tar.bz2
Some wstring -> string16 conversion in src/app.
It looks like l10n_util_dummy.cc isn't needed anymore: The function in the file doesn't match any functions in l10n_util.h. Convert BidiLineIterator to use string16. I don't see any unittests for this file. :( BUG=23581 TEST=None Review URL: http://codereview.chromium.org/6315002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@71667 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/browser/ui/views/autocomplete/autocomplete_popup_contents_view.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/ui/views/autocomplete/autocomplete_popup_contents_view.cc b/chrome/browser/ui/views/autocomplete/autocomplete_popup_contents_view.cc
index 6e4360e..2febb5a 100644
--- a/chrome/browser/ui/views/autocomplete/autocomplete_popup_contents_view.cc
+++ b/chrome/browser/ui/views/autocomplete/autocomplete_popup_contents_view.cc
@@ -559,7 +559,7 @@ int AutocompleteResultView::DrawString(
// unintended ways, e.g. by removing directional markings or by adding an
// ellipsis that's not enclosed in appropriate markings.
BiDiLineIterator bidi_line;
- if (!bidi_line.Open(text, base::i18n::IsRTL(), is_url))
+ if (!bidi_line.Open(WideToUTF16Hack(text), base::i18n::IsRTL(), is_url))
return x;
const int num_runs = bidi_line.CountRuns();
Runs runs;