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 /webkit | |
| 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 'webkit')
| -rw-r--r-- | webkit/fileapi/file_system_dir_url_request_job_unittest.cc | 2 | ||||
| -rw-r--r-- | webkit/glue/webpreferences.cc | 2 |
2 files changed, 2 insertions, 2 deletions
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; |