summaryrefslogtreecommitdiffstats
path: root/jingle/jingle.gyp
diff options
context:
space:
mode:
authorakalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-16 17:12:08 +0000
committerakalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-16 17:12:08 +0000
commit0590a140d2291f2aebfb54179f1282d798faa6a8 (patch)
treecc8eba1baa094554d03b3727d12cf1f3ab1f95fc /jingle/jingle.gyp
parent37b01e6d24bf3c251708cff470b65b2574c582b5 (diff)
downloadchromium_src-0590a140d2291f2aebfb54179f1282d798faa6a8.zip
chromium_src-0590a140d2291f2aebfb54179f1282d798faa6a8.tar.gz
chromium_src-0590a140d2291f2aebfb54179f1282d798faa6a8.tar.bz2
[Sync] Merged MediatorThread and PushNotificationsThread
Removed most of the legacy XMPP notification code. Simplified notification structs and calls a bit. BUG=76130 TEST= Review URL: http://codereview.chromium.org/6693007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@78385 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'jingle/jingle.gyp')
-rw-r--r--jingle/jingle.gyp14
1 files changed, 3 insertions, 11 deletions
diff --git a/jingle/jingle.gyp b/jingle/jingle.gyp
index fbc1b72..06e27f9 100644
--- a/jingle/jingle.gyp
+++ b/jingle/jingle.gyp
@@ -46,25 +46,18 @@
'notifier/communicator/single_login_attempt.h',
'notifier/communicator/xmpp_connection_generator.cc',
'notifier/communicator/xmpp_connection_generator.h',
- 'notifier/listener/listen_task.cc',
- 'notifier/listener/listen_task.h',
'notifier/listener/mediator_thread.h',
'notifier/listener/mediator_thread_impl.cc',
'notifier/listener/mediator_thread_impl.h',
'notifier/listener/notification_constants.cc',
'notifier/listener/notification_constants.h',
- 'notifier/listener/notification_defines.cc',
'notifier/listener/notification_defines.h',
'notifier/listener/push_notifications_listen_task.cc',
'notifier/listener/push_notifications_listen_task.h',
+ 'notifier/listener/push_notifications_send_update_task.cc',
+ 'notifier/listener/push_notifications_send_update_task.h',
'notifier/listener/push_notifications_subscribe_task.cc',
'notifier/listener/push_notifications_subscribe_task.h',
- 'notifier/listener/push_notifications_thread.cc',
- 'notifier/listener/push_notifications_thread.h',
- 'notifier/listener/send_update_task.cc',
- 'notifier/listener/send_update_task.h',
- 'notifier/listener/subscribe_task.cc',
- 'notifier/listener/subscribe_task.h',
'notifier/listener/talk_mediator.h',
'notifier/listener/talk_mediator_impl.cc',
'notifier/listener/talk_mediator_impl.h',
@@ -118,10 +111,9 @@
'notifier/communicator/xmpp_connection_generator_unittest.cc',
'notifier/listener/mediator_thread_mock.cc',
'notifier/listener/mediator_thread_mock.h',
+ 'notifier/listener/push_notifications_send_update_task_unittest.cc',
'notifier/listener/push_notifications_subscribe_task_unittest.cc',
'notifier/listener/talk_mediator_unittest.cc',
- 'notifier/listener/send_update_task_unittest.cc',
- 'notifier/listener/subscribe_task_unittest.cc',
'notifier/listener/xml_element_util_unittest.cc',
],
'include_dirs': [