Index: chrome/browser/ui/login/login_prompt_win.cc |
=================================================================== |
--- chrome/browser/ui/login/login_prompt_win.cc (revision 73855) |
+++ chrome/browser/ui/login/login_prompt_win.cc (working copy) |
@@ -4,6 +4,7 @@ |
#include "chrome/browser/ui/login/login_prompt.h" |
+#include "base/utf_string_conversions.h" |
#include "chrome/browser/browser_thread.h" |
#include "chrome/browser/password_manager/password_manager.h" |
#include "chrome/browser/renderer_host/render_process_host.h" |
@@ -101,14 +102,15 @@ |
// LoginHandler: |
virtual void BuildViewForPasswordManager(PasswordManager* manager, |
- std::wstring explanation) { |
+ const string16& explanation) { |
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); |
TabContents* tab_contents = GetTabContentsForLogin(); |
bool should_focus_view = !tab_contents->delegate() || |
tab_contents->delegate()->ShouldFocusConstrainedWindow(); |
- LoginView* view = new LoginView(explanation, should_focus_view); |
+ LoginView* view = new LoginView(UTF16ToWideHack(explanation), |
+ should_focus_view); |
// Set the model for the login view. The model (password manager) is owned |
// by the view's parent TabContents, so natural destruction order means we |