| Index: chrome/browser/bookmarks/bookmark_model.cc
|
| ===================================================================
|
| --- chrome/browser/bookmarks/bookmark_model.cc (revision 23559)
|
| +++ chrome/browser/bookmarks/bookmark_model.cc (working copy)
|
| @@ -83,7 +83,7 @@
|
| const BookmarkNode*,
|
| bool> {
|
| public:
|
| - explicit SortComparator(Collator* collator) : collator_(collator) { }
|
| + explicit SortComparator(icu::Collator* collator) : collator_(collator) { }
|
|
|
| // Returns true if lhs preceeds rhs.
|
| bool operator() (const BookmarkNode* n1, const BookmarkNode* n2) {
|
| @@ -99,7 +99,7 @@
|
| }
|
|
|
| private:
|
| - Collator* collator_;
|
| + icu::Collator* collator_;
|
| };
|
|
|
| } // namespace
|
| @@ -343,9 +343,9 @@
|
| }
|
|
|
| UErrorCode error = U_ZERO_ERROR;
|
| - scoped_ptr<Collator> collator(
|
| - Collator::createInstance(
|
| - Locale(g_browser_process->GetApplicationLocale().c_str()),
|
| + scoped_ptr<icu::Collator> collator(
|
| + icu::Collator::createInstance(
|
| + icu::Locale(g_browser_process->GetApplicationLocale().c_str()),
|
| error));
|
| if (U_FAILURE(error))
|
| collator.reset(NULL);
|
|
|