diff options
| author | ojan@google.com <ojan@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-03 18:52:05 +0000 |
|---|---|---|
| committer | ojan@google.com <ojan@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-03 18:52:05 +0000 |
| commit | 5179465c5c2aa029e04694a1afc60caac4dfb4d0 (patch) | |
| tree | c150e8861f8dc5522b24e0b9f09b3233d49304da /chrome/browser/browser_about_handler.cc | |
| parent | 22fbb60e12a7b7866cff9215a78a6f31cf744cd5 (diff) | |
| download | chromium_src-5179465c5c2aa029e04694a1afc60caac4dfb4d0.zip chromium_src-5179465c5c2aa029e04694a1afc60caac4dfb4d0.tar.gz chromium_src-5179465c5c2aa029e04694a1afc60caac4dfb4d0.tar.bz2 | |
Reverting 9090.
Broke chromium full build.
Review URL: http://codereview.chromium.org/21024
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@9094 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_about_handler.cc')
| -rw-r--r-- | chrome/browser/browser_about_handler.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/chrome/browser/browser_about_handler.cc b/chrome/browser/browser_about_handler.cc index 457b5a8..91df8c4 100644 --- a/chrome/browser/browser_about_handler.cc +++ b/chrome/browser/browser_about_handler.cc @@ -29,7 +29,7 @@ #include "chrome/browser/profile_manager.h" #include "chrome/browser/renderer_host/render_process_host.h" #include "chrome/browser/renderer_host/render_view_host.h" -#include "chrome/browser/views/about_ipc_dialog.h" +#include "chrome/browser/tab_contents/ipc_status_view.h" #include "chrome/browser/views/about_network_dialog.h" #include "chrome/common/jstemplate_builder.h" #include "chrome/common/l10n_util.h" @@ -185,11 +185,11 @@ bool BrowserAboutHandler::MaybeHandle(GURL* url, } #ifdef IPC_MESSAGE_LOG_ENABLED - if (LowerCaseEqualsASCII(url->path(), "ipc")) { - // Run the dialog. This will re-use the existing one if it's already up. - AboutIPCDialog::RunDialog(); - *url = GURL("about:blank"); - return false; + if ((LowerCaseEqualsASCII(url->path(), "ipc")) && + (IPCStatusView::current() == NULL)) { + // about:ipc doesn't have an internal protocol, so don't modify |url|. + *result_type = TAB_CONTENTS_IPC_STATUS_VIEW; + return true; } #endif |