summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
Diffstat (limited to 'chrome')
-rw-r--r--chrome/browser/browser_about_handler.cc4
-rw-r--r--chrome/browser/views/about_ipc_dialog.cc2
2 files changed, 4 insertions, 2 deletions
diff --git a/chrome/browser/browser_about_handler.cc b/chrome/browser/browser_about_handler.cc
index e00a5774..a6764aa 100644
--- a/chrome/browser/browser_about_handler.cc
+++ b/chrome/browser/browser_about_handler.cc
@@ -978,7 +978,9 @@ bool HandleNonNavigationAboutURL(const GURL& url) {
AboutNetworkDialog::RunDialog();
return true;
}
-#elif defined(OS_MACOSX) && defined(IPC_MESSAGE_LOG_ENABLED)
+#endif
+
+#if (defined(OS_MAC) || defined(OS_WIN)) && defined(IPC_MESSAGE_LOG_ENABLED)
if (LowerCaseEqualsASCII(url.spec(), chrome::kChromeUIIPCURL)) {
// Run the dialog. This will re-use the existing one if it's already up.
AboutIPCDialog::RunDialog();
diff --git a/chrome/browser/views/about_ipc_dialog.cc b/chrome/browser/views/about_ipc_dialog.cc
index c3585db..bf34905 100644
--- a/chrome/browser/views/about_ipc_dialog.cc
+++ b/chrome/browser/views/about_ipc_dialog.cc
@@ -98,7 +98,7 @@ void CreateColumn(uint32 start, uint32 end, HWND hwnd,
control_ptr->ModifyStyle(0, LVS_SORTASCENDING | LVS_NOCOLUMNHEADER);
control_ptr->InsertColumn(0, L"id", LVCFMT_LEFT, 230);
- for (uint16 i = start; i < end; i++) {
+ for (uint32 i = start; i < end; i++) {
std::wstring name;
IPC::Logging::GetMessageText(i, &name, NULL, NULL);