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

Side by Side Diff: third_party/WebKit/Source/platform/Language.cpp

Issue 2846303002: Replace ASSERT with DCHECK in platform/ (Closed)
Patch Set: rebase Created 3 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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2010, 2013 Apple Inc. All rights reserved. 2 * Copyright (C) 2010, 2013 Apple 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 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 24 matching lines...) Expand all
35 // Platform::defaultLocale() might provide a language code with '_'. 35 // Platform::defaultLocale() might provide a language code with '_'.
36 copied_code.Replace('_', '-'); 36 copied_code.Replace('_', '-');
37 return copied_code; 37 return copied_code;
38 } 38 }
39 39
40 static const AtomicString& PlatformLanguage() { 40 static const AtomicString& PlatformLanguage() {
41 DEFINE_STATIC_LOCAL(AtomicString, computed_default_language, ()); 41 DEFINE_STATIC_LOCAL(AtomicString, computed_default_language, ());
42 if (computed_default_language.IsEmpty()) { 42 if (computed_default_language.IsEmpty()) {
43 computed_default_language = AtomicString( 43 computed_default_language = AtomicString(
44 CanonicalizeLanguageIdentifier(Platform::Current()->DefaultLocale())); 44 CanonicalizeLanguageIdentifier(Platform::Current()->DefaultLocale()));
45 ASSERT(!computed_default_language.IsEmpty()); 45 DCHECK(!computed_default_language.IsEmpty());
46 } 46 }
47 return computed_default_language; 47 return computed_default_language;
48 } 48 }
49 49
50 static Vector<AtomicString>& PreferredLanguagesOverride() { 50 static Vector<AtomicString>& PreferredLanguagesOverride() {
51 DEFINE_STATIC_LOCAL(Vector<AtomicString>, override, ()); 51 DEFINE_STATIC_LOCAL(Vector<AtomicString>, override, ());
52 return override; 52 return override;
53 } 53 }
54 54
55 void OverrideUserPreferredLanguages(const Vector<AtomicString>& override) { 55 void OverrideUserPreferredLanguages(const Vector<AtomicString>& override) {
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
121 if (language_without_locale_match.length()) 121 if (language_without_locale_match.length())
122 return language_without_locale_match_index; 122 return language_without_locale_match_index;
123 123
124 if (language_match_but_not_locale.length()) 124 if (language_match_but_not_locale.length())
125 return language_match_but_not_locale_match_index; 125 return language_match_but_not_locale_match_index;
126 126
127 return language_list.size(); 127 return language_list.size();
128 } 128 }
129 129
130 } // namespace blink 130 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698