diff options
| author | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-07 22:33:47 +0000 |
|---|---|---|
| committer | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-07 22:33:47 +0000 |
| commit | c297d3a13ae36bf2f574e55b3f1f9494b3f98e7b (patch) | |
| tree | 6d4bcd167b01ccf9fe91dd4e8b5c4d5d44124982 /content | |
| parent | 47d20da2c60b132ba2cd3b94f9be9c38fc609ad2 (diff) | |
| download | chromium_src-c297d3a13ae36bf2f574e55b3f1f9494b3f98e7b.zip chromium_src-c297d3a13ae36bf2f574e55b3f1f9494b3f98e7b.tar.gz chromium_src-c297d3a13ae36bf2f574e55b3f1f9494b3f98e7b.tar.bz2 | |
Roll ICU and convert include style to standard Chromium style,
i.e. third_party/...
BUG=165264
Review URL: https://codereview.chromium.org/11734021
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@175399 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
| -rw-r--r-- | content/common/sandbox_mac.mm | 2 | ||||
| -rw-r--r-- | content/renderer/android/email_detector.cc | 2 | ||||
| -rw-r--r-- | content/renderer/hyphenator/hyphenator.cc | 2 | ||||
| -rw-r--r-- | content/renderer/renderer_main_platform_delegate_win.cc | 2 | ||||
| -rw-r--r-- | content/zygote/zygote_main_linux.cc | 2 |
5 files changed, 5 insertions, 5 deletions
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> |