diff options
18 files changed, 104 insertions, 87 deletions
diff --git a/chrome/browser/extensions/extension_host.cc b/chrome/browser/extensions/extension_host.cc index 25271d8..70c10a6 100644 --- a/chrome/browser/extensions/extension_host.cc +++ b/chrome/browser/extensions/extension_host.cc @@ -410,8 +410,8 @@ void ExtensionHost::DocumentOnLoadCompletedInMainFrame(RenderViewHost* rvh, } void ExtensionHost::RunJavaScriptMessage(const RenderViewHost* rvh, - const std::wstring& message, - const std::wstring& default_prompt, + const string16& message, + const string16& default_prompt, const GURL& frame_url, const int flags, IPC::Message* reply_msg, @@ -432,8 +432,14 @@ void ExtensionHost::RunJavaScriptMessage(const RenderViewHost* rvh, // Unlike for page alerts, navigations aren't a good signal for when to // resume showing alerts, so we can't reasonably stop showing them even if // the extension is spammy. - RunJavascriptMessageBox(profile_, this, frame_url, flags, message, - default_prompt, show_suppress_checkbox, reply_msg); + RunJavascriptMessageBox(profile_, + this, + frame_url, + flags, + UTF16ToWideHack(message), + UTF16ToWideHack(default_prompt), + show_suppress_checkbox, + reply_msg); } else { // If we are suppressing messages, just reply as is if the user immediately // pressed "Cancel". @@ -469,9 +475,11 @@ ExtensionHost* ExtensionHost::AsExtensionHost() { void ExtensionHost::OnMessageBoxClosed(IPC::Message* reply_msg, bool success, - const std::wstring& prompt) { + const std::wstring& user_input) { last_javascript_message_dismissal_ = base::TimeTicks::Now(); - render_view_host()->JavaScriptMessageBoxClosed(reply_msg, success, prompt); + render_view_host()->JavaScriptDialogClosed(reply_msg, + success, + WideToUTF16Hack(user_input)); } void ExtensionHost::SetSuppressMessageBoxes(bool suppress_message_boxes) { diff --git a/chrome/browser/extensions/extension_host.h b/chrome/browser/extensions/extension_host.h index 4a94235..516accf 100644 --- a/chrome/browser/extensions/extension_host.h +++ b/chrome/browser/extensions/extension_host.h @@ -130,8 +130,8 @@ class ExtensionHost : public RenderViewHostDelegate, virtual RenderViewHostDelegate::View* GetViewDelegate(); virtual WebPreferences GetWebkitPrefs(); virtual void RunJavaScriptMessage(const RenderViewHost* rvh, - const std::wstring& message, - const std::wstring& default_prompt, + const string16& message, + const string16& default_prompt, const GURL& frame_url, const int flags, IPC::Message* reply_msg, @@ -190,7 +190,7 @@ class ExtensionHost : public RenderViewHostDelegate, // Overridden from JavaScriptAppModalDialogDelegate: virtual void OnMessageBoxClosed(IPC::Message* reply_msg, bool success, - const std::wstring& prompt); + const std::wstring& user_input); virtual void SetSuppressMessageBoxes(bool suppress_message_boxes); virtual gfx::NativeWindow GetMessageBoxRootWindow(); virtual TabContents* AsTabContents(); diff --git a/chrome/browser/extensions/extension_messages_browsertest.cc b/chrome/browser/extensions/extension_messages_browsertest.cc index f4f7649..40ce0c7 100644 --- a/chrome/browser/extensions/extension_messages_browsertest.cc +++ b/chrome/browser/extensions/extension_messages_browsertest.cc @@ -2,6 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "base/utf_string_conversions.h" #include "base/values.h" #include "chrome/browser/extensions/extension_message_service.h" #include "chrome/common/extensions/extension_messages.h" @@ -85,7 +86,7 @@ TEST_F(RenderViewTest, ExtensionMessagesOpenChannel) { iter = IPC::SyncMessage::GetDataIterator(alert_msg); ViewHostMsg_RunJavaScriptMessage::SendParam alert_param; ASSERT_TRUE(IPC::ReadParam(alert_msg, &iter, &alert_param)); - EXPECT_EQ(L"content got: 42", alert_param.a); + EXPECT_EQ(ASCIIToUTF16("content got: 42"), alert_param.a); } // Tests that the bindings for handling a new channel connection and channel @@ -137,7 +138,7 @@ TEST_F(RenderViewTest, ExtensionMessagesOnConnect) { void* iter = IPC::SyncMessage::GetDataIterator(alert_msg); ViewHostMsg_RunJavaScriptMessage::SendParam alert_param; ASSERT_TRUE(IPC::ReadParam(alert_msg, &iter, &alert_param)); - EXPECT_EQ(L"got: 42", alert_param.a); + EXPECT_EQ(ASCIIToUTF16("got: 42"), alert_param.a); // Now simulate the channel closing. render_thread_.sink().ClearMessages(); @@ -150,5 +151,5 @@ TEST_F(RenderViewTest, ExtensionMessagesOnConnect) { ASSERT_TRUE(alert_msg); iter = IPC::SyncMessage::GetDataIterator(alert_msg); ASSERT_TRUE(IPC::ReadParam(alert_msg, &iter, &alert_param)); - EXPECT_EQ(L"disconnected: 24", alert_param.a); + EXPECT_EQ(ASCIIToUTF16("disconnected: 24"), alert_param.a); } diff --git a/chrome/browser/prerender/prerender_contents.cc b/chrome/browser/prerender/prerender_contents.cc index 5529a5d..03a1046 100644 --- a/chrome/browser/prerender/prerender_contents.cc +++ b/chrome/browser/prerender/prerender_contents.cc @@ -451,12 +451,12 @@ void PrerenderContents::OnJSOutOfMemory() { } void PrerenderContents::OnRunJavaScriptMessage( - const std::wstring& message, - const std::wstring& default_prompt, + const string16& message, + const string16& default_prompt, const GURL& frame_url, const int flags, bool* did_suppress_message, - std::wstring* prompt_field) { + string16* prompt_field) { // Always suppress JavaScript messages if they're triggered by a page being // prerendered. *did_suppress_message = true; diff --git a/chrome/browser/prerender/prerender_contents.h b/chrome/browser/prerender/prerender_contents.h index 221cb85..62fd5f6 100644 --- a/chrome/browser/prerender/prerender_contents.h +++ b/chrome/browser/prerender/prerender_contents.h @@ -118,12 +118,12 @@ class PrerenderContents : public NotificationObserver, bool MatchesURL(const GURL& url, GURL* matching_url) const; void OnJSOutOfMemory(); - void OnRunJavaScriptMessage(const std::wstring& message, - const std::wstring& default_prompt, + void OnRunJavaScriptMessage(const string16& message, + const string16& default_prompt, const GURL& frame_url, const int flags, bool* did_suppress_message, - std::wstring* prompt_field); + string16* prompt_field); virtual void OnRenderViewGone(int status, int exit_code); // TabContentsObserver implementation. diff --git a/chrome/browser/prerender/prerender_render_view_host_observer.cc b/chrome/browser/prerender/prerender_render_view_host_observer.cc index a482c1e..0589fff 100644 --- a/chrome/browser/prerender/prerender_render_view_host_observer.cc +++ b/chrome/browser/prerender/prerender_render_view_host_observer.cc @@ -75,12 +75,12 @@ void PrerenderRenderViewHostObserver::OnJSOutOfMemory() { } void PrerenderRenderViewHostObserver::OnRunJavaScriptMessage( - const std::wstring& message, - const std::wstring& default_prompt, + const string16& message, + const string16& default_prompt, const GURL& frame_url, const int flags, bool* did_suppress_message, - std::wstring* prompt_field) { + string16* prompt_field) { prerender_contents_->OnRunJavaScriptMessage(message, default_prompt, frame_url, diff --git a/chrome/browser/prerender/prerender_render_view_host_observer.h b/chrome/browser/prerender/prerender_render_view_host_observer.h index f1fd362..74a9308 100644 --- a/chrome/browser/prerender/prerender_render_view_host_observer.h +++ b/chrome/browser/prerender/prerender_render_view_host_observer.h @@ -40,12 +40,12 @@ class PrerenderRenderViewHostObserver : public RenderViewHostObserver { private: // Message handlers. void OnJSOutOfMemory(); - void OnRunJavaScriptMessage(const std::wstring& message, - const std::wstring& default_prompt, + void OnRunJavaScriptMessage(const string16& message, + const string16& default_prompt, const GURL& frame_url, const int flags, bool* did_suppress_message, - std::wstring* prompt_field); + string16* prompt_field); void OnRenderViewGone(int status, int exit_code); void OnDidStartProvisionalLoadForFrame(int64 frame_id, bool is_main_frame, diff --git a/chrome/browser/tab_contents/background_contents.cc b/chrome/browser/tab_contents/background_contents.cc index bbeaa1d..cae94e8 100644 --- a/chrome/browser/tab_contents/background_contents.cc +++ b/chrome/browser/tab_contents/background_contents.cc @@ -103,8 +103,8 @@ void BackgroundContents::DidNavigate( void BackgroundContents::RunJavaScriptMessage( const RenderViewHost* rvh, - const std::wstring& message, - const std::wstring& default_prompt, + const string16& message, + const string16& default_prompt, const GURL& frame_url, const int flags, IPC::Message* reply_msg, @@ -139,8 +139,10 @@ void BackgroundContents::Observe(NotificationType type, void BackgroundContents::OnMessageBoxClosed(IPC::Message* reply_msg, bool success, - const std::wstring& prompt) { - render_view_host_->JavaScriptMessageBoxClosed(reply_msg, success, prompt); + const std::wstring& user_input) { + render_view_host()->JavaScriptDialogClosed(reply_msg, + success, + WideToUTF16Hack(user_input)); } gfx::NativeWindow BackgroundContents::GetMessageBoxRootWindow() { diff --git a/chrome/browser/tab_contents/background_contents.h b/chrome/browser/tab_contents/background_contents.h index 4f1902b..b368766 100644 --- a/chrome/browser/tab_contents/background_contents.h +++ b/chrome/browser/tab_contents/background_contents.h @@ -67,8 +67,8 @@ class BackgroundContents : public RenderViewHostDelegate, const ViewHostMsg_FrameNavigate_Params& params); virtual WebPreferences GetWebkitPrefs(); virtual void RunJavaScriptMessage(const RenderViewHost* rvh, - const std::wstring& message, - const std::wstring& default_prompt, + const string16& message, + const string16& default_prompt, const GURL& frame_url, const int flags, IPC::Message* reply_msg, @@ -127,7 +127,7 @@ class BackgroundContents : public RenderViewHostDelegate, // Overridden from JavaScriptAppModalDialogDelegate: virtual void OnMessageBoxClosed(IPC::Message* reply_msg, bool success, - const std::wstring& prompt); + const std::wstring& user_input); virtual void SetSuppressMessageBoxes(bool suppress_message_boxes) {} virtual gfx::NativeWindow GetMessageBoxRootWindow(); virtual TabContents* AsTabContents(); diff --git a/chrome/browser/tab_contents/web_contents_unittest.cc b/chrome/browser/tab_contents/web_contents_unittest.cc index 30f0c2d..f4d4bc5 100644 --- a/chrome/browser/tab_contents/web_contents_unittest.cc +++ b/chrome/browser/tab_contents/web_contents_unittest.cc @@ -1632,7 +1632,7 @@ TEST_F(TabContentsTest, NoJSMessageOnInterstitials) { IPC::Message* dummy_message = new IPC::Message; bool did_suppress_message = false; contents()->RunJavaScriptMessage(contents()->render_view_host(), - L"This is an informative message", L"OK", + ASCIIToUTF16("This is an informative message"), ASCIIToUTF16("OK"), kGURL, ui::MessageBoxFlags::kIsJavascriptAlert, dummy_message, &did_suppress_message); EXPECT_TRUE(did_suppress_message); diff --git a/content/browser/renderer_host/render_view_host.cc b/content/browser/renderer_host/render_view_host.cc index 7b07d51..3232ed7 100644 --- a/content/browser/renderer_host/render_view_host.cc +++ b/content/browser/renderer_host/render_view_host.cc @@ -480,9 +480,9 @@ void RenderViewHost::SelectAll() { UserMetrics::RecordAction(UserMetricsAction("SelectAll")); } -void RenderViewHost::JavaScriptMessageBoxClosed(IPC::Message* reply_msg, - bool success, - const std::wstring& prompt) { +void RenderViewHost::JavaScriptDialogClosed(IPC::Message* reply_msg, + bool success, + const string16& user_input) { process()->set_ignore_input_events(false); bool is_waiting = is_waiting_for_beforeunload_ack_ || is_waiting_for_unload_ack_; @@ -490,7 +490,7 @@ void RenderViewHost::JavaScriptMessageBoxClosed(IPC::Message* reply_msg, StartHangMonitorTimeout(TimeDelta::FromMilliseconds(kUnloadTimeoutMS)); ViewHostMsg_RunJavaScriptMessage::WriteReplyParams(reply_msg, - success, prompt); + success, user_input); Send(reply_msg); // If we are waiting for an unload or beforeunload ack and the user has @@ -995,8 +995,8 @@ void RenderViewHost::OnMsgSelectionChanged(const std::string& text, } void RenderViewHost::OnMsgRunJavaScriptMessage( - const std::wstring& message, - const std::wstring& default_prompt, + const string16& message, + const string16& default_prompt, const GURL& frame_url, const int flags, IPC::Message* reply_msg) { @@ -1010,7 +1010,7 @@ void RenderViewHost::OnMsgRunJavaScriptMessage( } void RenderViewHost::OnMsgRunBeforeUnloadConfirm(const GURL& frame_url, - const std::wstring& message, + const string16& message, IPC::Message* reply_msg) { // While a JS before unload dialog is showing, tabs in the same process // shouldn't process input events. diff --git a/content/browser/renderer_host/render_view_host.h b/content/browser/renderer_host/render_view_host.h index 9544061..8a63bd4 100644 --- a/content/browser/renderer_host/render_view_host.h +++ b/content/browser/renderer_host/render_view_host.h @@ -252,9 +252,9 @@ class RenderViewHost : public RenderWidgetHost { // Notifies the RenderView that the JavaScript message that was shown was // closed by the user. - void JavaScriptMessageBoxClosed(IPC::Message* reply_msg, - bool success, - const std::wstring& prompt); + void JavaScriptDialogClosed(IPC::Message* reply_msg, + bool success, + const string16& user_input); // Notifies the renderer that a a drag operation that it started has ended, // either in a drop or by being cancelled. @@ -418,13 +418,13 @@ class RenderViewHost : public RenderWidgetHost { WebKit::WebTextDirection text_direction_hint); void OnMsgSelectionChanged(const std::string& text, const ui::Range& range); void OnMsgPasteFromSelectionClipboard(); - void OnMsgRunJavaScriptMessage(const std::wstring& message, - const std::wstring& default_prompt, + void OnMsgRunJavaScriptMessage(const string16& message, + const string16& default_prompt, const GURL& frame_url, const int flags, IPC::Message* reply_msg); void OnMsgRunBeforeUnloadConfirm(const GURL& frame_url, - const std::wstring& message, + const string16& message, IPC::Message* reply_msg); void OnMsgStartDragging(const WebDropData& drop_data, WebKit::WebDragOperationsMask operations_allowed, diff --git a/content/browser/renderer_host/render_view_host_delegate.h b/content/browser/renderer_host/render_view_host_delegate.h index 9fed5f2..b7508fe 100644 --- a/content/browser/renderer_host/render_view_host_delegate.h +++ b/content/browser/renderer_host/render_view_host_delegate.h @@ -363,15 +363,15 @@ class RenderViewHostDelegate : public IPC::Channel::Listener { // A javascript message, confirmation or prompt should be shown. virtual void RunJavaScriptMessage(const RenderViewHost* rvh, - const std::wstring& message, - const std::wstring& default_prompt, + const string16& message, + const string16& default_prompt, const GURL& frame_url, const int flags, IPC::Message* reply_msg, bool* did_suppress_message) {} virtual void RunBeforeUnloadConfirm(const RenderViewHost* rvh, - const std::wstring& message, + const string16& message, IPC::Message* reply_msg) {} // Return a dummy RendererPreferences object that will be used by the renderer diff --git a/content/browser/tab_contents/tab_contents.cc b/content/browser/tab_contents/tab_contents.cc index 6e70151..3c994af 100644 --- a/content/browser/tab_contents/tab_contents.cc +++ b/content/browser/tab_contents/tab_contents.cc @@ -1587,8 +1587,8 @@ void TabContents::RequestOpenURL(const GURL& url, const GURL& referrer, void TabContents::RunJavaScriptMessage( const RenderViewHost* rvh, - const std::wstring& message, - const std::wstring& default_prompt, + const string16& message, + const string16& default_prompt, const GURL& frame_url, const int flags, IPC::Message* reply_msg, @@ -1621,8 +1621,14 @@ void TabContents::RunJavaScriptMessage( chrome::kJavascriptMessageExpectedDelay)) show_suppress_checkbox = true; - RunJavascriptMessageBox(profile(), this, frame_url, flags, message, - default_prompt, show_suppress_checkbox, reply_msg); + RunJavascriptMessageBox(profile(), + this, + frame_url, + flags, + UTF16ToWideHack(message), + UTF16ToWideHack(default_prompt), + show_suppress_checkbox, + reply_msg); } else { // If we are suppressing messages, just reply as is if the user immediately // pressed "Cancel". @@ -1631,19 +1637,18 @@ void TabContents::RunJavaScriptMessage( } void TabContents::RunBeforeUnloadConfirm(const RenderViewHost* rvh, - const std::wstring& message, + const string16& message, IPC::Message* reply_msg) { if (delegate()) delegate()->WillRunBeforeUnloadConfirm(); bool suppress_this_message = rvh->is_swapped_out() || (delegate() && delegate()->ShouldSuppressDialogs()); if (suppress_this_message) { - render_view_host()->JavaScriptMessageBoxClosed(reply_msg, true, - std::wstring()); + render_view_host()->JavaScriptDialogClosed(reply_msg, true, string16()); return; } is_showing_before_unload_dialog_ = true; - RunBeforeUnloadDialog(this, message, reply_msg); + RunBeforeUnloadDialog(this, UTF16ToWideHack(message), reply_msg); } WebPreferences TabContents::GetWebkitPrefs() { @@ -1838,7 +1843,7 @@ gfx::NativeWindow TabContents::GetMessageBoxRootWindow() { void TabContents::OnMessageBoxClosed(IPC::Message* reply_msg, bool success, - const std::wstring& prompt) { + const std::wstring& user_input) { last_javascript_message_dismissal_ = base::TimeTicks::Now(); if (is_showing_before_unload_dialog_ && !success) { // If a beforeunload dialog is canceled, we need to stop the throbber from @@ -1848,7 +1853,9 @@ void TabContents::OnMessageBoxClosed(IPC::Message* reply_msg, tab_close_start_time_ = base::TimeTicks(); } is_showing_before_unload_dialog_ = false; - render_view_host()->JavaScriptMessageBoxClosed(reply_msg, success, prompt); + render_view_host()->JavaScriptDialogClosed(reply_msg, + success, + WideToUTF16Hack(user_input)); } void TabContents::SetSuppressMessageBoxes(bool suppress_message_boxes) { diff --git a/content/browser/tab_contents/tab_contents.h b/content/browser/tab_contents/tab_contents.h index 1995867..a4ec6b2 100644 --- a/content/browser/tab_contents/tab_contents.h +++ b/content/browser/tab_contents/tab_contents.h @@ -449,7 +449,7 @@ class TabContents : public PageNavigator, // Overridden from JavaScriptAppModalDialogDelegate: virtual void OnMessageBoxClosed(IPC::Message* reply_msg, bool success, - const std::wstring& prompt); + const std::wstring& user_input); virtual void SetSuppressMessageBoxes(bool suppress_message_boxes); virtual gfx::NativeWindow GetMessageBoxRootWindow(); virtual TabContents* AsTabContents(); @@ -668,14 +668,14 @@ class TabContents : public PageNavigator, virtual void RequestOpenURL(const GURL& url, const GURL& referrer, WindowOpenDisposition disposition); virtual void RunJavaScriptMessage(const RenderViewHost* rvh, - const std::wstring& message, - const std::wstring& default_prompt, + const string16& message, + const string16& default_prompt, const GURL& frame_url, const int flags, IPC::Message* reply_msg, bool* did_suppress_message); virtual void RunBeforeUnloadConfirm(const RenderViewHost* rvh, - const std::wstring& message, + const string16& message, IPC::Message* reply_msg); virtual RendererPreferences GetRendererPrefs(Profile* profile) const; virtual WebPreferences GetWebkitPrefs(); diff --git a/content/common/view_messages.h b/content/common/view_messages.h index 1233c22..2dce7b8 100644 --- a/content/common/view_messages.h +++ b/content/common/view_messages.h @@ -1574,12 +1574,12 @@ IPC_MESSAGE_ROUTED1(ViewHostMsg_GoToEntryAtOffset, int /* offset (from current) of history item to get */) IPC_SYNC_MESSAGE_ROUTED4_2(ViewHostMsg_RunJavaScriptMessage, - std::wstring /* in - alert message */, - std::wstring /* in - default prompt */, + string16 /* in - alert message */, + string16 /* in - default prompt */, GURL /* in - originating page URL */, int /* in - dialog flags */, bool /* out - success */, - std::wstring /* out - prompt field */) + string16 /* out - user_input field */) // Requests that the given URL be opened in the specified manner. IPC_MESSAGE_ROUTED3(ViewHostMsg_OpenURL, @@ -1718,10 +1718,10 @@ IPC_MESSAGE_ROUTED1(ViewHostMsg_CrashedPlugin, // page. Replies true if yes, false otherwise, the reply string is ignored, // but is included so that we can use OnJavaScriptMessageBoxClosed. IPC_SYNC_MESSAGE_ROUTED2_2(ViewHostMsg_RunBeforeUnloadConfirm, - GURL, /* in - originating frame URL */ - std::wstring /* in - alert message */, - bool /* out - success */, - std::wstring /* out - This is ignored.*/) + GURL, /* in - originating frame URL */ + string16 /* in - alert message */, + bool /* out - success */, + string16 /* out - This is ignored.*/) // Sent when the renderer process is done processing a DataReceived // message. diff --git a/content/renderer/render_view.cc b/content/renderer/render_view.cc index dac0aba..5ae9676 100644 --- a/content/renderer/render_view.cc +++ b/content/renderer/render_view.cc @@ -1179,12 +1179,12 @@ void RenderView::LoadNavigationErrorPage(WebFrame* frame, } bool RenderView::RunJavaScriptMessage(int type, - const std::wstring& message, - const std::wstring& default_value, + const string16& message, + const string16& default_value, const GURL& frame_url, - std::wstring* result) { + string16* result) { bool success = false; - std::wstring result_temp; + string16 result_temp; if (!result) result = &result_temp; @@ -1555,8 +1555,8 @@ bool RenderView::runFileChooser( void RenderView::runModalAlertDialog( WebFrame* frame, const WebString& message) { RunJavaScriptMessage(ui::MessageBoxFlags::kIsJavascriptAlert, - UTF16ToWideHack(message), - std::wstring(), + message, + string16(), frame->url(), NULL); } @@ -1564,8 +1564,8 @@ void RenderView::runModalAlertDialog( bool RenderView::runModalConfirmDialog( WebFrame* frame, const WebString& message) { return RunJavaScriptMessage(ui::MessageBoxFlags::kIsJavascriptConfirm, - UTF16ToWideHack(message), - std::wstring(), + message, + string16(), frame->url(), NULL); } @@ -1573,14 +1573,14 @@ bool RenderView::runModalConfirmDialog( bool RenderView::runModalPromptDialog( WebFrame* frame, const WebString& message, const WebString& default_value, WebString* actual_value) { - std::wstring result; + string16 result; bool ok = RunJavaScriptMessage(ui::MessageBoxFlags::kIsJavascriptPrompt, - UTF16ToWideHack(message), - UTF16ToWideHack(default_value), + message, + default_value, frame->url(), &result); if (ok) - actual_value->assign(WideToUTF16Hack(result)); + actual_value->assign(result); return ok; } @@ -1595,10 +1595,9 @@ bool RenderView::runModalBeforeUnloadDialog( bool success = false; // This is an ignored return value, but is included so we can accept the same // response as RunJavaScriptMessage. - std::wstring ignored_result; + string16 ignored_result; SendAndRunNestedMessageLoop(new ViewHostMsg_RunBeforeUnloadConfirm( - routing_id_, frame->url(), UTF16ToWideHack(message), &success, - &ignored_result)); + routing_id_, frame->url(), message, &success, &ignored_result)); return success; } diff --git a/content/renderer/render_view.h b/content/renderer/render_view.h index f301093..f6bf925 100644 --- a/content/renderer/render_view.h +++ b/content/renderer/render_view.h @@ -693,10 +693,10 @@ class RenderView : public RenderWidget, WebKit::WebNavigationPolicy policy); bool RunJavaScriptMessage(int type, - const std::wstring& message, - const std::wstring& default_value, + const string16& message, + const string16& default_value, const GURL& frame_url, - std::wstring* result); + string16* result); // Sends a message and runs a nested message loop. bool SendAndRunNestedMessageLoop(IPC::SyncMessage* message); |