summaryrefslogtreecommitdiffstats
path: root/chrome/browser/views/about_ipc_dialog.cc
diff options
context:
space:
mode:
authorerg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-18 18:33:57 +0000
committererg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-18 18:33:57 +0000
commit252cad6dec04039d456e716273153951d0090b5f (patch)
tree68437c27571fe3e88317f1f2848573fe647fdbb5 /chrome/browser/views/about_ipc_dialog.cc
parent371390a71a7e4530b39e46f1f52c5a6d5a3acd43 (diff)
downloadchromium_src-252cad6dec04039d456e716273153951d0090b5f.zip
chromium_src-252cad6dec04039d456e716273153951d0090b5f.tar.gz
chromium_src-252cad6dec04039d456e716273153951d0090b5f.tar.bz2
Remove all wstrings from the IPC logging subsystem.
Changes all IPC Log methods from wstring to string. All static logging debug data changed from wchar[] to char[]. Various string conversion/numeric headers no longer need to be included in ipc_message_utils.h and have been removed (and added in all implementation files that require them). BUG=none TEST=none Review URL: http://codereview.chromium.org/3159013 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@56563 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/views/about_ipc_dialog.cc')
-rw-r--r--chrome/browser/views/about_ipc_dialog.cc18
1 files changed, 11 insertions, 7 deletions
diff --git a/chrome/browser/views/about_ipc_dialog.cc b/chrome/browser/views/about_ipc_dialog.cc
index 9b83e7d..a23b122 100644
--- a/chrome/browser/views/about_ipc_dialog.cc
+++ b/chrome/browser/views/about_ipc_dialog.cc
@@ -100,13 +100,14 @@ void CreateColumn(uint32 start, uint32 end, HWND hwnd,
control_ptr->InsertColumn(0, L"id", LVCFMT_LEFT, 230);
for (uint32 i = start; i < end; i++) {
- std::wstring name;
+ std::string name;
IPC::Logging::GetMessageText(i, &name, NULL, NULL);
+ std::wstring wname = UTF8ToWide(name);
int index = control_ptr->InsertItem(
- LVIF_TEXT | LVIF_PARAM, 0, name.c_str(), 0, 0, 0, i);
+ LVIF_TEXT | LVIF_PARAM, 0, wname.c_str(), 0, 0, 0, i);
- control_ptr->SetItemText(index, 0, name.c_str());
+ control_ptr->SetItemText(index, 0, wname.c_str());
if (disabled_messages.find(i) == disabled_messages.end())
control_ptr->SetCheckState(index, TRUE);
@@ -406,10 +407,12 @@ void AboutIPCDialog::Log(const IPC::LogData& data) {
message_list_.SetItemText(index, kChannelColumn,
ASCIIToWide(data.channel).c_str());
- std::wstring message_name;
+ std::string message_name;
IPC::Logging::GetMessageText(data.type, &message_name, NULL, NULL);
- message_list_.SetItemText(index, kMessageColumn, message_name.c_str());
- message_list_.SetItemText(index, kFlagsColumn, data.flags.c_str());
+ message_list_.SetItemText(index, kMessageColumn,
+ UTF8ToWide(message_name).c_str());
+ message_list_.SetItemText(index, kFlagsColumn,
+ UTF8ToWide(data.flags).c_str());
int64 time_to_send = (base::Time::FromInternalValue(data.receive) -
sent).InMilliseconds();
@@ -424,7 +427,8 @@ void AboutIPCDialog::Log(const IPC::LogData& data) {
temp = StringPrintf(L"%d", time_to_process);
message_list_.SetItemText(index, kProcessColumn, temp.c_str());
- message_list_.SetItemText(index, kParamsColumn, data.params.c_str());
+ message_list_.SetItemText(index, kParamsColumn,
+ UTF8ToWide(data.params).c_str());
message_list_.EnsureVisible(index, FALSE);
}