diff options
Diffstat (limited to 'chrome/renderer/render_view.cc')
-rw-r--r-- | chrome/renderer/render_view.cc | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/chrome/renderer/render_view.cc b/chrome/renderer/render_view.cc index 446a263..faf8d7c 100644 --- a/chrome/renderer/render_view.cc +++ b/chrome/renderer/render_view.cc @@ -36,6 +36,7 @@ #include "chrome/renderer/localized_error.h" #include "chrome/renderer/media/audio_renderer_impl.h" #include "chrome/renderer/render_process.h" +#include "chrome/renderer/renderer_logging.h" #include "chrome/renderer/user_script_slave.h" #include "chrome/renderer/visitedlink_slave.h" #include "chrome/renderer/webmediaplayer_delegate_impl.h" @@ -77,18 +78,10 @@ #include "base/gfx/gdi_util.h" #include "base/gfx/native_theme.h" #include "chrome/common/gfx/emf.h" -#include "chrome/renderer/renderer_logging.h" +#include "chrome/views/controls/message_box_view.h" #include "skia/ext/vector_canvas.h" #endif -#if defined(OS_WIN) -// If true, the URL of the active renderer is logged. Logging is done in such -// way that if the renderer crashes the URL of the active renderer is contained -// in the dump. Currently mini-dumps are only supported on windows, so this is -// only enabled on windows. -#define LOG_RENDERER_URL -#endif - using base::TimeDelta; using webkit_glue::WebAccessibility; @@ -335,11 +328,9 @@ void RenderView::Init(gfx::NativeViewId parent_hwnd, } void RenderView::OnMessageReceived(const IPC::Message& message) { -#ifdef LOG_RENDERER_URL WebFrame* main_frame = webview() ? webview()->GetMainFrame() : NULL; renderer_logging::ScopedActiveRenderingURLSetter url_setter( main_frame ? main_frame->GetURL() : GURL()); -#endif // If this is developer tools renderer intercept tools messages first. if (devtools_client_.get() && devtools_client_->OnMessageReceived(message)) @@ -773,9 +764,7 @@ void RenderView::OnNavigate(const ViewMsg_Navigate_Params& params) { if (!webview()) return; -#ifdef LOG_RENDERER_URL renderer_logging::ScopedActiveRenderingURLSetter url_setter(params.url); -#endif AboutHandler::MaybeHandle(params.url); |