Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(117)

Side by Side Diff: jingle/notifier/base/notifier_options.h

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 unified diff | Download patch
« no previous file with comments | « jingle/jingle.gyp ('k') | jingle/notifier/base/signal_thread_task.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef JINGLE_NOTIFIER_BASE_NOTIFIER_OPTIONS_H_ 5 #ifndef JINGLE_NOTIFIER_BASE_NOTIFIER_OPTIONS_H_
6 #define JINGLE_NOTIFIER_BASE_NOTIFIER_OPTIONS_H_ 6 #define JINGLE_NOTIFIER_BASE_NOTIFIER_OPTIONS_H_
7 7
8 #include "jingle/notifier/base/notification_method.h" 8 #include "jingle/notifier/base/notification_method.h"
9 #include "net/base/host_port_pair.h" 9 #include "net/base/host_port_pair.h"
10 10
11 namespace notifier { 11 namespace notifier {
12 12
13 struct NotifierOptions { 13 struct NotifierOptions {
14 NotifierOptions() 14 NotifierOptions()
15 : try_ssltcp_first(false), 15 : use_chrome_async_socket(true),
16 try_ssltcp_first(false),
16 notification_method(kDefaultNotificationMethod) {} 17 notification_method(kDefaultNotificationMethod) {}
17 18
18 NotifierOptions(const bool try_ssltcp_first, 19 NotifierOptions(const bool use_chrome_async_socket,
20 const bool try_ssltcp_first,
19 const net::HostPortPair& xmpp_host_port, 21 const net::HostPortPair& xmpp_host_port,
20 NotificationMethod notification_method) 22 NotificationMethod notification_method)
21 : try_ssltcp_first(try_ssltcp_first), 23 : use_chrome_async_socket(use_chrome_async_socket),
24 try_ssltcp_first(try_ssltcp_first),
22 xmpp_host_port(xmpp_host_port), 25 xmpp_host_port(xmpp_host_port),
23 notification_method(notification_method) {} 26 notification_method(notification_method) {}
24 27
28 // Indicates whether to use the chrome-socket-based buzz::AsyncSocket
29 // implementation for notifications.
30 bool use_chrome_async_socket;
31
25 // Indicates that the SSLTCP port (443) is to be tried before the the XMPP 32 // Indicates that the SSLTCP port (443) is to be tried before the the XMPP
26 // port (5222) during login. 33 // port (5222) during login.
27 bool try_ssltcp_first; 34 bool try_ssltcp_first;
28 35
29 // Contains a custom URL and port for the notification server, if one is to 36 // Contains a custom URL and port for the notification server, if one is to
30 // be used. Empty otherwise. 37 // be used. Empty otherwise.
31 net::HostPortPair xmpp_host_port; 38 net::HostPortPair xmpp_host_port;
32 39
33 // Indicates the method used by sync clients while sending and listening to 40 // Indicates the method used by sync clients while sending and listening to
34 // notifications. 41 // notifications.
35 NotificationMethod notification_method; 42 NotificationMethod notification_method;
36 }; 43 };
37 44
38 } // namespace notifier 45 } // namespace notifier
39 46
40 #endif // JINGLE_NOTIFIER_BASE_NOTIFIER_OPTIONS_H_ 47 #endif // JINGLE_NOTIFIER_BASE_NOTIFIER_OPTIONS_H_
OLDNEW
« no previous file with comments | « jingle/jingle.gyp ('k') | jingle/notifier/base/signal_thread_task.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698