summaryrefslogtreecommitdiffstats
path: root/app/text_elider.cc
diff options
context:
space:
mode:
authorben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-20 06:37:01 +0000
committerben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-20 06:37:01 +0000
commit7cf1b6ced3b14cce1d66ca0ddc713851f0d37536 (patch)
tree1c2fc9f4d52bf3046addf820d5eec03a2e150749 /app/text_elider.cc
parentf9f4841b14a9f309ce5ee613f0d4de6afad88767 (diff)
downloadchromium_src-7cf1b6ced3b14cce1d66ca0ddc713851f0d37536.zip
chromium_src-7cf1b6ced3b14cce1d66ca0ddc713851f0d37536.tar.gz
chromium_src-7cf1b6ced3b14cce1d66ca0ddc713851f0d37536.tar.bz2
Move RTL related functions from app/l10n_util to base/i18n/rtl
TBR=darin BUG=none TEST=none Review URL: http://codereview.chromium.org/1073005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@42182 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'app/text_elider.cc')
-rw-r--r--app/text_elider.cc9
1 files changed, 5 insertions, 4 deletions
diff --git a/app/text_elider.cc b/app/text_elider.cc
index 21d5201..98b9090 100644
--- a/app/text_elider.cc
+++ b/app/text_elider.cc
@@ -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 @@ std::wstring ElideFilename(const FilePath& filename,
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 @@ std::wstring ElideFilename(const FilePath& filename,
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 @@ std::wstring ElideFilename(const FilePath& filename,
// 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