diff options
| author | jshin@chromium.org <jshin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-18 11:14:04 +0000 |
|---|---|---|
| committer | jshin@chromium.org <jshin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-18 11:14:04 +0000 |
| commit | 8bbf61998ab30c1cec463611d16ebf83e3050d02 (patch) | |
| tree | 114a07f1e9a38ccdf4800d18c18a9bd35122c5e3 /content/renderer | |
| parent | 5c8f89f69d54d7bafdf1910d620459e0a788c781 (diff) | |
| download | chromium_src-8bbf61998ab30c1cec463611d16ebf83e3050d02.zip chromium_src-8bbf61998ab30c1cec463611d16ebf83e3050d02.tar.gz chromium_src-8bbf61998ab30c1cec463611d16ebf83e3050d02.tar.bz2 | |
Replace third_party/icu/public with third_party/icu/source in the include directives.
This is to move back icu headers in
third_party/icu/public/{i18n,common}/unicode back to their upstream
locations in third_party/icu/source/{i18n,common}/unicode.
http://codereview.chromium.org/18836004 has is a CL to move
ICU header files.
Roll ICU to the version with the above ICU CL (http://crrev.com/211851 ).
In addition to the global replacement of third_party/icu/public with third_party/icu/source, the top-level DEPS, DEPS in printing and chrome/ are tightened up. (the latter two were too permissive (it used to allow any header from third_party/icu).
Besides, sync '-foo' list in ios/public/DEPS with '+foo' in the top-level DEPS and build/linux/unbundled/icu.gyp is updated.
BUG=251433
TEST=Compile succeeds on all bots. checkdeps.py does not find any error.
TBR=brettw,sky,wtc
Review URL: https://chromiumcodereview.appspot.com/18252003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@212324 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/renderer')
| -rw-r--r-- | content/renderer/android/email_detector.cc | 2 | ||||
| -rw-r--r-- | content/renderer/date_time_formatter.cc | 2 | ||||
| -rw-r--r-- | content/renderer/date_time_formatter.h | 4 | ||||
| -rw-r--r-- | content/renderer/date_time_formatter_unittest.cc | 2 | ||||
| -rw-r--r-- | content/renderer/hyphenator/hyphenator.cc | 2 | ||||
| -rw-r--r-- | content/renderer/renderer_main_platform_delegate_win.cc | 2 |
6 files changed, 7 insertions, 7 deletions
diff --git a/content/renderer/android/email_detector.cc b/content/renderer/android/email_detector.cc index 76c6838..28b8af4 100644 --- a/content/renderer/android/email_detector.cc +++ b/content/renderer/android/email_detector.cc @@ -9,7 +9,7 @@ #include "base/strings/utf_string_conversions.h" #include "content/public/renderer/android_content_detection_prefixes.h" #include "net/base/escape.h" -#include "third_party/icu/public/i18n/unicode/regex.h" +#include "third_party/icu/source/i18n/unicode/regex.h" namespace { diff --git a/content/renderer/date_time_formatter.cc b/content/renderer/date_time_formatter.cc index f9d02ed..7cdc4bd 100644 --- a/content/renderer/date_time_formatter.cc +++ b/content/renderer/date_time_formatter.cc @@ -8,7 +8,7 @@ #include "base/strings/utf_string_conversions.h" #include "third_party/WebKit/public/platform/WebCString.h" #include "third_party/WebKit/public/web/WebDateTimeChooserParams.h" -#include "third_party/icu/public/i18n/unicode/smpdtfmt.h" +#include "third_party/icu/source/i18n/unicode/smpdtfmt.h" namespace content { diff --git a/content/renderer/date_time_formatter.h b/content/renderer/date_time_formatter.h index c01a2b1..ad4c020 100644 --- a/content/renderer/date_time_formatter.h +++ b/content/renderer/date_time_formatter.h @@ -9,8 +9,8 @@ #include "base/basictypes.h" #include "content/common/content_export.h" -#include "third_party/icu/public/common/unicode/unistr.h" -#include "third_party/icu/public/i18n/unicode/gregocal.h" +#include "third_party/icu/source/common/unicode/unistr.h" +#include "third_party/icu/source/i18n/unicode/gregocal.h" #include "ui/base/ime/text_input_type.h" namespace WebKit { diff --git a/content/renderer/date_time_formatter_unittest.cc b/content/renderer/date_time_formatter_unittest.cc index b5afc1c..5b61b71 100644 --- a/content/renderer/date_time_formatter_unittest.cc +++ b/content/renderer/date_time_formatter_unittest.cc @@ -8,7 +8,7 @@ #include "content/renderer/renderer_date_time_picker.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/WebKit/public/web/WebDateTimeChooserParams.h" -#include "third_party/icu/public/common/unicode/unistr.h" +#include "third_party/icu/source/common/unicode/unistr.h" #include "ui/base/ime/text_input_type.h" namespace content { diff --git a/content/renderer/hyphenator/hyphenator.cc b/content/renderer/hyphenator/hyphenator.cc index f638c07..b94ba3c 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 "third_party/icu/public/common/unicode/uscript.h" +#include "third_party/icu/source/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 49c3589a..44d5166 100644 --- a/content/renderer/renderer_main_platform_delegate_win.cc +++ b/content/renderer/renderer_main_platform_delegate_win.cc @@ -15,7 +15,7 @@ #include "content/renderer/render_thread_impl.h" #include "sandbox/win/src/sandbox.h" #include "skia/ext/vector_platform_device_emf_win.h" -#include "third_party/icu/public/i18n/unicode/timezone.h" +#include "third_party/icu/source/i18n/unicode/timezone.h" #include "third_party/skia/include/ports/SkTypeface_win.h" #ifdef ENABLE_VTUNE_JIT_INTERFACE |