diff options
Diffstat (limited to 'chrome')
31 files changed, 46 insertions, 45 deletions
diff --git a/chrome/browser/DEPS b/chrome/browser/DEPS index 8a76397..30570623 100644 --- a/chrome/browser/DEPS +++ b/chrome/browser/DEPS @@ -77,7 +77,8 @@ include_rules = [ "+third_party/cld", "+third_party/expat", "+third_party/iaccessible2", - "+third_party/icu", + "+third_party/icu/source/common/unicode", + "+third_party/icu/source/i18n/unicode", "+third_party/isimpledom", "+third_party/leveldatabase", "+third_party/libevent", # For the remote V8 debugging server diff --git a/chrome/browser/character_encoding.cc b/chrome/browser/character_encoding.cc index 9a0f112..4909a7b 100644 --- a/chrome/browser/character_encoding.cc +++ b/chrome/browser/character_encoding.cc @@ -15,7 +15,7 @@ #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 "third_party/icu/source/common/unicode/ucnv.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/l10n/l10n_util_collator.h" diff --git a/chrome/browser/chromeos/cros/cert_library.cc b/chrome/browser/chromeos/cros/cert_library.cc index 952f14f..315c594 100644 --- a/chrome/browser/chromeos/cros/cert_library.cc +++ b/chrome/browser/chromeos/cros/cert_library.cc @@ -25,7 +25,7 @@ #include "grit/generated_resources.h" #include "net/cert/cert_database.h" #include "net/cert/nss_cert_database.h" -#include "third_party/icu/public/i18n/unicode/coll.h" // icu::Collator +#include "third_party/icu/source/i18n/unicode/coll.h" // icu::Collator #include "ui/base/l10n/l10n_util.h" #include "ui/base/l10n/l10n_util_collator.h" 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 4f21a46..fcb8919 100644 --- a/chrome/browser/chromeos/input_method/input_method_manager_impl.cc +++ b/chrome/browser/chromeos/input_method/input_method_manager_impl.cc @@ -23,7 +23,7 @@ #include "chromeos/ime/extension_ime_util.h" #include "chromeos/ime/input_method_delegate.h" #include "chromeos/ime/xkeyboard.h" -#include "third_party/icu/public/common/unicode/uloc.h" +#include "third_party/icu/source/common/unicode/uloc.h" #include "ui/base/accelerators/accelerator.h" namespace chromeos { diff --git a/chrome/browser/chromeos/login/wallpaper_manager.h b/chrome/browser/chromeos/login/wallpaper_manager.h index 62e00d7..c994aba 100644 --- a/chrome/browser/chromeos/login/wallpaper_manager.h +++ b/chrome/browser/chromeos/login/wallpaper_manager.h @@ -21,7 +21,7 @@ #include "chromeos/dbus/power_manager_client.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 "third_party/icu/source/i18n/unicode/timezone.h" #include "ui/gfx/image/image_skia.h" class PrefRegistrySimple; diff --git a/chrome/browser/chromeos/login/wizard_controller_browsertest.cc b/chrome/browser/chromeos/login/wizard_controller_browsertest.cc index aab384d..60aff4b 100644 --- a/chrome/browser/chromeos/login/wizard_controller_browsertest.cc +++ b/chrome/browser/chromeos/login/wizard_controller_browsertest.cc @@ -33,7 +33,7 @@ #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 "third_party/icu/source/common/unicode/locid.h" #include "ui/base/accelerators/accelerator.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/chromeos/preferences.cc b/chrome/browser/chromeos/preferences.cc index 5248353..3925818 100644 --- a/chrome/browser/chromeos/preferences.cc +++ b/chrome/browser/chromeos/preferences.cc @@ -33,7 +33,7 @@ #include "chromeos/ime/input_method_manager.h" #include "chromeos/ime/xkeyboard.h" #include "components/user_prefs/pref_registry_syncable.h" -#include "third_party/icu/public/i18n/unicode/timezone.h" +#include "third_party/icu/source/i18n/unicode/timezone.h" #include "ui/base/events/event_constants.h" #include "ui/base/events/event_utils.h" #include "url/gurl.h" diff --git a/chrome/browser/chromeos/settings/system_settings_provider.h b/chrome/browser/chromeos/settings/system_settings_provider.h index ef7c174..0b993b1 100644 --- a/chrome/browser/chromeos/settings/system_settings_provider.h +++ b/chrome/browser/chromeos/settings/system_settings_provider.h @@ -11,7 +11,7 @@ #include "base/memory/scoped_ptr.h" #include "chrome/browser/chromeos/settings/cros_settings_provider.h" #include "chrome/browser/chromeos/system/timezone_settings.h" -#include "third_party/icu/public/i18n/unicode/timezone.h" +#include "third_party/icu/source/i18n/unicode/timezone.h" namespace base { class StringValue; diff --git a/chrome/browser/chromeos/system/timezone_settings.cc b/chrome/browser/chromeos/system/timezone_settings.cc index 6ebffc9..eab34e9 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 "third_party/icu/public/i18n/unicode/timezone.h" +#include "third_party/icu/source/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 6e9cc6c..ca62bf9 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/strings/string16.h" -#include "third_party/icu/public/i18n/unicode/timezone.h" +#include "third_party/icu/source/i18n/unicode/timezone.h" namespace chromeos { namespace system { diff --git a/chrome/browser/feedback/feedback_util.cc b/chrome/browser/feedback/feedback_util.cc index 873f12c..8095fad 100644 --- a/chrome/browser/feedback/feedback_util.cc +++ b/chrome/browser/feedback/feedback_util.cc @@ -37,7 +37,7 @@ #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 "third_party/icu/source/common/unicode/locid.h" #include "ui/base/l10n/l10n_util.h" #include "url/gurl.h" diff --git a/chrome/browser/history/snippet.cc b/chrome/browser/history/snippet.cc index 90d80d0..e1069a6 100644 --- a/chrome/browser/history/snippet.cc +++ b/chrome/browser/history/snippet.cc @@ -11,9 +11,9 @@ #include "base/strings/string_split.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.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" +#include "third_party/icu/source/common/unicode/brkiter.h" +#include "third_party/icu/source/common/unicode/utext.h" +#include "third_party/icu/source/common/unicode/utf8.h" namespace { diff --git a/chrome/browser/policy/browser_policy_connector.cc b/chrome/browser/policy/browser_policy_connector.cc index 718e572..2a1d1cf 100644 --- a/chrome/browser/policy/browser_policy_connector.cc +++ b/chrome/browser/policy/browser_policy_connector.cc @@ -37,7 +37,7 @@ #include "grit/generated_resources.h" #include "net/url_request/url_request_context_getter.h" #include "policy/policy_constants.h" -#include "third_party/icu/public/i18n/unicode/regex.h" +#include "third_party/icu/source/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 d0629e5..f419d84 100644 --- a/chrome/browser/signin/signin_manager.cc +++ b/chrome/browser/signin/signin_manager.cc @@ -38,7 +38,7 @@ #include "google_apis/gaia/gaia_urls.h" #include "net/base/escape.h" #include "net/url_request/url_request_context.h" -#include "third_party/icu/public/i18n/unicode/regex.h" +#include "third_party/icu/source/i18n/unicode/regex.h" using namespace signin_internals_util; diff --git a/chrome/browser/task_manager/task_manager.cc b/chrome/browser/task_manager/task_manager.cc index be9a3b9..8c5bae6 100644 --- a/chrome/browser/task_manager/task_manager.cc +++ b/chrome/browser/task_manager/task_manager.cc @@ -41,7 +41,7 @@ #include "content/public/common/result_codes.h" #include "grit/generated_resources.h" #include "grit/ui_resources.h" -#include "third_party/icu/public/i18n/unicode/coll.h" +#include "third_party/icu/source/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" diff --git a/chrome/browser/translate/translate_infobar_delegate.cc b/chrome/browser/translate/translate_infobar_delegate.cc index 20a5b0a..bc38dcf 100644 --- a/chrome/browser/translate/translate_infobar_delegate.cc +++ b/chrome/browser/translate/translate_infobar_delegate.cc @@ -20,7 +20,7 @@ #include "content/public/browser/web_contents.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" -#include "third_party/icu/public/i18n/unicode/coll.h" +#include "third_party/icu/source/i18n/unicode/coll.h" #include "ui/base/l10n/l10n_util.h" using content::NavigationEntry; diff --git a/chrome/browser/ui/app_list/search/term_break_iterator.cc b/chrome/browser/ui/app_list/search/term_break_iterator.cc index 071a552..1349683 100644 --- a/chrome/browser/ui/app_list/search/term_break_iterator.cc +++ b/chrome/browser/ui/app_list/search/term_break_iterator.cc @@ -7,7 +7,7 @@ #include "base/i18n/char_iterator.h" #include "base/logging.h" #include "base/strings/string_util.h" -#include "third_party/icu/public/common/unicode/uchar.h" +#include "third_party/icu/source/common/unicode/uchar.h" namespace app_list { diff --git a/chrome/browser/ui/app_list/search/tokenized_string_char_iterator.cc b/chrome/browser/ui/app_list/search/tokenized_string_char_iterator.cc index 5a122b6..6999edd 100644 --- a/chrome/browser/ui/app_list/search/tokenized_string_char_iterator.cc +++ b/chrome/browser/ui/app_list/search/tokenized_string_char_iterator.cc @@ -6,7 +6,7 @@ #include "base/i18n/char_iterator.h" #include "base/logging.h" -#include "third_party/icu/public/common/unicode/utf16.h" +#include "third_party/icu/source/common/unicode/utf16.h" namespace app_list { diff --git a/chrome/browser/ui/omnibox/omnibox_popup_model.cc b/chrome/browser/ui/omnibox/omnibox_popup_model.cc index 30d1825..014c7f8 100644 --- a/chrome/browser/ui/omnibox/omnibox_popup_model.cc +++ b/chrome/browser/ui/omnibox/omnibox_popup_model.cc @@ -16,7 +16,7 @@ #include "chrome/browser/search_engines/template_url_service_factory.h" #include "chrome/browser/ui/omnibox/omnibox_popup_model_observer.h" #include "chrome/browser/ui/omnibox/omnibox_popup_view.h" -#include "third_party/icu/public/common/unicode/ubidi.h" +#include "third_party/icu/source/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 30feabb..3e3f718 100644 --- a/chrome/browser/ui/prefs/prefs_tab_helper.cc +++ b/chrome/browser/ui/prefs/prefs_tab_helper.cc @@ -25,8 +25,8 @@ #include "content/public/browser/web_contents.h" #include "grit/locale_settings.h" #include "grit/platform_locale_settings.h" -#include "third_party/icu/public/common/unicode/uchar.h" -#include "third_party/icu/public/common/unicode/uscript.h" +#include "third_party/icu/source/common/unicode/uchar.h" +#include "third_party/icu/source/common/unicode/uscript.h" #include "webkit/common/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 4977edf..0bdc6c4 100644 --- a/chrome/browser/ui/views/download/download_item_view.cc +++ b/chrome/browser/ui/views/download/download_item_view.cc @@ -30,7 +30,7 @@ #include "content/public/browser/download_danger_type.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" -#include "third_party/icu/public/common/unicode/uchar.h" +#include "third_party/icu/source/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" 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 c6cd40b..4d09319 100644 --- a/chrome/browser/ui/webui/options/chromeos/timezone_options_util.cc +++ b/chrome/browser/ui/webui/options/chromeos/timezone_options_util.cc @@ -15,10 +15,10 @@ #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 "third_party/icu/source/common/unicode/ures.h" +#include "third_party/icu/source/common/unicode/utypes.h" +#include "third_party/icu/source/i18n/unicode/calendar.h" +#include "third_party/icu/source/i18n/unicode/timezone.h" #include "ui/base/l10n/l10n_util.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 98b2188..b22c90e 100644 --- a/chrome/browser/ui/webui/print_preview/print_preview_handler.cc +++ b/chrome/browser/ui/webui/print_preview/print_preview_handler.cc @@ -62,7 +62,7 @@ #include "printing/page_range.h" #include "printing/page_size_margins.h" #include "printing/print_settings.h" -#include "third_party/icu/public/i18n/unicode/ulocdata.h" +#include "third_party/icu/source/i18n/unicode/ulocdata.h" #if defined(OS_CHROMEOS) // TODO(kinaba): provide more non-intrusive way for handling local/remote diff --git a/chrome/browser/web_resource/promo_resource_service_unittest.cc b/chrome/browser/web_resource/promo_resource_service_unittest.cc index 95e2a77..0f0ae62 100644 --- a/chrome/browser/web_resource/promo_resource_service_unittest.cc +++ b/chrome/browser/web_resource/promo_resource_service_unittest.cc @@ -27,7 +27,7 @@ #include "content/public/browser/notification_service.h" #include "net/url_request/test_url_fetcher_factory.h" #include "testing/gtest/include/gtest/gtest.h" -#include "third_party/icu/public/i18n/unicode/smpdtfmt.h" +#include "third_party/icu/source/i18n/unicode/smpdtfmt.h" namespace { diff --git a/chrome/common/extensions/extension_l10n_util.cc b/chrome/common/extensions/extension_l10n_util.cc index ac4b4ba..807deae 100644 --- a/chrome/common/extensions/extension_l10n_util.cc +++ b/chrome/common/extensions/extension_l10n_util.cc @@ -21,7 +21,7 @@ #include "chrome/common/extensions/message_bundle.h" #include "chrome/common/url_constants.h" #include "extensions/common/constants.h" -#include "third_party/icu/public/common/unicode/uloc.h" +#include "third_party/icu/source/common/unicode/uloc.h" #include "ui/base/l10n/l10n_util.h" namespace errors = extension_manifest_errors; diff --git a/chrome/common/spellcheck_common.cc b/chrome/common/spellcheck_common.cc index 601a38e..8eaf591 100644 --- a/chrome/common/spellcheck_common.cc +++ b/chrome/common/spellcheck_common.cc @@ -6,7 +6,7 @@ #include "base/files/file_path.h" #include "base/logging.h" -#include "third_party/icu/public/common/unicode/uloc.h" +#include "third_party/icu/source/common/unicode/uloc.h" namespace chrome { namespace spellcheck_common { diff --git a/chrome/common/time_format.cc b/chrome/common/time_format.cc index adc246a..8e19e66 100644 --- a/chrome/common/time_format.cc +++ b/chrome/common/time_format.cc @@ -15,11 +15,11 @@ #include "base/strings/utf_string_conversions.h" #include "base/time/time.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 "third_party/icu/source/common/unicode/locid.h" +#include "third_party/icu/source/i18n/unicode/datefmt.h" +#include "third_party/icu/source/i18n/unicode/plurfmt.h" +#include "third_party/icu/source/i18n/unicode/plurrule.h" +#include "third_party/icu/source/i18n/unicode/smpdtfmt.h" #include "ui/base/l10n/l10n_util.h" using base::Time; diff --git a/chrome/renderer/pepper/ppb_pdf_impl.cc b/chrome/renderer/pepper/ppb_pdf_impl.cc index 7b4a1d4..9ccba21 100644 --- a/chrome/renderer/pepper/ppb_pdf_impl.cc +++ b/chrome/renderer/pepper/ppb_pdf_impl.cc @@ -29,7 +29,7 @@ #include "third_party/WebKit/public/web/WebElement.h" #include "third_party/WebKit/public/web/WebFrame.h" #include "third_party/WebKit/public/web/WebPluginContainer.h" -#include "third_party/icu/public/i18n/unicode/usearch.h" +#include "third_party/icu/source/i18n/unicode/usearch.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/layout.h" #include "ui/base/resource/resource_bundle.h" diff --git a/chrome/renderer/safe_browsing/phishing_term_feature_extractor.cc b/chrome/renderer/safe_browsing/phishing_term_feature_extractor.cc index 66613b7..c848cd3 100644 --- a/chrome/renderer/safe_browsing/phishing_term_feature_extractor.cc +++ b/chrome/renderer/safe_browsing/phishing_term_feature_extractor.cc @@ -19,7 +19,7 @@ #include "chrome/renderer/safe_browsing/features.h" #include "chrome/renderer/safe_browsing/murmurhash3_util.h" #include "crypto/sha2.h" -#include "third_party/icu/public/common/unicode/ubrk.h" +#include "third_party/icu/source/common/unicode/ubrk.h" #include "ui/base/l10n/l10n_util.h" namespace safe_browsing { diff --git a/chrome/renderer/spellchecker/spellcheck_worditerator.cc b/chrome/renderer/spellchecker/spellcheck_worditerator.cc index 29d77c7..c024bcd 100644 --- a/chrome/renderer/spellchecker/spellcheck_worditerator.cc +++ b/chrome/renderer/spellchecker/spellcheck_worditerator.cc @@ -14,10 +14,10 @@ #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" #include "chrome/renderer/spellchecker/spellcheck.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" +#include "third_party/icu/source/common/unicode/normlzr.h" +#include "third_party/icu/source/common/unicode/schriter.h" +#include "third_party/icu/source/common/unicode/uscript.h" +#include "third_party/icu/source/i18n/unicode/ulocdata.h" // SpellcheckCharAttribute implementation: diff --git a/chrome/renderer/spellchecker/spellcheck_worditerator.h b/chrome/renderer/spellchecker/spellcheck_worditerator.h index b5f6f2c..210c6bb 100644 --- a/chrome/renderer/spellchecker/spellcheck_worditerator.h +++ b/chrome/renderer/spellchecker/spellcheck_worditerator.h @@ -13,8 +13,8 @@ #include "base/basictypes.h" #include "base/strings/string16.h" -#include "third_party/icu/public/common/unicode/ubrk.h" -#include "third_party/icu/public/common/unicode/uscript.h" +#include "third_party/icu/source/common/unicode/ubrk.h" +#include "third_party/icu/source/common/unicode/uscript.h" // A class which encapsulates language-specific operations used by // SpellcheckWordIterator. When we set the spellchecker language, this class |