jingle/jingle.gyp - Issue 3358028: Revert r59012 which started using Chrome sockets for sync.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: jingle/jingle.gyp

Issue 3358028: Revert r59012 which started using Chrome sockets for sync. (Closed) Base URL: http://src.chromium.org/git/chromium.git

Patch Set: Created 10 years, 3 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: jingle/jingle.gyp

diff --git a/jingle/jingle.gyp b/jingle/jingle.gyp

index 79ee3500b991c2754697b4a1a8ab0e27be44144f..2f01fff61a8282f963bf1ce46192421d9155192c 100644

--- a/jingle/jingle.gyp

+++ b/jingle/jingle.gyp

@@ -17,11 +17,15 @@

'sources': [

'notifier/base/chrome_async_socket.cc',

'notifier/base/chrome_async_socket.h',

+ 'notifier/base/signal_thread_task.h',

+ 'notifier/base/ssl_adapter.h',

+ 'notifier/base/ssl_adapter.cc',

'notifier/base/fake_ssl_client_socket.cc',

'notifier/base/fake_ssl_client_socket.h',

'notifier/base/notification_method.h',

'notifier/base/notification_method.cc',

'notifier/base/notifier_options.h',

+ 'notifier/base/static_assert.h',

'notifier/base/task_pump.cc',

'notifier/base/task_pump.h',

'notifier/base/xmpp_client_socket_factory.cc',

@@ -40,10 +44,16 @@

'notifier/communicator/login_failure.h',

'notifier/communicator/login_settings.cc',

'notifier/communicator/login_settings.h',

+ 'notifier/communicator/product_info.cc',

+ 'notifier/communicator/product_info.h',

'notifier/communicator/single_login_attempt.cc',

'notifier/communicator/single_login_attempt.h',

+ 'notifier/communicator/ssl_socket_adapter.cc',

+ 'notifier/communicator/ssl_socket_adapter.h',

'notifier/communicator/xmpp_connection_generator.cc',

'notifier/communicator/xmpp_connection_generator.h',

+ 'notifier/communicator/xmpp_socket_adapter.cc',

+ 'notifier/communicator/xmpp_socket_adapter.h',

'notifier/listener/listen_task.cc',

'notifier/listener/listen_task.h',

'notifier/listener/mediator_thread.h',

@@ -67,6 +77,7 @@

'defines' : [

'_CRT_SECURE_NO_WARNINGS',

'_USE_32BIT_TIME_T',

+ 'kXmppProductName="chromium-sync"',

'dependencies': [

'../base/base.gyp:base',

« no previous file with comments | « chrome/common/chrome_switches.cc ('k') | jingle/notifier/base/notifier_options.h » ('j') | no next file with comments »