diff options
| author | jrg@chromium.org <jrg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-17 18:24:46 +0000 |
|---|---|---|
| committer | jrg@chromium.org <jrg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-17 18:24:46 +0000 |
| commit | e61e50ef54a9c20b95e33d6928b6fec372f77019 (patch) | |
| tree | 21e74df9dd0c5af2e505eda96c1161623f8eca23 /chrome | |
| parent | 5c4683c949eece2a6c96f5731849dcf1ca198eb7 (diff) | |
| download | chromium_src-e61e50ef54a9c20b95e33d6928b6fec372f77019.zip chromium_src-e61e50ef54a9c20b95e33d6928b6fec372f77019.tar.gz chromium_src-e61e50ef54a9c20b95e33d6928b6fec372f77019.tar.bz2 | |
BUG=http://crbug.com/34161
TEST=On Win (debug build only), go to about:ipc. Make sure dialog
opens and does not hang.
Review URL: http://codereview.chromium.org/600159
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@39241 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/browser_about_handler.cc | 4 | ||||
| -rw-r--r-- | chrome/browser/views/about_ipc_dialog.cc | 2 |
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); |