| Index: app/table_model.cc
|
| ===================================================================
|
| --- app/table_model.cc (revision 23559)
|
| +++ app/table_model.cc (working copy)
|
| @@ -68,7 +68,7 @@
|
| // TableModel -----------------------------------------------------------------
|
|
|
| // Used for sorting.
|
| -static Collator* collator = NULL;
|
| +static icu::Collator* collator = NULL;
|
|
|
| SkBitmap TableModel::GetIcon(int row) {
|
| return SkBitmap();
|
| @@ -79,7 +79,7 @@
|
| row2 >= 0 && row2 < RowCount());
|
| std::wstring value1 = GetText(row1, column_id);
|
| std::wstring value2 = GetText(row2, column_id);
|
| - Collator* collator = GetCollator();
|
| + icu::Collator* collator = GetCollator();
|
|
|
| if (collator)
|
| return l10n_util::CompareStringWithCollator(collator, value1, value2);
|
| @@ -88,10 +88,10 @@
|
| return 0;
|
| }
|
|
|
| -Collator* TableModel::GetCollator() {
|
| +icu::Collator* TableModel::GetCollator() {
|
| if (!collator) {
|
| UErrorCode create_status = U_ZERO_ERROR;
|
| - collator = Collator::createInstance(create_status);
|
| + collator = icu::Collator::createInstance(create_status);
|
| if (!U_SUCCESS(create_status)) {
|
| collator = NULL;
|
| NOTREACHED();
|
|
|