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

Side by Side Diff: remoting/jingle_glue/jingle_client.cc

Issue 2801003: Tighten up compile warnings based to match other chromium sub-projects.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 10 years, 6 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/jingle_glue/jingle_channel.cc ('k') | remoting/jingle_glue/jingle_thread.cc » ('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 // TODO(ajwong): Check the initialization sentinels. Can we base it off of 5 // TODO(ajwong): Check the initialization sentinels. Can we base it off of
6 // state_ instead of a member variable? Also, we assign and read from a few of 6 // state_ instead of a member variable? Also, we assign and read from a few of
7 // the member variables on two threads. We need to audit this for thread 7 // the member variables on two threads. We need to audit this for thread
8 // safety. 8 // safety.
9 9
10 #include "remoting/jingle_glue/jingle_client.h" 10 #include "remoting/jingle_glue/jingle_client.h"
(...skipping 161 matching lines...) Expand 10 before | Expand all | Expand 10 after
172 case buzz::XmppEngine::STATE_OPEN: 172 case buzz::XmppEngine::STATE_OPEN:
173 { 173 {
174 AutoLock auto_lock(full_jid_lock_); 174 AutoLock auto_lock(full_jid_lock_);
175 full_jid_ = client_->jid().Str(); 175 full_jid_ = client_->jid().Str();
176 } 176 }
177 UpdateState(CONNECTED); 177 UpdateState(CONNECTED);
178 break; 178 break;
179 case buzz::XmppEngine::STATE_CLOSED: 179 case buzz::XmppEngine::STATE_CLOSED:
180 UpdateState(CLOSED); 180 UpdateState(CLOSED);
181 break; 181 break;
182 default:
183 NOTREACHED();
184 break;
182 } 185 }
183 } 186 }
184 187
185 void JingleClient::OnIncomingTunnel( 188 void JingleClient::OnIncomingTunnel(
186 cricket::TunnelSessionClient* client, buzz::Jid jid, 189 cricket::TunnelSessionClient* client, buzz::Jid jid,
187 std::string description, cricket::Session* session) { 190 std::string description, cricket::Session* session) {
188 // Decline connection if we don't have callback. 191 // Decline connection if we don't have callback.
189 if (!callback_) { 192 if (!callback_) {
190 client->DeclineTunnel(session); 193 client->DeclineTunnel(session);
191 return; 194 return;
(...skipping 22 matching lines...) Expand all
214 } 217 }
215 218
216 buzz::PreXmppAuth* JingleClient::CreatePreXmppAuth( 219 buzz::PreXmppAuth* JingleClient::CreatePreXmppAuth(
217 const buzz::XmppClientSettings& settings) { 220 const buzz::XmppClientSettings& settings) {
218 buzz::Jid jid(settings.user(), settings.host(), buzz::STR_EMPTY); 221 buzz::Jid jid(settings.user(), settings.host(), buzz::STR_EMPTY);
219 return new notifier::GaiaTokenPreXmppAuth(jid.Str(), settings.auth_cookie(), 222 return new notifier::GaiaTokenPreXmppAuth(jid.Str(), settings.auth_cookie(),
220 settings.token_service()); 223 settings.token_service());
221 } 224 }
222 225
223 } // namespace remoting 226 } // namespace remoting
OLDNEW
« no previous file with comments | « remoting/jingle_glue/jingle_channel.cc ('k') | remoting/jingle_glue/jingle_thread.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698