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

Side by Side Diff: Source/core/platform/text/mac/LocaleMac.mm

Issue 23464095: WTF::notFound looks too much like a local variable. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 3 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2012 Google Inc. All rights reserved. 2 * Copyright (C) 2012 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
42 42
43 using namespace std; 43 using namespace std;
44 44
45 namespace WebCore { 45 namespace WebCore {
46 46
47 static inline String languageFromLocale(const String& locale) 47 static inline String languageFromLocale(const String& locale)
48 { 48 {
49 String normalizedLocale = locale; 49 String normalizedLocale = locale;
50 normalizedLocale.replace('-', '_'); 50 normalizedLocale.replace('-', '_');
51 size_t separatorPosition = normalizedLocale.find('_'); 51 size_t separatorPosition = normalizedLocale.find('_');
52 if (separatorPosition == notFound) 52 if (separatorPosition == kNotFound)
53 return normalizedLocale; 53 return normalizedLocale;
54 return normalizedLocale.left(separatorPosition); 54 return normalizedLocale.left(separatorPosition);
55 } 55 }
56 56
57 static RetainPtr<NSLocale> determineLocale(const String& locale) 57 static RetainPtr<NSLocale> determineLocale(const String& locale)
58 { 58 {
59 RetainPtr<NSLocale> currentLocale = [NSLocale currentLocale]; 59 RetainPtr<NSLocale> currentLocale = [NSLocale currentLocale];
60 String currentLocaleLanguage = languageFromLocale(String([currentLocale.get( ) localeIdentifier])); 60 String currentLocaleLanguage = languageFromLocale(String([currentLocale.get( ) localeIdentifier]));
61 String localeLanguage = languageFromLocale(locale); 61 String localeLanguage = languageFromLocale(locale);
62 if (equalIgnoringCase(currentLocaleLanguage, localeLanguage)) 62 if (equalIgnoringCase(currentLocaleLanguage, localeLanguage))
(...skipping 260 matching lines...) Expand 10 before | Expand all | Expand 10 after
323 ASSERT(symbols.size() == DecimalSymbolsSize); 323 ASSERT(symbols.size() == DecimalSymbolsSize);
324 324
325 String positivePrefix([formatter.get() positivePrefix]); 325 String positivePrefix([formatter.get() positivePrefix]);
326 String positiveSuffix([formatter.get() positiveSuffix]); 326 String positiveSuffix([formatter.get() positiveSuffix]);
327 String negativePrefix([formatter.get() negativePrefix]); 327 String negativePrefix([formatter.get() negativePrefix]);
328 String negativeSuffix([formatter.get() negativeSuffix]); 328 String negativeSuffix([formatter.get() negativeSuffix]);
329 setLocaleData(symbols, positivePrefix, positiveSuffix, negativePrefix, negat iveSuffix); 329 setLocaleData(symbols, positivePrefix, positiveSuffix, negativePrefix, negat iveSuffix);
330 } 330 }
331 331
332 } 332 }
OLDNEW
« no previous file with comments | « Source/core/platform/text/LocaleToScriptMappingDefault.cpp ('k') | Source/core/platform/text/win/LocaleWin.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698