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 /ash | |
| 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 'ash')
| -rw-r--r-- | ash/system/chromeos/power/tray_power.cc | 4 | ||||
| -rw-r--r-- | ash/system/date/date_view.cc | 6 | ||||
| -rw-r--r-- | ash/system/date/tray_date.cc | 6 |
3 files changed, 8 insertions, 8 deletions
diff --git a/ash/system/chromeos/power/tray_power.cc b/ash/system/chromeos/power/tray_power.cc index 4fe4e68..cdf5300 100644 --- a/ash/system/chromeos/power/tray_power.cc +++ b/ash/system/chromeos/power/tray_power.cc @@ -13,8 +13,8 @@ #include "base/command_line.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/icu/source/i18n/unicode/fieldpos.h" +#include "third_party/icu/source/i18n/unicode/fmtable.h" #include "ui/base/accessibility/accessible_view_state.h" #include "ui/base/resource/resource_bundle.h" #include "ui/message_center/message_center.h" diff --git a/ash/system/date/date_view.cc b/ash/system/date/date_view.cc index 68789fc..cc1552d 100644 --- a/ash/system/date/date_view.cc +++ b/ash/system/date/date_view.cc @@ -12,9 +12,9 @@ #include "base/strings/utf_string_conversions.h" #include "base/time/time.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 "third_party/icu/source/i18n/unicode/datefmt.h" +#include "third_party/icu/source/i18n/unicode/dtptngen.h" +#include "third_party/icu/source/i18n/unicode/smpdtfmt.h" #include "ui/base/l10n/l10n_util.h" #include "ui/views/controls/label.h" #include "ui/views/layout/box_layout.h" diff --git a/ash/system/date/tray_date.cc b/ash/system/date/tray_date.cc index 0e245a8..8cd22e5 100644 --- a/ash/system/date/tray_date.cc +++ b/ash/system/date/tray_date.cc @@ -21,9 +21,9 @@ #include "base/timer/timer.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/icu/source/i18n/unicode/datefmt.h" +#include "third_party/icu/source/i18n/unicode/fieldpos.h" +#include "third_party/icu/source/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" |