summaryrefslogtreecommitdiffstats
path: root/jingle/jingle.gyp
diff options
context:
space:
mode:
authorakalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-17 02:11:48 +0000
committerakalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-17 02:11:48 +0000
commitfc43868654630100e0f5dd7beef20464ea434679 (patch)
treec3cb020b3b42959736480e33ef7c0c6ee050ccee /jingle/jingle.gyp
parent4593aa2be388ee1e028399d43e4e3f4d4491b5a2 (diff)
downloadchromium_src-fc43868654630100e0f5dd7beef20464ea434679.zip
chromium_src-fc43868654630100e0f5dd7beef20464ea434679.tar.gz
chromium_src-fc43868654630100e0f5dd7beef20464ea434679.tar.bz2
[Sync] Replace TalkMediator*/MediatorThread* with PushClient
Streamline methods of PushClient and its Observer subclass. Remove sync/protocol/service_constants.h and consolidate use of each constant in one place. Remove duplicate constant in cloud print code. BUG=76764 TEST= TBR=estade@chromium.org Review URL: https://chromiumcodereview.appspot.com/10398051 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@137615 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'jingle/jingle.gyp')
-rw-r--r--jingle/jingle.gyp13
1 files changed, 3 insertions, 10 deletions
diff --git a/jingle/jingle.gyp b/jingle/jingle.gyp
index 02a5a05..9f9af8b 100644
--- a/jingle/jingle.gyp
+++ b/jingle/jingle.gyp
@@ -75,9 +75,8 @@
'notifier/communicator/login_settings.h',
'notifier/communicator/single_login_attempt.cc',
'notifier/communicator/single_login_attempt.h',
- 'notifier/listener/mediator_thread.h',
- 'notifier/listener/mediator_thread_impl.cc',
- 'notifier/listener/mediator_thread_impl.h',
+ 'notifier/listener/push_client.cc',
+ 'notifier/listener/push_client.h',
'notifier/listener/notification_constants.cc',
'notifier/listener/notification_constants.h',
'notifier/listener/notification_defines.cc',
@@ -88,9 +87,6 @@
'notifier/listener/push_notifications_send_update_task.h',
'notifier/listener/push_notifications_subscribe_task.cc',
'notifier/listener/push_notifications_subscribe_task.h',
- 'notifier/listener/talk_mediator.h',
- 'notifier/listener/talk_mediator_impl.cc',
- 'notifier/listener/talk_mediator_impl.h',
'notifier/listener/xml_element_util.cc',
'notifier/listener/xml_element_util.h',
],
@@ -164,12 +160,9 @@
'notifier/communicator/connection_settings_unittest.cc',
'notifier/communicator/login_settings_unittest.cc',
'notifier/communicator/single_login_attempt_unittest.cc',
- 'notifier/listener/mediator_thread_mock.cc',
- 'notifier/listener/mediator_thread_mock.h',
- 'notifier/listener/mediator_thread_unittest.cc',
+ 'notifier/listener/push_client_unittest.cc',
'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/xml_element_util_unittest.cc',
'run_all_unittests.cc',
],