diff options
71 files changed, 127 insertions, 129 deletions
@@ -75,7 +75,7 @@ deps = { "/trunk/deps/third_party/WebKit@76115", "src/third_party/icu": - "/trunk/deps/third_party/icu46@172827", + "/trunk/deps/third_party/icu46@174978", "src/third_party/libexif/sources": "/trunk/deps/third_party/libexif/sources@146817", @@ -598,6 +598,7 @@ include_rules = [ # this should probably change. "+unicode", "+testing", + "+third_party/icu/public", ] diff --git a/ash/system/date/date_view.cc b/ash/system/date/date_view.cc index d35182d..e59b42e 100644 --- a/ash/system/date/date_view.cc +++ b/ash/system/date/date_view.cc @@ -11,14 +11,14 @@ #include "base/time.h" #include "base/utf_string_conversions.h" #include "grit/ash_strings.h" +#include "third_party/icu/public/i18n/unicode/datefmt.h" +#include "third_party/icu/public/i18n/unicode/dtptngen.h" +#include "third_party/icu/public/i18n/unicode/smpdtfmt.h" #include "ui/base/l10n/l10n_util.h" #include "ui/views/controls/label.h" #include "ui/views/layout/box_layout.h" #include "ui/views/layout/grid_layout.h" #include "ui/views/widget/widget.h" -#include "unicode/datefmt.h" -#include "unicode/dtptngen.h" -#include "unicode/smpdtfmt.h" namespace ash { namespace internal { diff --git a/ash/system/date/tray_date.cc b/ash/system/date/tray_date.cc index 0a473c8..6dce15bc 100644 --- a/ash/system/date/tray_date.cc +++ b/ash/system/date/tray_date.cc @@ -19,6 +19,9 @@ #include "base/utf_string_conversions.h" #include "grit/ash_resources.h" #include "grit/ash_strings.h" +#include "third_party/icu/public/i18n/unicode/datefmt.h" +#include "third_party/icu/public/i18n/unicode/fieldpos.h" +#include "third_party/icu/public/i18n/unicode/fmtable.h" #include "third_party/skia/include/core/SkRect.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" @@ -34,9 +37,6 @@ #include "ui/views/painter.h" #include "ui/views/view.h" #include "ui/views/widget/widget.h" -#include "unicode/datefmt.h" -#include "unicode/fieldpos.h" -#include "unicode/fmtable.h" namespace { diff --git a/ash/system/power/tray_power.cc b/ash/system/power/tray_power.cc index 78cf952..5a3fe25 100644 --- a/ash/system/power/tray_power.cc +++ b/ash/system/power/tray_power.cc @@ -20,6 +20,8 @@ #include "base/utf_string_conversions.h" #include "grit/ash_resources.h" #include "grit/ash_strings.h" +#include "third_party/icu/public/i18n/unicode/fieldpos.h" +#include "third_party/icu/public/i18n/unicode/fmtable.h" #include "third_party/skia/include/core/SkRect.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" @@ -36,8 +38,6 @@ #include "ui/views/layout/grid_layout.h" #include "ui/views/view.h" #include "ui/views/widget/widget.h" -#include "unicode/fieldpos.h" -#include "unicode/fmtable.h" namespace ash { namespace internal { diff --git a/base/android/locale_utils.cc b/base/android/locale_utils.cc index 60b8f84..49d3441 100644 --- a/base/android/locale_utils.cc +++ b/base/android/locale_utils.cc @@ -10,7 +10,7 @@ #include "base/logging.h" #include "base/string_util.h" #include "jni/LocaleUtils_jni.h" -#include "unicode/uloc.h" +#include "third_party/icu/public/common/unicode/uloc.h" namespace base { namespace android { diff --git a/base/i18n/bidi_line_iterator.h b/base/i18n/bidi_line_iterator.h index c1dc0ca..048ccb2 100644 --- a/base/i18n/bidi_line_iterator.h +++ b/base/i18n/bidi_line_iterator.h @@ -5,11 +5,10 @@ #ifndef BASE_I18N_BIDI_LINE_ITERATOR_H_ #define BASE_I18N_BIDI_LINE_ITERATOR_H_ -#include "unicode/ubidi.h" - #include "base/basictypes.h" #include "base/i18n/base_i18n_export.h" #include "base/string16.h" +#include "third_party/icu/public/common/unicode/ubidi.h" namespace base { namespace i18n { diff --git a/base/i18n/break_iterator.cc b/base/i18n/break_iterator.cc index 15451e2..c4ea52c 100644 --- a/base/i18n/break_iterator.cc +++ b/base/i18n/break_iterator.cc @@ -5,9 +5,9 @@ #include "base/i18n/break_iterator.h" #include "base/logging.h" -#include "unicode/ubrk.h" -#include "unicode/uchar.h" -#include "unicode/ustring.h" +#include "third_party/icu/public/common/unicode/ubrk.h" +#include "third_party/icu/public/common/unicode/uchar.h" +#include "third_party/icu/public/common/unicode/ustring.h" namespace base { namespace i18n { diff --git a/base/i18n/case_conversion.cc b/base/i18n/case_conversion.cc index d3b06c9..66edba6 100644 --- a/base/i18n/case_conversion.cc +++ b/base/i18n/case_conversion.cc @@ -5,7 +5,7 @@ #include "base/i18n/case_conversion.h" #include "base/string16.h" -#include "unicode/unistr.h" +#include "third_party/icu/public/common/unicode/unistr.h" namespace base { namespace i18n { diff --git a/base/i18n/char_iterator.cc b/base/i18n/char_iterator.cc index ce4d513..0d5c3de 100644 --- a/base/i18n/char_iterator.cc +++ b/base/i18n/char_iterator.cc @@ -4,8 +4,8 @@ #include "base/i18n/char_iterator.h" -#include "unicode/utf8.h" -#include "unicode/utf16.h" +#include "third_party/icu/public/common/unicode/utf8.h" +#include "third_party/icu/public/common/unicode/utf16.h" namespace base { namespace i18n { diff --git a/base/i18n/file_util_icu.cc b/base/i18n/file_util_icu.cc index f44af10..c542633 100644 --- a/base/i18n/file_util_icu.cc +++ b/base/i18n/file_util_icu.cc @@ -15,8 +15,8 @@ #include "base/utf_string_conversions.h" #include "base/sys_string_conversions.h" #include "build/build_config.h" -#include "unicode/coll.h" -#include "unicode/uniset.h" +#include "third_party/icu/public/common/unicode/uniset.h" +#include "third_party/icu/public/i18n/unicode/coll.h" namespace { diff --git a/base/i18n/icu_encoding_detection.cc b/base/i18n/icu_encoding_detection.cc index 2081c7a..8914dd7 100644 --- a/base/i18n/icu_encoding_detection.cc +++ b/base/i18n/icu_encoding_detection.cc @@ -7,7 +7,7 @@ #include <set> #include "base/string_util.h" -#include "unicode/ucsdet.h" +#include "third_party/icu/public/i18n/unicode/ucsdet.h" namespace base { diff --git a/base/i18n/icu_string_conversions.cc b/base/i18n/icu_string_conversions.cc index 5ebadf3..5e428c3 100644 --- a/base/i18n/icu_string_conversions.cc +++ b/base/i18n/icu_string_conversions.cc @@ -11,11 +11,11 @@ #include "base/memory/scoped_ptr.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" -#include "unicode/ucnv.h" -#include "unicode/ucnv_cb.h" -#include "unicode/ucnv_err.h" -#include "unicode/unorm.h" -#include "unicode/ustring.h" +#include "third_party/icu/public/common/unicode/ucnv.h" +#include "third_party/icu/public/common/unicode/ucnv_cb.h" +#include "third_party/icu/public/common/unicode/ucnv_err.h" +#include "third_party/icu/public/common/unicode/unorm.h" +#include "third_party/icu/public/common/unicode/ustring.h" namespace base { diff --git a/base/i18n/icu_util.cc b/base/i18n/icu_util.cc index 43db690..22d64bc 100644 --- a/base/i18n/icu_util.cc +++ b/base/i18n/icu_util.cc @@ -18,8 +18,8 @@ #include "base/path_service.h" #include "base/string_util.h" #include "base/sys_string_conversions.h" -#include "unicode/putil.h" -#include "unicode/udata.h" +#include "third_party/icu/public/common/unicode/putil.h" +#include "third_party/icu/public/common/unicode/udata.h" #if defined(OS_MACOSX) #include "base/mac/foundation_util.h" diff --git a/base/i18n/number_formatting.cc b/base/i18n/number_formatting.cc index 35ff08d..95eea1b 100644 --- a/base/i18n/number_formatting.cc +++ b/base/i18n/number_formatting.cc @@ -11,8 +11,8 @@ #include "base/stringprintf.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" -#include "unicode/numfmt.h" -#include "unicode/ustring.h" +#include "third_party/icu/public/common/unicode/ustring.h" +#include "third_party/icu/public/i18n/unicode/numfmt.h" namespace base { diff --git a/base/i18n/rtl.cc b/base/i18n/rtl.cc index cbbb63f..d9fa019 100644 --- a/base/i18n/rtl.cc +++ b/base/i18n/rtl.cc @@ -9,10 +9,10 @@ #include "base/string_util.h" #include "base/utf_string_conversions.h" #include "base/sys_string_conversions.h" -#include "unicode/coll.h" -#include "unicode/locid.h" -#include "unicode/uchar.h" -#include "unicode/uscript.h" +#include "third_party/icu/public/common/unicode/locid.h" +#include "third_party/icu/public/common/unicode/uchar.h" +#include "third_party/icu/public/common/unicode/uscript.h" +#include "third_party/icu/public/i18n/unicode/coll.h" #if defined(TOOLKIT_GTK) #include <gtk/gtk.h> diff --git a/base/i18n/rtl_unittest.cc b/base/i18n/rtl_unittest.cc index 829b1ab..53ba971 100644 --- a/base/i18n/rtl_unittest.cc +++ b/base/i18n/rtl_unittest.cc @@ -12,7 +12,7 @@ #include "base/sys_string_conversions.h" #include "testing/gtest/include/gtest/gtest.h" #include "testing/platform_test.h" -#include "unicode/usearch.h" +#include "third_party/icu/public/i18n/unicode/usearch.h" #if defined(TOOLKIT_GTK) #include <gtk/gtk.h> diff --git a/base/i18n/string_search.cc b/base/i18n/string_search.cc index 9dc84cad..f4e53cb 100644 --- a/base/i18n/string_search.cc +++ b/base/i18n/string_search.cc @@ -5,7 +5,7 @@ #include "base/i18n/string_search.h" #include "base/logging.h" -#include "unicode/usearch.h" +#include "third_party/icu/public/i18n/unicode/usearch.h" namespace { diff --git a/base/i18n/string_search_unittest.cc b/base/i18n/string_search_unittest.cc index e6ca1c5..8a4aa78 100644 --- a/base/i18n/string_search_unittest.cc +++ b/base/i18n/string_search_unittest.cc @@ -9,7 +9,7 @@ #include "base/string16.h" #include "base/utf_string_conversions.h" #include "testing/gtest/include/gtest/gtest.h" -#include "unicode/usearch.h" +#include "third_party/icu/public/i18n/unicode/usearch.h" namespace base { namespace i18n { diff --git a/base/i18n/time_formatting.cc b/base/i18n/time_formatting.cc index 9906dba..e60acd1 100644 --- a/base/i18n/time_formatting.cc +++ b/base/i18n/time_formatting.cc @@ -8,9 +8,9 @@ #include "base/memory/scoped_ptr.h" #include "base/utf_string_conversions.h" #include "base/time.h" -#include "unicode/datefmt.h" -#include "unicode/dtptngen.h" -#include "unicode/smpdtfmt.h" +#include "third_party/icu/public/i18n/unicode/datefmt.h" +#include "third_party/icu/public/i18n/unicode/dtptngen.h" +#include "third_party/icu/public/i18n/unicode/smpdtfmt.h" using base::Time; diff --git a/chrome/browser/autofill/autofill_country.cc b/chrome/browser/autofill/autofill_country.cc index e11ab04..7f9f342 100644 --- a/chrome/browser/autofill/autofill_country.cc +++ b/chrome/browser/autofill/autofill_country.cc @@ -18,14 +18,14 @@ #include "content/public/browser/browser_thread.h" #include "content/public/browser/content_browser_client.h" #include "grit/generated_resources.h" +#include "third_party/icu/public/common/unicode/locid.h" +#include "third_party/icu/public/common/unicode/uloc.h" +#include "third_party/icu/public/common/unicode/unistr.h" +#include "third_party/icu/public/common/unicode/urename.h" +#include "third_party/icu/public/common/unicode/utypes.h" +#include "third_party/icu/public/i18n/unicode/coll.h" +#include "third_party/icu/public/i18n/unicode/ucol.h" #include "ui/base/l10n/l10n_util.h" -#include "unicode/coll.h" -#include "unicode/locid.h" -#include "unicode/ucol.h" -#include "unicode/uloc.h" -#include "unicode/unistr.h" -#include "unicode/urename.h" -#include "unicode/utypes.h" using content::BrowserThread; diff --git a/chrome/browser/autofill/autofill_regexes.cc b/chrome/browser/autofill/autofill_regexes.cc index 61b4fa0..be6d83e 100644 --- a/chrome/browser/autofill/autofill_regexes.cc +++ b/chrome/browser/autofill/autofill_regexes.cc @@ -12,7 +12,7 @@ #include "base/memory/singleton.h" #include "base/stl_util.h" #include "base/string16.h" -#include "unicode/regex.h" +#include "third_party/icu/public/i18n/unicode/regex.h" namespace { diff --git a/chrome/browser/autofill/credit_card.cc b/chrome/browser/autofill/credit_card.cc index e78f74e..617a7fa 100644 --- a/chrome/browser/autofill/credit_card.cc +++ b/chrome/browser/autofill/credit_card.cc @@ -24,9 +24,9 @@ #include "chrome/browser/autofill/field_types.h" #include "chrome/common/form_field_data.h" #include "grit/generated_resources.h" +#include "third_party/icu/public/common/unicode/uloc.h" +#include "third_party/icu/public/i18n/unicode/dtfmtsym.h" #include "ui/base/l10n/l10n_util.h" -#include "unicode/dtfmtsym.h" -#include "unicode/uloc.h" namespace { diff --git a/chrome/browser/character_encoding.cc b/chrome/browser/character_encoding.cc index c87b576..c8bdb74 100644 --- a/chrome/browser/character_encoding.cc +++ b/chrome/browser/character_encoding.cc @@ -15,9 +15,9 @@ #include "chrome/app/chrome_command_ids.h" #include "content/public/browser/browser_thread.h" #include "grit/generated_resources.h" +#include "third_party/icu/public/common/unicode/ucnv.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/l10n/l10n_util_collator.h" -#include "unicode/ucnv.h" using content::BrowserThread; diff --git a/chrome/browser/chromeos/cros/cert_library.cc b/chrome/browser/chromeos/cros/cert_library.cc index a5436d3..8257ad0 100644 --- a/chrome/browser/chromeos/cros/cert_library.cc +++ b/chrome/browser/chromeos/cros/cert_library.cc @@ -29,9 +29,9 @@ #include "grit/generated_resources.h" #include "net/base/cert_database.h" #include "net/base/nss_cert_database.h" +#include "third_party/icu/public/i18n/unicode/coll.h" // icu::Collator #include "ui/base/l10n/l10n_util.h" #include "ui/base/l10n/l10n_util_collator.h" -#include "unicode/coll.h" // icu::Collator using content::BrowserThread; diff --git a/chrome/browser/chromeos/input_method/input_method_manager_impl.cc b/chrome/browser/chromeos/input_method/input_method_manager_impl.cc index 2f9a67c..93f086a 100644 --- a/chrome/browser/chromeos/input_method/input_method_manager_impl.cc +++ b/chrome/browser/chromeos/input_method/input_method_manager_impl.cc @@ -15,8 +15,8 @@ #include "chrome/browser/chromeos/input_method/input_method_engine_ibus.h" #include "chrome/browser/chromeos/input_method/xkeyboard.h" #include "chrome/browser/chromeos/language_preferences.h" +#include "third_party/icu/public/common/unicode/uloc.h" #include "ui/base/accelerators/accelerator.h" -#include "unicode/uloc.h" namespace chromeos { namespace input_method { diff --git a/chrome/browser/chromeos/input_method/input_method_util.cc b/chrome/browser/chromeos/input_method/input_method_util.cc index dcc0732..dcf39ea 100644 --- a/chrome/browser/chromeos/input_method/input_method_util.cc +++ b/chrome/browser/chromeos/input_method/input_method_util.cc @@ -17,9 +17,9 @@ #include "base/utf_string_conversions.h" #include "chrome/browser/chromeos/input_method/input_method_delegate.h" #include "grit/generated_resources.h" +#include "third_party/icu/public/common/unicode/uloc.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/l10n/l10n_util_collator.h" -#include "unicode/uloc.h" namespace { diff --git a/chrome/browser/chromeos/login/wallpaper_manager.h b/chrome/browser/chromeos/login/wallpaper_manager.h index 4da1401..484f688 100644 --- a/chrome/browser/chromeos/login/wallpaper_manager.h +++ b/chrome/browser/chromeos/login/wallpaper_manager.h @@ -21,8 +21,8 @@ #include "chromeos/dbus/root_power_manager_observer.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" +#include "third_party/icu/public/i18n/unicode/timezone.h" #include "ui/gfx/image/image_skia.h" -#include "unicode/timezone.h" class PrefServiceSimple; diff --git a/chrome/browser/chromeos/login/wizard_controller_browsertest.cc b/chrome/browser/chromeos/login/wizard_controller_browsertest.cc index e345773..48a8e8d 100644 --- a/chrome/browser/chromeos/login/wizard_controller_browsertest.cc +++ b/chrome/browser/chromeos/login/wizard_controller_browsertest.cc @@ -28,9 +28,9 @@ #include "grit/generated_resources.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" +#include "third_party/icu/public/common/unicode/locid.h" #include "ui/base/accelerators/accelerator.h" #include "ui/base/l10n/l10n_util.h" -#include "unicode/locid.h" namespace chromeos { diff --git a/chrome/browser/chromeos/preferences.cc b/chrome/browser/chromeos/preferences.cc index 6ef97eb..9316186 100644 --- a/chrome/browser/chromeos/preferences.cc +++ b/chrome/browser/chromeos/preferences.cc @@ -31,9 +31,9 @@ #include "chrome/common/chrome_switches.h" #include "chrome/common/pref_names.h" #include "googleurl/src/gurl.h" +#include "third_party/icu/public/i18n/unicode/timezone.h" #include "ui/base/events/event_constants.h" #include "ui/base/events/event_utils.h" -#include "unicode/timezone.h" namespace chromeos { diff --git a/chrome/browser/chromeos/system/timezone_settings.cc b/chrome/browser/chromeos/system/timezone_settings.cc index de8d0a9..8b59301 100644 --- a/chrome/browser/chromeos/system/timezone_settings.cc +++ b/chrome/browser/chromeos/system/timezone_settings.cc @@ -21,7 +21,7 @@ #include "content/public/browser/render_process_host.h" #include "content/public/browser/render_view_host.h" #include "content/public/browser/render_widget_host.h" -#include "unicode/timezone.h" +#include "third_party/icu/public/i18n/unicode/timezone.h" using content::BrowserThread; diff --git a/chrome/browser/chromeos/system/timezone_settings.h b/chrome/browser/chromeos/system/timezone_settings.h index 8ef5cd8..c7cb184 100644 --- a/chrome/browser/chromeos/system/timezone_settings.h +++ b/chrome/browser/chromeos/system/timezone_settings.h @@ -8,7 +8,7 @@ #include <vector> #include "base/string16.h" -#include "unicode/timezone.h" +#include "third_party/icu/public/i18n/unicode/timezone.h" namespace chromeos { namespace system { diff --git a/chrome/browser/download/download_query.cc b/chrome/browser/download/download_query.cc index c21524b..0d7947f 100644 --- a/chrome/browser/download/download_query.cc +++ b/chrome/browser/download/download_query.cc @@ -26,7 +26,7 @@ #include "content/public/browser/download_item.h" #include "googleurl/src/gurl.h" #include "net/base/net_util.h" -#include "unicode/regex.h" +#include "third_party/icu/public/i18n/unicode/regex.h" using content::DownloadDangerType; using content::DownloadItem; diff --git a/chrome/browser/feedback/feedback_util.cc b/chrome/browser/feedback/feedback_util.cc index 20c7ed1..0bbaf39 100644 --- a/chrome/browser/feedback/feedback_util.cc +++ b/chrome/browser/feedback/feedback_util.cc @@ -35,8 +35,8 @@ #include "net/url_request/url_fetcher.h" #include "net/url_request/url_fetcher_delegate.h" #include "net/url_request/url_request_status.h" +#include "third_party/icu/public/common/unicode/locid.h" #include "ui/base/l10n/l10n_util.h" -#include "unicode/locid.h" using content::WebContents; diff --git a/chrome/browser/history/snippet.cc b/chrome/browser/history/snippet.cc index c765db4..511d170 100644 --- a/chrome/browser/history/snippet.cc +++ b/chrome/browser/history/snippet.cc @@ -11,9 +11,9 @@ #include "base/string_split.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" -#include "unicode/brkiter.h" -#include "unicode/utext.h" -#include "unicode/utf8.h" +#include "third_party/icu/public/common/unicode/brkiter.h" +#include "third_party/icu/public/common/unicode/utext.h" +#include "third_party/icu/public/common/unicode/utf8.h" namespace { diff --git a/chrome/browser/instant/instant_controller.cc b/chrome/browser/instant/instant_controller.cc index 83624cd..5077a87 100644 --- a/chrome/browser/instant/instant_controller.cc +++ b/chrome/browser/instant/instant_controller.cc @@ -27,7 +27,7 @@ #include "content/public/browser/render_widget_host_view.h" #include "content/public/browser/web_contents.h" #include "net/base/escape.h" -#include "unicode/normalizer2.h" +#include "third_party/icu/public/common/unicode/normalizer2.h" #if defined(TOOLKIT_VIEWS) #include "ui/views/widget/widget.h" diff --git a/chrome/browser/policy/browser_policy_connector.cc b/chrome/browser/policy/browser_policy_connector.cc index 93252ef..1b47479 100644 --- a/chrome/browser/policy/browser_policy_connector.cc +++ b/chrome/browser/policy/browser_policy_connector.cc @@ -38,7 +38,7 @@ #include "google_apis/gaia/gaia_constants.h" #include "grit/generated_resources.h" #include "policy/policy_constants.h" -#include "unicode/regex.h" +#include "third_party/icu/public/i18n/unicode/regex.h" #if defined(OS_WIN) #include "chrome/browser/policy/policy_loader_win.h" diff --git a/chrome/browser/signin/signin_manager.cc b/chrome/browser/signin/signin_manager.cc index 47cbed0..24fbd35 100644 --- a/chrome/browser/signin/signin_manager.cc +++ b/chrome/browser/signin/signin_manager.cc @@ -30,7 +30,7 @@ #include "google_apis/gaia/gaia_constants.h" #include "google_apis/gaia/gaia_urls.h" #include "net/cookies/cookie_monster.h" -#include "unicode/regex.h" +#include "third_party/icu/public/i18n/unicode/regex.h" using namespace signin_internals_util; diff --git a/chrome/browser/spellchecker/spelling_service_client.cc b/chrome/browser/spellchecker/spelling_service_client.cc index 4e9abad..0bfbea6 100644 --- a/chrome/browser/spellchecker/spelling_service_client.cc +++ b/chrome/browser/spellchecker/spelling_service_client.cc @@ -20,7 +20,7 @@ #include "google_apis/google_api_keys.h" #include "net/base/load_flags.h" #include "net/url_request/url_fetcher.h" -#include "unicode/uloc.h" +#include "third_party/icu/public/common/unicode/uloc.h" // Use the public URL to the Spelling service on Chromium. #ifndef SPELLING_SERVICE_URL diff --git a/chrome/browser/task_manager/task_manager.cc b/chrome/browser/task_manager/task_manager.cc index 9dedc57..0ad35fa 100644 --- a/chrome/browser/task_manager/task_manager.cc +++ b/chrome/browser/task_manager/task_manager.cc @@ -43,11 +43,11 @@ #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "grit/ui_resources.h" +#include "third_party/icu/public/i18n/unicode/coll.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" #include "ui/base/text/bytes_formatting.h" #include "ui/gfx/image/image_skia.h" -#include "unicode/coll.h" using content::BrowserThread; using content::OpenURLParams; diff --git a/chrome/browser/ui/omnibox/omnibox_popup_model.cc b/chrome/browser/ui/omnibox/omnibox_popup_model.cc index aa5e6b4..e4bb13d 100644 --- a/chrome/browser/ui/omnibox/omnibox_popup_model.cc +++ b/chrome/browser/ui/omnibox/omnibox_popup_model.cc @@ -6,8 +6,6 @@ #include <algorithm> -#include "unicode/ubidi.h" - #include "base/string_util.h" #include "base/utf_string_conversions.h" #include "chrome/browser/autocomplete/autocomplete_match.h" @@ -17,6 +15,7 @@ #include "chrome/browser/search_engines/template_url_service.h" #include "chrome/browser/search_engines/template_url_service_factory.h" #include "chrome/browser/ui/omnibox/omnibox_popup_view.h" +#include "third_party/icu/public/common/unicode/ubidi.h" #include "ui/gfx/image/image.h" #include "ui/gfx/rect.h" diff --git a/chrome/browser/ui/prefs/prefs_tab_helper.cc b/chrome/browser/ui/prefs/prefs_tab_helper.cc index d2ca379..fef7bce 100644 --- a/chrome/browser/ui/prefs/prefs_tab_helper.cc +++ b/chrome/browser/ui/prefs/prefs_tab_helper.cc @@ -23,8 +23,8 @@ #include "content/public/browser/web_contents.h" #include "grit/locale_settings.h" #include "grit/platform_locale_settings.h" -#include "unicode/uchar.h" -#include "unicode/uscript.h" +#include "third_party/icu/public/common/unicode/uchar.h" +#include "third_party/icu/public/common/unicode/uscript.h" #include "webkit/glue/webpreferences.h" #if defined(OS_POSIX) && !defined(OS_MACOSX) && defined(ENABLE_THEMES) diff --git a/chrome/browser/ui/views/download/download_item_view.cc b/chrome/browser/ui/views/download/download_item_view.cc index 98d73a8..7fc4f0a 100644 --- a/chrome/browser/ui/views/download/download_item_view.cc +++ b/chrome/browser/ui/views/download/download_item_view.cc @@ -26,6 +26,7 @@ #include "chrome/browser/ui/views/download/download_shelf_view.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" +#include "third_party/icu/public/common/unicode/uchar.h" #include "ui/base/accessibility/accessible_view_state.h" #include "ui/base/animation/slide_animation.h" #include "ui/base/events/event.h" @@ -39,7 +40,6 @@ #include "ui/views/controls/label.h" #include "ui/views/widget/root_view.h" #include "ui/views/widget/widget.h" -#include "unicode/uchar.h" // TODO(paulg): These may need to be adjusted when download progress // animation is added, and also possibly to take into account diff --git a/chrome/browser/ui/webui/options/chromeos/timezone_options_util.cc b/chrome/browser/ui/webui/options/chromeos/timezone_options_util.cc index ef6d809..8fce13d 100644 --- a/chrome/browser/ui/webui/options/chromeos/timezone_options_util.cc +++ b/chrome/browser/ui/webui/options/chromeos/timezone_options_util.cc @@ -15,11 +15,11 @@ #include "base/values.h" #include "chrome/browser/chromeos/system/timezone_settings.h" #include "grit/generated_resources.h" +#include "third_party/icu/public/common/unicode/ures.h" +#include "third_party/icu/public/common/unicode/utypes.h" +#include "third_party/icu/public/i18n/unicode/calendar.h" +#include "third_party/icu/public/i18n/unicode/timezone.h" #include "ui/base/l10n/l10n_util.h" -#include "unicode/calendar.h" -#include "unicode/timezone.h" -#include "unicode/ures.h" -#include "unicode/utypes.h" namespace { diff --git a/chrome/browser/ui/webui/print_preview/print_preview_handler.cc b/chrome/browser/ui/webui/print_preview/print_preview_handler.cc index 842218c..d2b4383 100644 --- a/chrome/browser/ui/webui/print_preview/print_preview_handler.cc +++ b/chrome/browser/ui/webui/print_preview/print_preview_handler.cc @@ -57,7 +57,7 @@ #include "printing/page_range.h" #include "printing/page_size_margins.h" #include "printing/print_settings.h" -#include "unicode/ulocdata.h" +#include "third_party/icu/public/i18n/unicode/ulocdata.h" #if defined(OS_CHROMEOS) // TODO(kinaba): provide more non-intrusive way for handling local/remote diff --git a/chrome/common/extensions/extension_l10n_util.cc b/chrome/common/extensions/extension_l10n_util.cc index 22c6ddf..b07efb8 100644 --- a/chrome/common/extensions/extension_l10n_util.cc +++ b/chrome/common/extensions/extension_l10n_util.cc @@ -20,8 +20,8 @@ #include "chrome/common/extensions/extension_file_util.h" #include "chrome/common/extensions/message_bundle.h" #include "chrome/common/url_constants.h" +#include "third_party/icu/public/common/unicode/uloc.h" #include "ui/base/l10n/l10n_util.h" -#include "unicode/uloc.h" namespace errors = extension_manifest_errors; namespace keys = extension_manifest_keys; diff --git a/chrome/common/time_format.cc b/chrome/common/time_format.cc index 46bf8e7..16d3e98 100644 --- a/chrome/common/time_format.cc +++ b/chrome/common/time_format.cc @@ -14,12 +14,12 @@ #include "base/time.h" #include "base/utf_string_conversions.h" #include "grit/generated_resources.h" +#include "third_party/icu/public/common/unicode/locid.h" +#include "third_party/icu/public/i18n/unicode/datefmt.h" +#include "third_party/icu/public/i18n/unicode/plurfmt.h" +#include "third_party/icu/public/i18n/unicode/plurrule.h" +#include "third_party/icu/public/i18n/unicode/smpdtfmt.h" #include "ui/base/l10n/l10n_util.h" -#include "unicode/datefmt.h" -#include "unicode/locid.h" -#include "unicode/plurfmt.h" -#include "unicode/plurrule.h" -#include "unicode/smpdtfmt.h" using base::Time; using base::TimeDelta; diff --git a/chrome/renderer/pepper/ppb_pdf_impl.cc b/chrome/renderer/pepper/ppb_pdf_impl.cc index 057d0a6..c675bea7 100644 --- a/chrome/renderer/pepper/ppb_pdf_impl.cc +++ b/chrome/renderer/pepper/ppb_pdf_impl.cc @@ -28,12 +28,12 @@ #include "third_party/WebKit/Source/WebKit/chromium/public/WebElement.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebPluginContainer.h" +#include "third_party/icu/public/i18n/unicode/usearch.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/layout.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/image/image_skia.h" #include "ui/gfx/image/image_skia_rep.h" -#include "unicode/usearch.h" #include "webkit/plugins/ppapi/host_globals.h" #include "webkit/plugins/ppapi/plugin_delegate.h" #include "webkit/plugins/ppapi/ppapi_plugin_instance.h" diff --git a/chrome/renderer/safe_browsing/phishing_term_feature_extractor.cc b/chrome/renderer/safe_browsing/phishing_term_feature_extractor.cc index c7b2992..fa3b237 100644 --- a/chrome/renderer/safe_browsing/phishing_term_feature_extractor.cc +++ b/chrome/renderer/safe_browsing/phishing_term_feature_extractor.cc @@ -19,8 +19,8 @@ #include "chrome/renderer/safe_browsing/feature_extractor_clock.h" #include "chrome/renderer/safe_browsing/features.h" #include "chrome/renderer/safe_browsing/murmurhash3_util.h" +#include "third_party/icu/public/common/unicode/ubrk.h" #include "ui/base/l10n/l10n_util.h" -#include "unicode/ubrk.h" namespace safe_browsing { diff --git a/chrome/renderer/spellchecker/spellcheck.h b/chrome/renderer/spellchecker/spellcheck.h index fc8760b..02182dc 100644 --- a/chrome/renderer/spellchecker/spellcheck.h +++ b/chrome/renderer/spellchecker/spellcheck.h @@ -18,7 +18,7 @@ #include "content/public/renderer/render_process_observer.h" #include "ipc/ipc_platform_file.h" #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebVector.h" -#include "unicode/uscript.h" +#include "third_party/icu/public/common/unicode/uscript.h" class SpellingEngine; struct SpellCheckResult; diff --git a/chrome/renderer/spellchecker/spellcheck_worditerator.cc b/chrome/renderer/spellchecker/spellcheck_worditerator.cc index 466ac5d..d8e9c4a 100644 --- a/chrome/renderer/spellchecker/spellcheck_worditerator.cc +++ b/chrome/renderer/spellchecker/spellcheck_worditerator.cc @@ -14,10 +14,10 @@ #include "base/stringprintf.h" #include "base/utf_string_conversions.h" #include "chrome/renderer/spellchecker/spellcheck.h" -#include "unicode/normlzr.h" -#include "unicode/schriter.h" -#include "unicode/uscript.h" -#include "unicode/ulocdata.h" +#include "third_party/icu/public/common/unicode/normlzr.h" +#include "third_party/icu/public/common/unicode/schriter.h" +#include "third_party/icu/public/common/unicode/uscript.h" +#include "third_party/icu/public/i18n/unicode/ulocdata.h" // SpellcheckCharAttribute implementation: diff --git a/chrome/renderer/spellchecker/spellcheck_worditerator.h b/chrome/renderer/spellchecker/spellcheck_worditerator.h index cdf09a3..a077e6d 100644 --- a/chrome/renderer/spellchecker/spellcheck_worditerator.h +++ b/chrome/renderer/spellchecker/spellcheck_worditerator.h @@ -11,11 +11,10 @@ #include <string> -#include "unicode/ubrk.h" -#include "unicode/uscript.h" - #include "base/basictypes.h" #include "base/string16.h" +#include "third_party/icu/public/common/unicode/ubrk.h" +#include "third_party/icu/public/common/unicode/uscript.h" // A class which encapsulates language-specific operations used by // SpellcheckWordIterator. When we set the spellchecker language, this class diff --git a/content/common/sandbox_mac.mm b/content/common/sandbox_mac.mm index 04276f1..cf8b7f4 100644 --- a/content/common/sandbox_mac.mm +++ b/content/common/sandbox_mac.mm @@ -32,9 +32,9 @@ extern "C" { #include "content/public/common/content_client.h" #include "content/public/common/content_switches.h" #include "grit/content_resources.h" +#include "third_party/icu/public/common/unicode/uchar.h" #include "ui/base/layout.h" #include "ui/gl/gl_surface.h" -#include "unicode/uchar.h" namespace content { namespace { diff --git a/content/renderer/android/email_detector.cc b/content/renderer/android/email_detector.cc index 4eaa0d0..71d5626 100644 --- a/content/renderer/android/email_detector.cc +++ b/content/renderer/android/email_detector.cc @@ -9,7 +9,7 @@ #include "base/utf_string_conversions.h" #include "content/public/renderer/android_content_detection_prefixes.h" #include "net/base/escape.h" -#include "unicode/regex.h" +#include "third_party/icu/public/i18n/unicode/regex.h" namespace { diff --git a/content/renderer/hyphenator/hyphenator.cc b/content/renderer/hyphenator/hyphenator.cc index 6b1c2e2..4c063ae 100644 --- a/content/renderer/hyphenator/hyphenator.cc +++ b/content/renderer/hyphenator/hyphenator.cc @@ -12,7 +12,7 @@ #include "content/common/hyphenator_messages.h" #include "content/public/renderer/render_thread.h" #include "third_party/hyphen/hyphen.h" -#include "unicode/uscript.h" +#include "third_party/icu/public/common/unicode/uscript.h" namespace { diff --git a/content/renderer/renderer_main_platform_delegate_win.cc b/content/renderer/renderer_main_platform_delegate_win.cc index ea33fe3..e7f6030 100644 --- a/content/renderer/renderer_main_platform_delegate_win.cc +++ b/content/renderer/renderer_main_platform_delegate_win.cc @@ -16,7 +16,7 @@ #include "sandbox/win/src/sandbox.h" #include "skia/ext/skia_sandbox_support_win.h" #include "skia/ext/vector_platform_device_emf_win.h" -#include "unicode/timezone.h" +#include "third_party/icu/public/i18n/unicode/timezone.h" namespace content { namespace { diff --git a/content/zygote/zygote_main_linux.cc b/content/zygote/zygote_main_linux.cc index d8f2ed9..d0f8647 100644 --- a/content/zygote/zygote_main_linux.cc +++ b/content/zygote/zygote_main_linux.cc @@ -38,7 +38,7 @@ #include "sandbox/linux/services/libc_urandom_override.h" #include "sandbox/linux/suid/client/setuid_sandbox_client.h" #include "skia/ext/SkFontHost_fontconfig_control.h" -#include "unicode/timezone.h" +#include "third_party/icu/public/i18n/unicode/timezone.h" #if defined(OS_LINUX) #include <sys/epoll.h> diff --git a/net/base/net_util.cc b/net/base/net_util.cc index 5f321c6..05e59e3 100644 --- a/net/base/net_util.cc +++ b/net/base/net_util.cc @@ -68,13 +68,13 @@ #include "net/base/winsock_init.h" #endif #include "net/http/http_content_disposition.h" -#include "unicode/datefmt.h" -#include "unicode/regex.h" -#include "unicode/uidna.h" -#include "unicode/ulocdata.h" -#include "unicode/uniset.h" -#include "unicode/uscript.h" -#include "unicode/uset.h" +#include "third_party/icu/public/common/unicode/uidna.h" +#include "third_party/icu/public/common/unicode/uniset.h" +#include "third_party/icu/public/common/unicode/uscript.h" +#include "third_party/icu/public/common/unicode/uset.h" +#include "third_party/icu/public/i18n/unicode/datefmt.h" +#include "third_party/icu/public/i18n/unicode/regex.h" +#include "third_party/icu/public/i18n/unicode/ulocdata.h" using base::Time; diff --git a/net/ftp/ftp_util.cc b/net/ftp/ftp_util.cc index dda9471..efa67f5 100644 --- a/net/ftp/ftp_util.cc +++ b/net/ftp/ftp_util.cc @@ -18,9 +18,9 @@ #include "base/string_util.h" #include "base/time.h" #include "base/utf_string_conversions.h" -#include "unicode/datefmt.h" -#include "unicode/dtfmtsym.h" -#include "unicode/uchar.h" +#include "third_party/icu/public/common/unicode/uchar.h" +#include "third_party/icu/public/i18n/unicode/datefmt.h" +#include "third_party/icu/public/i18n/unicode/dtfmtsym.h" using base::StringPiece16; diff --git a/net/http/http_content_disposition.cc b/net/http/http_content_disposition.cc index 35ace84..734b1da 100644 --- a/net/http/http_content_disposition.cc +++ b/net/http/http_content_disposition.cc @@ -12,7 +12,7 @@ #include "base/utf_string_conversions.h" #include "net/base/net_util.h" #include "net/http/http_util.h" -#include "unicode/ucnv.h" +#include "third_party/icu/public/common/unicode/ucnv.h" namespace { diff --git a/ppapi/proxy/browser_font_resource_trusted.cc b/ppapi/proxy/browser_font_resource_trusted.cc index 3e34199..9853985 100644 --- a/ppapi/proxy/browser_font_resource_trusted.cc +++ b/ppapi/proxy/browser_font_resource_trusted.cc @@ -20,8 +20,8 @@ #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebFloatPoint.h" #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebFloatRect.h" #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebRect.h" +#include "third_party/icu/public/common/unicode/ubidi.h" #include "third_party/skia/include/core/SkRect.h" -#include "unicode/ubidi.h" using ppapi::StringVar; using ppapi::thunk::EnterResourceNoLock; diff --git a/ppapi/shared_impl/private/ppb_char_set_shared.cc b/ppapi/shared_impl/private/ppb_char_set_shared.cc index 8424b00..5ce51a6 100644 --- a/ppapi/shared_impl/private/ppb_char_set_shared.cc +++ b/ppapi/shared_impl/private/ppb_char_set_shared.cc @@ -9,10 +9,10 @@ #include "base/i18n/icu_string_conversions.h" #include "ppapi/c/dev/ppb_memory_dev.h" #include "ppapi/thunk/thunk.h" -#include "unicode/ucnv.h" -#include "unicode/ucnv_cb.h" -#include "unicode/ucnv_err.h" -#include "unicode/ustring.h" +#include "third_party/icu/public/common/unicode/ucnv.h" +#include "third_party/icu/public/common/unicode/ucnv_cb.h" +#include "third_party/icu/public/common/unicode/ucnv_err.h" +#include "third_party/icu/public/common/unicode/ustring.h" namespace ppapi { diff --git a/printing/backend/print_backend.cc b/printing/backend/print_backend.cc index ab8ae5f..74c21a52 100644 --- a/printing/backend/print_backend.cc +++ b/printing/backend/print_backend.cc @@ -6,8 +6,8 @@ #include <algorithm> +#include "third_party/icu/public/common/unicode/uchar.h" #include "ui/base/text/text_elider.h" -#include "unicode/uchar.h" namespace { diff --git a/ui/base/l10n/l10n_util.cc b/ui/base/l10n/l10n_util.cc index b5ab52b..457485f 100644 --- a/ui/base/l10n/l10n_util.cc +++ b/ui/base/l10n/l10n_util.cc @@ -23,11 +23,11 @@ #include "base/sys_string_conversions.h" #include "base/utf_string_conversions.h" #include "build/build_config.h" +#include "third_party/icu/public/common/unicode/rbbi.h" +#include "third_party/icu/public/common/unicode/uloc.h" #include "ui/base/l10n/l10n_util_collator.h" #include "ui/base/resource/resource_bundle.h" #include "ui/base/ui_base_paths.h" -#include "unicode/rbbi.h" -#include "unicode/uloc.h" #if defined(OS_ANDROID) #include "base/android/locale_utils.h" diff --git a/ui/base/l10n/l10n_util_collator.h b/ui/base/l10n/l10n_util_collator.h index 4952d1e..fb43692 100644 --- a/ui/base/l10n/l10n_util_collator.h +++ b/ui/base/l10n/l10n_util_collator.h @@ -12,8 +12,8 @@ #include "base/memory/scoped_ptr.h" #include "base/utf_string_conversions.h" +#include "third_party/icu/public/i18n/unicode/coll.h" #include "ui/base/ui_export.h" -#include "unicode/coll.h" namespace l10n_util { diff --git a/ui/base/l10n/l10n_util_unittest.cc b/ui/base/l10n/l10n_util_unittest.cc index 77a5cc5..86dcf23 100644 --- a/ui/base/l10n/l10n_util_unittest.cc +++ b/ui/base/l10n/l10n_util_unittest.cc @@ -20,10 +20,10 @@ #include "base/utf_string_conversions.h" #include "testing/gtest/include/gtest/gtest.h" #include "testing/platform_test.h" +#include "third_party/icu/public/common/unicode/locid.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/l10n/l10n_util_collator.h" #include "ui/base/ui_base_paths.h" -#include "unicode/locid.h" #if defined(OS_WIN) #include "base/win/windows_version.h" diff --git a/ui/base/models/table_model.h b/ui/base/models/table_model.h index 98286ed..6479b07 100644 --- a/ui/base/models/table_model.h +++ b/ui/base/models/table_model.h @@ -8,8 +8,8 @@ #include <vector> #include "base/string16.h" +#include "third_party/icu/public/i18n/unicode/coll.h" #include "ui/base/ui_export.h" -#include "unicode/coll.h" namespace gfx { class ImageSkia; diff --git a/ui/base/text/text_elider.cc b/ui/base/text/text_elider.cc index 4388c07..defdec8 100644 --- a/ui/base/text/text_elider.cc +++ b/ui/base/text/text_elider.cc @@ -25,9 +25,9 @@ #include "net/base/escape.h" #include "net/base/net_util.h" #include "net/base/registry_controlled_domains/registry_controlled_domain.h" +#include "third_party/icu/public/common/unicode/rbbi.h" +#include "third_party/icu/public/common/unicode/uloc.h" #include "ui/gfx/font.h" -#include "unicode/rbbi.h" -#include "unicode/uloc.h" namespace ui { diff --git a/ui/base/text/text_elider.h b/ui/base/text/text_elider.h index 39249ad..a311caf 100644 --- a/ui/base/text/text_elider.h +++ b/ui/base/text/text_elider.h @@ -12,10 +12,10 @@ #include "base/basictypes.h" #include "base/string16.h" +#include "third_party/icu/public/common/unicode/uchar.h" +#include "third_party/icu/public/i18n/unicode/coll.h" #include "ui/base/ui_export.h" #include "ui/gfx/font.h" -#include "unicode/coll.h" -#include "unicode/uchar.h" class FilePath; class GURL; diff --git a/ui/views/controls/textfield/native_textfield_views.cc b/ui/views/controls/textfield/native_textfield_views.cc index da216a9..aa62cb5 100644 --- a/ui/views/controls/textfield/native_textfield_views.cc +++ b/ui/views/controls/textfield/native_textfield_views.cc @@ -15,6 +15,7 @@ #include "base/utf_string_conversions.h" #include "grit/app_locale_settings.h" #include "grit/ui_strings.h" +#include "third_party/icu/public/common/unicode/uchar.h" #include "third_party/skia/include/core/SkColor.h" #include "ui/base/clipboard/clipboard.h" #include "ui/base/dragdrop/drag_drop_types.h" @@ -39,7 +40,6 @@ #include "ui/views/ime/input_method.h" #include "ui/views/metrics.h" #include "ui/views/widget/widget.h" -#include "unicode/uchar.h" #if defined(USE_AURA) #include "ui/base/cursor/cursor.h" diff --git a/webkit/fileapi/file_system_dir_url_request_job_unittest.cc b/webkit/fileapi/file_system_dir_url_request_job_unittest.cc index 029b00e..f9dfaad 100644 --- a/webkit/fileapi/file_system_dir_url_request_job_unittest.cc +++ b/webkit/fileapi/file_system_dir_url_request_job_unittest.cc @@ -21,7 +21,7 @@ #include "net/url_request/url_request_context.h" #include "net/url_request/url_request_test_util.h" #include "testing/gtest/include/gtest/gtest.h" -#include "unicode/regex.h" +#include "third_party/icu/public/i18n/unicode/regex.h" #include "webkit/fileapi/file_system_context.h" #include "webkit/fileapi/file_system_file_util.h" #include "webkit/fileapi/file_system_operation_context.h" diff --git a/webkit/glue/webpreferences.cc b/webkit/glue/webpreferences.cc index ac59a21..d5dd85e 100644 --- a/webkit/glue/webpreferences.cc +++ b/webkit/glue/webpreferences.cc @@ -15,7 +15,7 @@ #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h" #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURL.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" -#include "unicode/uchar.h" +#include "third_party/icu/public/common/unicode/uchar.h" #include "webkit/glue/webkit_glue.h" using WebKit::WebNetworkStateNotifier; |