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

Side by Side Diff: remoting/protocol/negotiating_client_authenticator.cc

Issue 14522010: remoting: Remove use of ALLOW_THIS_IN_INITIALIZER_LIST. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix Created 7 years, 7 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 | Annotate | Revision Log
« no previous file with comments | « remoting/protocol/message_reader.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 #include "remoting/protocol/negotiating_client_authenticator.h" 5 #include "remoting/protocol/negotiating_client_authenticator.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <sstream> 8 #include <sstream>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 10 matching lines...) Expand all
21 NegotiatingClientAuthenticator::NegotiatingClientAuthenticator( 21 NegotiatingClientAuthenticator::NegotiatingClientAuthenticator(
22 const std::string& authentication_tag, 22 const std::string& authentication_tag,
23 const FetchSecretCallback& fetch_secret_callback, 23 const FetchSecretCallback& fetch_secret_callback,
24 scoped_ptr<ThirdPartyClientAuthenticator::TokenFetcher> token_fetcher, 24 scoped_ptr<ThirdPartyClientAuthenticator::TokenFetcher> token_fetcher,
25 const std::vector<AuthenticationMethod>& methods) 25 const std::vector<AuthenticationMethod>& methods)
26 : NegotiatingAuthenticatorBase(MESSAGE_READY), 26 : NegotiatingAuthenticatorBase(MESSAGE_READY),
27 authentication_tag_(authentication_tag), 27 authentication_tag_(authentication_tag),
28 fetch_secret_callback_(fetch_secret_callback), 28 fetch_secret_callback_(fetch_secret_callback),
29 token_fetcher_(token_fetcher.Pass()), 29 token_fetcher_(token_fetcher.Pass()),
30 method_set_by_host_(false), 30 method_set_by_host_(false),
31 weak_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)) { 31 weak_factory_(this) {
32 DCHECK(!methods.empty()); 32 DCHECK(!methods.empty());
33 for (std::vector<AuthenticationMethod>::const_iterator it = methods.begin(); 33 for (std::vector<AuthenticationMethod>::const_iterator it = methods.begin();
34 it != methods.end(); ++it) { 34 it != methods.end(); ++it) {
35 AddMethod(*it); 35 AddMethod(*it);
36 } 36 }
37 } 37 }
38 38
39 NegotiatingClientAuthenticator::~NegotiatingClientAuthenticator() { 39 NegotiatingClientAuthenticator::~NegotiatingClientAuthenticator() {
40 } 40 }
41 41
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after
121 const std::string& shared_secret) { 121 const std::string& shared_secret) {
122 current_authenticator_ = V2Authenticator::CreateForClient( 122 current_authenticator_ = V2Authenticator::CreateForClient(
123 AuthenticationMethod::ApplyHashFunction( 123 AuthenticationMethod::ApplyHashFunction(
124 current_method_.hash_function(), authentication_tag_, shared_secret), 124 current_method_.hash_function(), authentication_tag_, shared_secret),
125 initial_state); 125 initial_state);
126 resume_callback.Run(); 126 resume_callback.Run();
127 } 127 }
128 128
129 } // namespace protocol 129 } // namespace protocol
130 } // namespace remoting 130 } // namespace remoting
OLDNEW
« no previous file with comments | « remoting/protocol/message_reader.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698