diff options
| author | Ben Murdoch <benm@google.com> | 2014-04-01 10:55:12 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2014-04-01 10:55:12 +0100 |
| commit | 4ad1aa43a48567659193a298fad74f55e00b3dd9 (patch) | |
| tree | b98c2a945dbec61aeb9edef5e371f905e7ab5b37 /extensions/extensions.gyp | |
| parent | e92e8c41ae2718e381c0796a2c0b115a7d017a21 (diff) | |
| download | chromium_org-4ad1aa43a48567659193a298fad74f55e00b3dd9.tar.gz | |
Merge from Chromium at DEPS revision 260540
This commit was generated by merge_to_master.py.
Change-Id: I10b8e4931992bb84eb4da800a337bbd0a52f6588
Diffstat (limited to 'extensions/extensions.gyp')
| -rw-r--r-- | extensions/extensions.gyp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/extensions/extensions.gyp b/extensions/extensions.gyp index 99a3b076c0..9fff410c93 100644 --- a/extensions/extensions.gyp +++ b/extensions/extensions.gyp @@ -28,6 +28,12 @@ ], 'sources': [ 'common/api/messaging/message.h', + 'common/api/sockets/sockets_manifest_handler.cc', + 'common/api/sockets/sockets_manifest_handler.h', + 'common/api/sockets/sockets_manifest_data.cc', + 'common/api/sockets/sockets_manifest_data.h', + 'common/api/sockets/sockets_manifest_permission.cc', + 'common/api/sockets/sockets_manifest_permission.h', 'common/common_manifest_handlers.cc', 'common/common_manifest_handlers.h', 'common/crx_file.cc', @@ -311,6 +317,7 @@ 'browser/pref_names.h', 'browser/process_manager.cc', 'browser/process_manager.h', + 'browser/process_manager_observer.h', 'browser/process_map.cc', 'browser/process_map.h', 'browser/process_map_factory.cc', |