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

Unified Diff: chrome/browser/ui/login/login_prompt_win.cc

Issue 6312154: Remove wstring from RVH's run Javascript command.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 years, 11 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 side-by-side diff with in-line comments
Download patch
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

Powered by Google App Engine
This is Rietveld 408576698