diff options
| author | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-25 20:38:53 +0000 |
|---|---|---|
| committer | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-25 20:38:53 +0000 |
| commit | 8891d14891423a0bf861fb6cb8a88cc2b0b11d8e (patch) | |
| tree | 286765dee398d8ef885c8895a06834063b53cdee /chrome/browser/views | |
| parent | cb34b251707323165c85b7079467e9a03c65af8e (diff) | |
| download | chromium_src-8891d14891423a0bf861fb6cb8a88cc2b0b11d8e.zip chromium_src-8891d14891423a0bf861fb6cb8a88cc2b0b11d8e.tar.gz chromium_src-8891d14891423a0bf861fb6cb8a88cc2b0b11d8e.tar.bz2 | |
remove ICU includes from l10n_util.h
95% of users of l10n_util use it for some functions; the other 5%
want some complicated templates that pull in a ton of ICU headers
as well.
Before this change, the average includer of l10n_util.h pulled in
an additional 80 subheaders because of it.
Additionally, #including ICU headers from a header makes the includee
depend on having the ICU include path in the -I header.
Review URL: http://codereview.chromium.org/515059
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@37032 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/views')
| -rwxr-xr-x | chrome/browser/views/about_chrome_view.cc | 3 | ||||
| -rw-r--r-- | chrome/browser/views/autocomplete/autocomplete_popup_contents_view.cc | 3 | ||||
| -rw-r--r-- | chrome/browser/views/options/fonts_page_view.cc | 1 |
3 files changed, 5 insertions, 2 deletions
diff --git a/chrome/browser/views/about_chrome_view.cc b/chrome/browser/views/about_chrome_view.cc index 42936a3..36971a4 100755 --- a/chrome/browser/views/about_chrome_view.cc +++ b/chrome/browser/views/about_chrome_view.cc @@ -4,6 +4,7 @@ #include "chrome/browser/views/about_chrome_view.h" +#include "app/bidi_line_iterator.h" #include "app/gfx/canvas.h" #include "app/gfx/color_utils.h" #include "base/i18n/word_iterator.h" @@ -496,7 +497,7 @@ void AboutChromeView::DrawTextAndPositionUrl(gfx::Canvas* canvas, // (a run is a sequence of words that share the same directionality). We // initialize a bidirectional ICU line iterator and split the text into runs // that are either strictly LTR or strictly RTL (and do not contain a mix). - l10n_util::BiDiLineIterator bidi_line; + BiDiLineIterator bidi_line; if (!bidi_line.Open(text.c_str(), true, false)) return; diff --git a/chrome/browser/views/autocomplete/autocomplete_popup_contents_view.cc b/chrome/browser/views/autocomplete/autocomplete_popup_contents_view.cc index 9f0097e..006f23d 100644 --- a/chrome/browser/views/autocomplete/autocomplete_popup_contents_view.cc +++ b/chrome/browser/views/autocomplete/autocomplete_popup_contents_view.cc @@ -4,6 +4,7 @@ #include "chrome/browser/views/autocomplete/autocomplete_popup_contents_view.h" +#include "app/bidi_line_iterator.h" #include "app/gfx/canvas.h" #include "app/gfx/color_utils.h" #include "app/gfx/insets.h" @@ -469,7 +470,7 @@ int AutocompleteResultView::DrawString( // Initialize a bidirectional line iterator of ICU and split the text into // visual runs. (A visual run is consecutive characters which have the same // display direction and should be displayed at once.) - l10n_util::BiDiLineIterator bidi_line; + BiDiLineIterator bidi_line; if (!bidi_line.Open(text, mirroring_context_->mirrored(), false)) return x; const int runs = bidi_line.CountRuns(); diff --git a/chrome/browser/views/options/fonts_page_view.cc b/chrome/browser/views/options/fonts_page_view.cc index 17aadae7..a24458d 100644 --- a/chrome/browser/views/options/fonts_page_view.cc +++ b/chrome/browser/views/options/fonts_page_view.cc @@ -16,6 +16,7 @@ #include "app/gfx/font.h" #include "app/gfx/native_theme_win.h" #include "app/l10n_util.h" +#include "app/l10n_util_collator.h" #include "app/resource_bundle.h" #include "base/file_util.h" #include "base/string_util.h" |