diff options
| author | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-29 06:15:44 +0000 |
|---|---|---|
| committer | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-29 06:15:44 +0000 |
| commit | 13c8a0903376ff406151679d8673a6452d721290 (patch) | |
| tree | dbb5b8e9503f8d0ee447863089f3e6f23692910f /net/spdy | |
| parent | 6b55570f03236557b8b966b08dfbdda1ea91aadc (diff) | |
| download | chromium_src-13c8a0903376ff406151679d8673a6452d721290.zip chromium_src-13c8a0903376ff406151679d8673a6452d721290.tar.gz chromium_src-13c8a0903376ff406151679d8673a6452d721290.tar.bz2 | |
Net: Convert username and password to string16.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/3040016
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@54101 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/spdy')
| -rw-r--r-- | net/spdy/spdy_network_transaction.cc | 8 | ||||
| -rw-r--r-- | net/spdy/spdy_network_transaction.h | 14 |
2 files changed, 12 insertions, 10 deletions
diff --git a/net/spdy/spdy_network_transaction.cc b/net/spdy/spdy_network_transaction.cc index 6e0c930..e575ad0 100644 --- a/net/spdy/spdy_network_transaction.cc +++ b/net/spdy/spdy_network_transaction.cc @@ -1,9 +1,11 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2010 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. #include "net/spdy/spdy_network_transaction.h" +#include <string> + #include "base/compiler_specific.h" #include "base/logging.h" #include "base/scoped_ptr.h" @@ -78,8 +80,8 @@ int SpdyNetworkTransaction::RestartWithCertificate( } int SpdyNetworkTransaction::RestartWithAuth( - const std::wstring& username, - const std::wstring& password, + const string16& username, + const string16& password, CompletionCallback* callback) { // TODO(mbelshe): implement me. NOTIMPLEMENTED(); diff --git a/net/spdy/spdy_network_transaction.h b/net/spdy/spdy_network_transaction.h index 92357ac..7df2e64 100644 --- a/net/spdy/spdy_network_transaction.h +++ b/net/spdy/spdy_network_transaction.h @@ -1,17 +1,17 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2010 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef NET_SPDY_NETWORK_TRANSACTION_H_ -#define NET_SPDY_NETWORK_TRANSACTION_H_ +#ifndef NET_SPDY_SPDY_NETWORK_TRANSACTION_H_ +#define NET_SPDY_SPDY_NETWORK_TRANSACTION_H_ #pragma once -#include <string> #include <deque> #include "base/basictypes.h" #include "base/ref_counted.h" #include "base/scoped_ptr.h" +#include "base/string16.h" #include "base/time.h" #include "net/base/completion_callback.h" #include "net/base/load_states.h" @@ -43,8 +43,8 @@ class SpdyNetworkTransaction : public HttpTransaction { virtual int RestartIgnoringLastError(CompletionCallback* callback); virtual int RestartWithCertificate(X509Certificate* client_cert, CompletionCallback* callback); - virtual int RestartWithAuth(const std::wstring& username, - const std::wstring& password, + virtual int RestartWithAuth(const string16& username, + const string16& password, CompletionCallback* callback); virtual bool IsReadyToRestartForAuth() { return false; } virtual int Read(IOBuffer* buf, int buf_len, CompletionCallback* callback); @@ -121,4 +121,4 @@ class SpdyNetworkTransaction : public HttpTransaction { } // namespace net -#endif // NET_SPDY_NETWORK_TRANSACTION_H_ +#endif // NET_SPDY_SPDY_NETWORK_TRANSACTION_H_ |