| Index: jingle/notifier/base/notifier_options.h
|
| ===================================================================
|
| --- jingle/notifier/base/notifier_options.h (revision 77421)
|
| +++ jingle/notifier/base/notifier_options.h (working copy)
|
| @@ -5,17 +5,15 @@
|
| #ifndef JINGLE_NOTIFIER_BASE_NOTIFIER_OPTIONS_H_
|
| #define JINGLE_NOTIFIER_BASE_NOTIFIER_OPTIONS_H_
|
|
|
| +#include <string>
|
| +
|
| #include "jingle/notifier/base/notification_method.h"
|
| #include "net/base/host_port_pair.h"
|
|
|
| namespace notifier {
|
|
|
| struct NotifierOptions {
|
| - NotifierOptions()
|
| - : try_ssltcp_first(false),
|
| - allow_insecure_connection(false),
|
| - invalidate_xmpp_login(false),
|
| - notification_method(kDefaultNotificationMethod) {}
|
| + NotifierOptions();
|
|
|
| // Indicates that the SSLTCP port (443) is to be tried before the the XMPP
|
| // port (5222) during login.
|
| @@ -36,6 +34,9 @@
|
| // Indicates the method used by sync clients while sending and listening to
|
| // notifications.
|
| NotificationMethod notification_method;
|
| +
|
| + // Specifies the auth mechanism to use ("X-GOOGLE-TOKEN", "X-OAUTH2", etc),
|
| + std::string auth_mechanism;
|
| };
|
|
|
| } // namespace notifier
|
|
|