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

Unified Diff: jingle/notifier/base/notifier_options.h

Issue 6649006: Added support for other authentication mechanisms in jingle. This will allow ... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Review comments addressed Created 9 years, 9 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
« no previous file with comments | « jingle/jingle.gyp ('k') | jingle/notifier/base/notifier_options.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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
« no previous file with comments | « jingle/jingle.gyp ('k') | jingle/notifier/base/notifier_options.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698