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

Unified Diff: Source/wtf/unicode/icu/CollatorICU.cpp

Issue 15091005: Remove support for Mac OS X Leopard (10.5) (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Remove support for Mac OS X Laopard (10.5) Created 7 years, 7 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 | « Source/wtf/ThreadingPthreads.cpp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/wtf/unicode/icu/CollatorICU.cpp
diff --git a/Source/wtf/unicode/icu/CollatorICU.cpp b/Source/wtf/unicode/icu/CollatorICU.cpp
index 12b36b6072224aca94bff9470fa590ae6b85541c..ab950cdbcc8bdae844fb62f0f01e4f835de1e5d7 100644
--- a/Source/wtf/unicode/icu/CollatorICU.cpp
+++ b/Source/wtf/unicode/icu/CollatorICU.cpp
@@ -62,13 +62,8 @@ PassOwnPtr<Collator> Collator::userDefault()
{
#if OS(DARWIN) && USE(CF)
// Mac OS X doesn't set UNIX locale to match user-selected one, so ICU default doesn't work.
-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1060
RetainPtr<CFLocaleRef> currentLocale(AdoptCF, CFLocaleCopyCurrent());
CFStringRef collationOrder = (CFStringRef)CFLocaleGetValue(currentLocale.get(), kCFLocaleCollatorIdentifier);
-#else
- RetainPtr<CFStringRef> collationOrderRetainer(AdoptCF, (CFStringRef)CFPreferencesCopyValue(CFSTR("AppleCollationOrder"), kCFPreferencesAnyApplication, kCFPreferencesCurrentUser, kCFPreferencesAnyHost));
- CFStringRef collationOrder = collationOrderRetainer.get();
-#endif
char buf[256];
if (!collationOrder)
return adoptPtr(new Collator(""));
« no previous file with comments | « Source/wtf/ThreadingPthreads.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698