Commit aa21d2a3 authored by evan@chromium.org's avatar evan@chromium.org

content: use string16 in ViewHostMsg_AddMessageToConsole

BUG=23581

Review URL: http://codereview.chromium.org/7598020

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@95914 0039d316-1c4b-4281-b951-d872f2087c98
parent 0cd66717
...@@ -1083,9 +1083,9 @@ void RenderViewHost::OnTakeFocus(bool reverse) { ...@@ -1083,9 +1083,9 @@ void RenderViewHost::OnTakeFocus(bool reverse) {
} }
void RenderViewHost::OnAddMessageToConsole(int32 level, void RenderViewHost::OnAddMessageToConsole(int32 level,
const std::wstring& message, const string16& message,
int32 line_no, int32 line_no,
const std::wstring& source_id) { const string16& source_id) {
// Pass through log level only on WebUI pages to limit console spew. // Pass through log level only on WebUI pages to limit console spew.
int32 resolved_level = int32 resolved_level =
BindingsPolicy::is_web_ui_enabled(enabled_bindings_) ? level : 0; BindingsPolicy::is_web_ui_enabled(enabled_bindings_) ? level : 0;
......
...@@ -446,9 +446,9 @@ class RenderViewHost : public RenderWidgetHost { ...@@ -446,9 +446,9 @@ class RenderViewHost : public RenderWidgetHost {
void OnTargetDropACK(); void OnTargetDropACK();
void OnTakeFocus(bool reverse); void OnTakeFocus(bool reverse);
void OnAddMessageToConsole(int32 level, void OnAddMessageToConsole(int32 level,
const std::wstring& message, const string16& message,
int32 line_no, int32 line_no,
const std::wstring& source_id); const string16& source_id);
void OnUpdateInspectorSetting(const std::string& key, void OnUpdateInspectorSetting(const std::string& key,
const std::string& value); const std::string& value);
void OnMsgShouldCloseACK(bool proceed); void OnMsgShouldCloseACK(bool proceed);
......
...@@ -1758,9 +1758,9 @@ IPC_MESSAGE_ROUTED0(ViewHostMsg_ImeCancelComposition) ...@@ -1758,9 +1758,9 @@ IPC_MESSAGE_ROUTED0(ViewHostMsg_ImeCancelComposition)
// or debugger UI. // or debugger UI.
IPC_MESSAGE_ROUTED4(ViewHostMsg_AddMessageToConsole, IPC_MESSAGE_ROUTED4(ViewHostMsg_AddMessageToConsole,
int32, /* log level */ int32, /* log level */
std::wstring, /* msg */ string16, /* msg */
int32, /* line number */ int32, /* line number */
std::wstring /* source id */) string16 /* source id */)
// Sent by the renderer process to indicate that a plugin instance has // Sent by the renderer process to indicate that a plugin instance has
// crashed. // crashed.
......
...@@ -1432,9 +1432,9 @@ void RenderView::didAddMessageToConsole( ...@@ -1432,9 +1432,9 @@ void RenderView::didAddMessageToConsole(
Send(new ViewHostMsg_AddMessageToConsole(routing_id_, Send(new ViewHostMsg_AddMessageToConsole(routing_id_,
static_cast<int32>(log_severity), static_cast<int32>(log_severity),
UTF16ToWideHack(message.text), message.text,
static_cast<int32>(source_line), static_cast<int32>(source_line),
UTF16ToWideHack(source_name))); source_name));
} }
void RenderView::printPage(WebFrame* frame) { void RenderView::printPage(WebFrame* frame) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment