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

Side by Side Diff: net/http/http_network_transaction.cc

Issue 3040016: Net: Convert username and password to string16. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: address comments Created 10 years, 4 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 | « net/http/http_network_transaction.h ('k') | net/http/http_network_transaction_unittest.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 #include "net/http/http_network_transaction.h" 5 #include "net/http/http_network_transaction.h"
6 6
7 #include <set> 7 #include <set>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
(...skipping 300 matching lines...) Expand 10 before | Expand all | Expand 10 after
311 // Reset the other member variables. 311 // Reset the other member variables.
312 // Note: this is necessary only with SSL renegotiation. 312 // Note: this is necessary only with SSL renegotiation.
313 ResetStateForRestart(); 313 ResetStateForRestart();
314 int rv = DoLoop(OK); 314 int rv = DoLoop(OK);
315 if (rv == ERR_IO_PENDING) 315 if (rv == ERR_IO_PENDING)
316 user_callback_ = callback; 316 user_callback_ = callback;
317 return rv; 317 return rv;
318 } 318 }
319 319
320 int HttpNetworkTransaction::RestartWithAuth( 320 int HttpNetworkTransaction::RestartWithAuth(
321 const std::wstring& username, 321 const string16& username,
322 const std::wstring& password, 322 const string16& password,
323 CompletionCallback* callback) { 323 CompletionCallback* callback) {
324 HttpAuth::Target target = pending_auth_target_; 324 HttpAuth::Target target = pending_auth_target_;
325 if (target == HttpAuth::AUTH_NONE) { 325 if (target == HttpAuth::AUTH_NONE) {
326 NOTREACHED(); 326 NOTREACHED();
327 return ERR_UNEXPECTED; 327 return ERR_UNEXPECTED;
328 } 328 }
329 pending_auth_target_ = HttpAuth::AUTH_NONE; 329 pending_auth_target_ = HttpAuth::AUTH_NONE;
330 330
331 auth_controllers_[target]->ResetAuth(username, password); 331 auth_controllers_[target]->ResetAuth(username, password);
332 332
(...skipping 1492 matching lines...) Expand 10 before | Expand all | Expand 10 after
1825 default: 1825 default:
1826 description = StringPrintf("Unknown state 0x%08X (%u)", state, state); 1826 description = StringPrintf("Unknown state 0x%08X (%u)", state, state);
1827 break; 1827 break;
1828 } 1828 }
1829 return description; 1829 return description;
1830 } 1830 }
1831 1831
1832 #undef STATE_CASE 1832 #undef STATE_CASE
1833 1833
1834 } // namespace net 1834 } // namespace net
OLDNEW
« no previous file with comments | « net/http/http_network_transaction.h ('k') | net/http/http_network_transaction_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698