diff options
| author | sanjeevr@chromium.org <sanjeevr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-09 05:33:17 +0000 |
|---|---|---|
| committer | sanjeevr@chromium.org <sanjeevr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-09 05:33:17 +0000 |
| commit | 0b3a4c08db4956ce3bdd57f09fe7878a03a170d4 (patch) | |
| tree | 43ade3a012590481a08a96218c5e856169bb3a7e /jingle/notifier/communicator/login.cc | |
| parent | b8400aab032d7976ec07a69a61756c305d9283ec (diff) | |
| download | chromium_src-0b3a4c08db4956ce3bdd57f09fe7878a03a170d4.zip chromium_src-0b3a4c08db4956ce3bdd57f09fe7878a03a170d4.tar.gz chromium_src-0b3a4c08db4956ce3bdd57f09fe7878a03a170d4.tar.bz2 | |
Added support for other authentication mechanisms in jingle. This will allow us to use OAuth2 tokens when OAuth2 support is ready in Talk.
BUG=None
TEST=Test cloud print and sync for regressions.
Review URL: http://codereview.chromium.org/6649006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@77434 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'jingle/notifier/communicator/login.cc')
| -rw-r--r-- | jingle/notifier/communicator/login.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/jingle/notifier/communicator/login.cc b/jingle/notifier/communicator/login.cc index b19169c..6b1119b 100644 --- a/jingle/notifier/communicator/login.cc +++ b/jingle/notifier/communicator/login.cc @@ -37,7 +37,8 @@ Login::Login(Delegate* delegate, net::CertVerifier* cert_verifier, ServerInformation* server_list, int server_count, - bool try_ssltcp_first) + bool try_ssltcp_first, + const std::string& auth_mechanism) : delegate_(delegate), login_settings_(new LoginSettings(user_settings, options, @@ -45,7 +46,8 @@ Login::Login(Delegate* delegate, cert_verifier, server_list, server_count, - try_ssltcp_first)), + try_ssltcp_first, + auth_mechanism)), redirect_port_(0) { net::NetworkChangeNotifier::AddIPAddressObserver(this); ResetReconnectState(); |