diff options
| author | Torne (Richard Coles) <torne@google.com> | 2013-08-05 13:57:33 +0100 |
|---|---|---|
| committer | Torne (Richard Coles) <torne@google.com> | 2013-08-05 13:57:33 +0100 |
| commit | a36e5920737c6adbddd3e43b760e5de8431db6e0 (patch) | |
| tree | 347d048bb8c8828d50113bf94ace40bf0613f2cd /chrome/chrome_common.gypi | |
| parent | 34378da0e9429d394aafdaa771301aff58447cb1 (diff) | |
| download | chromium_org-a36e5920737c6adbddd3e43b760e5de8431db6e0.tar.gz | |
Merge from Chromium at DEPS revision r215573
This commit was generated by merge_to_master.py.
Change-Id: Ib95814f98e5765b459dd32425f9bf9138edf2bca
Diffstat (limited to 'chrome/chrome_common.gypi')
| -rw-r--r-- | chrome/chrome_common.gypi | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/chrome/chrome_common.gypi b/chrome/chrome_common.gypi index fde3124a61..4647180c3f 100644 --- a/chrome/chrome_common.gypi +++ b/chrome/chrome_common.gypi @@ -386,6 +386,8 @@ 'common/mac/objc_zombie.h', 'common/mac/objc_zombie.mm', 'common/media/webrtc_logging_messages.h', + 'common/metrics/caching_permuted_entropy_provider.cc', + 'common/metrics/caching_permuted_entropy_provider.h', 'common/metrics/entropy_provider.cc', 'common/metrics/entropy_provider.h', 'common/metrics/metrics_log_base.cc', @@ -513,10 +515,10 @@ }], ['OS=="win" or OS=="mac"', { 'sources': [ - 'common/itunes_library.cc', - 'common/itunes_library.h', - 'common/itunes_xml_utils.cc', - 'common/itunes_xml_utils.h', + 'common/media_galleries/itunes_library.cc', + 'common/media_galleries/itunes_library.h', + 'common/media_galleries/itunes_xml_utils.cc', + 'common/media_galleries/itunes_xml_utils.h', 'common/media_galleries/picasa_types.cc', 'common/media_galleries/picasa_types.h', 'common/media_galleries/pmp_constants.h', |