summaryrefslogtreecommitdiffstats
path: root/ui/base/models
diff options
context:
space:
mode:
authorhajimehoshi@chromium.org <hajimehoshi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-04-23 05:06:05 +0000
committerhajimehoshi@chromium.org <hajimehoshi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-04-23 05:06:05 +0000
commit9a08fe84ae32137085e9c2842f344d66bfefc9cb (patch)
treeead7ce7007acc08a7403f8cd7446f8f33ceef3b2 /ui/base/models
parent8e4ee27694a54b6c7a7c6d2935d292d1df3f0e40 (diff)
downloadchromium_src-9a08fe84ae32137085e9c2842f344d66bfefc9cb.zip
chromium_src-9a08fe84ae32137085e9c2842f344d66bfefc9cb.tar.gz
chromium_src-9a08fe84ae32137085e9c2842f344d66bfefc9cb.tar.bz2
Refactoring: Moved the function CompareString16WithCollator from ui/base/l10n to base/i18n. The function LocalAwareCompareFilenames at base/i18n/file_util_icu.cc needed a function to sort string with consideration of a locale, but it couldn't refer ui/base.
BUG=55883 (Indirectly) TEST=Unit tests Review URL: https://chromiumcodereview.appspot.com/14044002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@195711 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/base/models')
-rw-r--r--ui/base/models/table_model.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/ui/base/models/table_model.cc b/ui/base/models/table_model.cc
index f59e7dd..47520f0 100644
--- a/ui/base/models/table_model.cc
+++ b/ui/base/models/table_model.cc
@@ -4,9 +4,9 @@
#include "ui/base/models/table_model.h"
+#include "base/i18n/string_compare.h"
#include "base/logging.h"
#include "ui/base/l10n/l10n_util.h"
-#include "ui/base/l10n/l10n_util_collator.h"
#include "ui/gfx/image/image_skia.h"
namespace ui {
@@ -76,7 +76,7 @@ int TableModel::CompareValues(int row1, int row2, int column_id) {
icu::Collator* collator = GetCollator();
if (collator)
- return l10n_util::CompareString16WithCollator(collator, value1, value2);
+ return base::i18n::CompareString16WithCollator(collator, value1, value2);
NOTREACHED();
return 0;