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

Unified Diff: chrome/browser/bookmarks/bookmark_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 | « base/time_format.cc ('k') | chrome/browser/history/snippet.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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);
« no previous file with comments | « base/time_format.cc ('k') | chrome/browser/history/snippet.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698