| Index: app/text_elider.cc
|
| ===================================================================
|
| --- app/text_elider.cc (revision 42180)
|
| +++ app/text_elider.cc (working copy)
|
| @@ -8,6 +8,7 @@
|
| #include "app/text_elider.h"
|
| #include "app/l10n_util.h"
|
| #include "base/file_path.h"
|
| +#include "base/i18n/rtl.h"
|
| #include "base/string_util.h"
|
| #include "base/sys_string_conversions.h"
|
| #include "base/utf_string_conversions.h"
|
| @@ -263,7 +264,7 @@
|
| int full_width = font.GetStringWidth(filename.ToWStringHack());
|
| if (full_width <= available_pixel_width) {
|
| std::wstring elided_name = filename.ToWStringHack();
|
| - return l10n_util::GetDisplayStringInLTRDirectionality(&elided_name);
|
| + return base::i18n::GetDisplayStringInLTRDirectionality(&elided_name);
|
| }
|
|
|
| #if defined(OS_WIN)
|
| @@ -277,7 +278,7 @@
|
| if (rootname.empty() || extension.empty()) {
|
| std::wstring elided_name = ElideText(filename.ToWStringHack(), font,
|
| available_pixel_width);
|
| - return l10n_util::GetDisplayStringInLTRDirectionality(&elided_name);
|
| + return base::i18n::GetDisplayStringInLTRDirectionality(&elided_name);
|
| }
|
|
|
| int ext_width = font.GetStringWidth(extension);
|
| @@ -286,13 +287,13 @@
|
| // We may have trimmed the path.
|
| if (root_width + ext_width <= available_pixel_width) {
|
| std::wstring elided_name = rootname + extension;
|
| - return l10n_util::GetDisplayStringInLTRDirectionality(&elided_name);
|
| + return base::i18n::GetDisplayStringInLTRDirectionality(&elided_name);
|
| }
|
|
|
| int available_root_width = available_pixel_width - ext_width;
|
| std::wstring elided_name = ElideText(rootname, font, available_root_width);
|
| elided_name += extension;
|
| - return l10n_util::GetDisplayStringInLTRDirectionality(&elided_name);
|
| + return base::i18n::GetDisplayStringInLTRDirectionality(&elided_name);
|
| }
|
|
|
| // This function adds an ellipsis at the end of the text if the text
|
|
|