Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2026)

Unified Diff: app/table_model.cc

Issue 171012: Use 'icu::' namespace explicitly (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « app/table_model.h ('k') | base/file_util_icu.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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();
« no previous file with comments | « app/table_model.h ('k') | base/file_util_icu.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698