| Index: chrome/browser/ui/login/login_prompt.h
|
| ===================================================================
|
| --- chrome/browser/ui/login/login_prompt.h (revision 73805)
|
| +++ chrome/browser/ui/login/login_prompt.h (working copy)
|
| @@ -40,7 +40,7 @@
|
|
|
| // Initializes the underlying platform specific view.
|
| virtual void BuildViewForPasswordManager(PasswordManager* manager,
|
| - std::wstring explanation) = 0;
|
| + const string16& explanation) = 0;
|
|
|
| // Sets information about the authentication type (|form|) and the
|
| // |password_manager| for this profile.
|
| @@ -52,7 +52,7 @@
|
|
|
| // Resend the request with authentication credentials.
|
| // This function can be called from either thread.
|
| - void SetAuth(const std::wstring& username, const std::wstring& password);
|
| + void SetAuth(const string16& username, const string16& password);
|
|
|
| // Display the error page without asking for credentials again.
|
| // This function can be called from either thread.
|
| @@ -95,8 +95,8 @@
|
| void RemoveObservers();
|
|
|
| // Notify observers that authentication is supplied.
|
| - void NotifyAuthSupplied(const std::wstring& username,
|
| - const std::wstring& password);
|
| + void NotifyAuthSupplied(const string16& username,
|
| + const string16& password);
|
|
|
| // Notify observers that authentication is cancelled.
|
| void NotifyAuthCancelled();
|
| @@ -106,8 +106,8 @@
|
| bool TestAndSetAuthHandled();
|
|
|
| // Calls SetAuth from the IO loop.
|
| - void SetAuthDeferred(const std::wstring& username,
|
| - const std::wstring& password);
|
| + void SetAuthDeferred(const string16& username,
|
| + const string16& password);
|
|
|
| // Calls CancelAuth from the IO loop.
|
| void CancelAuthDeferred();
|
| @@ -175,20 +175,20 @@
|
| class AuthSuppliedLoginNotificationDetails : public LoginNotificationDetails {
|
| public:
|
| AuthSuppliedLoginNotificationDetails(LoginHandler* handler,
|
| - const std::wstring& username,
|
| - const std::wstring& password)
|
| + const string16& username,
|
| + const string16& password)
|
| : LoginNotificationDetails(handler),
|
| username_(username),
|
| password_(password) {}
|
| - const std::wstring& username() const { return username_; }
|
| - const std::wstring& password() const { return password_; }
|
| + const string16& username() const { return username_; }
|
| + const string16& password() const { return password_; }
|
|
|
| private:
|
| // The username that was used for the authentication.
|
| - const std::wstring username_;
|
| + const string16 username_;
|
|
|
| // The password that was used for the authentication.
|
| - const std::wstring password_;
|
| + const string16 password_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(AuthSuppliedLoginNotificationDetails);
|
| };
|
|
|