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

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

Issue 6312156: Change includes of gfx/* to ui/gfx/* (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 10 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 | « ui/base/l10n/l10n_font_util.cc ('k') | ui/base/models/menu_model.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
11 #include <algorithm> 11 #include <algorithm>
12 #include <cstdlib> 12 #include <cstdlib>
13 #include <iterator> 13 #include <iterator>
14 14
15 #include "base/command_line.h" 15 #include "base/command_line.h"
16 #include "base/file_util.h" 16 #include "base/file_util.h"
17 #include "base/i18n/file_util_icu.h" 17 #include "base/i18n/file_util_icu.h"
18 #include "base/i18n/rtl.h" 18 #include "base/i18n/rtl.h"
19 #include "base/path_service.h" 19 #include "base/path_service.h"
20 #include "base/scoped_ptr.h" 20 #include "base/scoped_ptr.h"
21 #include "base/string16.h" 21 #include "base/string16.h"
22 #include "base/string_number_conversions.h" 22 #include "base/string_number_conversions.h"
23 #include "base/string_split.h" 23 #include "base/string_split.h"
24 #include "base/sys_string_conversions.h" 24 #include "base/sys_string_conversions.h"
25 #include "base/utf_string_conversions.h" 25 #include "base/utf_string_conversions.h"
26 #include "build/build_config.h" 26 #include "build/build_config.h"
27 #include "gfx/canvas.h"
28 #include "ui/base/l10n/l10n_util_collator.h" 27 #include "ui/base/l10n/l10n_util_collator.h"
29 #include "ui/base/resource/resource_bundle.h" 28 #include "ui/base/resource/resource_bundle.h"
30 #include "ui/base/ui_base_paths.h" 29 #include "ui/base/ui_base_paths.h"
30 #include "ui/gfx/canvas.h"
31 #include "unicode/rbbi.h" 31 #include "unicode/rbbi.h"
32 #include "unicode/uloc.h" 32 #include "unicode/uloc.h"
33 33
34 #if defined(OS_MACOSX) 34 #if defined(OS_MACOSX)
35 #include "ui/base/l10n/l10n_util_mac.h" 35 #include "ui/base/l10n/l10n_util_mac.h"
36 #elif defined(OS_WIN) 36 #elif defined(OS_WIN)
37 #include "ui/base/l10n/l10n_util_win.h" 37 #include "ui/base/l10n/l10n_util_win.h"
38 #endif 38 #endif
39 39
40 namespace { 40 namespace {
(...skipping 826 matching lines...) Expand 10 before | Expand all | Expand 10 after
867 for (size_t i = 0; i < arraysize(kAcceptLanguageList); ++i) { 867 for (size_t i = 0; i < arraysize(kAcceptLanguageList); ++i) {
868 if (!IsLocaleNameTranslated(kAcceptLanguageList[i], display_locale)) 868 if (!IsLocaleNameTranslated(kAcceptLanguageList[i], display_locale))
869 // TODO(jungshik) : Put them at the of the list with language codes 869 // TODO(jungshik) : Put them at the of the list with language codes
870 // enclosed by brackets instead of skipping. 870 // enclosed by brackets instead of skipping.
871 continue; 871 continue;
872 locale_codes->push_back(kAcceptLanguageList[i]); 872 locale_codes->push_back(kAcceptLanguageList[i]);
873 } 873 }
874 } 874 }
875 875
876 } // namespace l10n_util 876 } // namespace l10n_util
OLDNEW
« no previous file with comments | « ui/base/l10n/l10n_font_util.cc ('k') | ui/base/models/menu_model.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698