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

Side by Side Diff: ui/base/l10n/l10n_util.cc

Issue 7717017: Revert "Switch to using .pak files for locale data on Windows." (r97941) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome_frame/chrome_frame.gyp ('k') | ui/base/resource/resource_bundle.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ui/base/l10n/l10n_util.h" 5 #include "ui/base/l10n/l10n_util.h"
6 6
7 #if defined(TOOLKIT_USES_GTK) 7 #if defined(TOOLKIT_USES_GTK)
8 #include <glib/gutils.h> 8 #include <glib/gutils.h>
9 #endif 9 #endif
10 10
(...skipping 18 matching lines...) Expand all
29 #include "ui/base/ui_base_paths.h" 29 #include "ui/base/ui_base_paths.h"
30 #include "unicode/rbbi.h" 30 #include "unicode/rbbi.h"
31 #include "unicode/uloc.h" 31 #include "unicode/uloc.h"
32 32
33 #if defined(OS_WIN) 33 #if defined(OS_WIN)
34 #include "ui/base/l10n/l10n_util_win.h" 34 #include "ui/base/l10n/l10n_util_win.h"
35 #endif // OS_WIN 35 #endif // OS_WIN
36 36
37 namespace { 37 namespace {
38 38
39 static const FilePath::CharType kLocaleFileExtension[] = 39 #if defined(OS_WIN)
40 FILE_PATH_LITERAL(".pak"); 40 static const FilePath::CharType kLocaleFileExtension[] = L".dll";
41 #elif defined(OS_POSIX)
42 static const FilePath::CharType kLocaleFileExtension[] = ".pak";
43 #endif
41 44
42 static const char* const kAcceptLanguageList[] = { 45 static const char* const kAcceptLanguageList[] = {
43 "af", // Afrikaans 46 "af", // Afrikaans
44 "am", // Amharic 47 "am", // Amharic
45 "ar", // Arabic 48 "ar", // Arabic
46 "az", // Azerbaijani 49 "az", // Azerbaijani
47 "be", // Belarusian 50 "be", // Belarusian
48 "bg", // Bulgarian 51 "bg", // Bulgarian
49 "bh", // Bihari 52 "bh", // Bihari
50 "bn", // Bengali 53 "bn", // Bengali
(...skipping 757 matching lines...) Expand 10 before | Expand all | Expand 10 after
808 for (size_t i = 0; i < arraysize(kAcceptLanguageList); ++i) { 811 for (size_t i = 0; i < arraysize(kAcceptLanguageList); ++i) {
809 if (!IsLocaleNameTranslated(kAcceptLanguageList[i], display_locale)) 812 if (!IsLocaleNameTranslated(kAcceptLanguageList[i], display_locale))
810 // TODO(jungshik) : Put them at the of the list with language codes 813 // TODO(jungshik) : Put them at the of the list with language codes
811 // enclosed by brackets instead of skipping. 814 // enclosed by brackets instead of skipping.
812 continue; 815 continue;
813 locale_codes->push_back(kAcceptLanguageList[i]); 816 locale_codes->push_back(kAcceptLanguageList[i]);
814 } 817 }
815 } 818 }
816 819
817 } // namespace l10n_util 820 } // namespace l10n_util
OLDNEW
« no previous file with comments | « chrome_frame/chrome_frame.gyp ('k') | ui/base/resource/resource_bundle.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698