summaryrefslogtreecommitdiffstats
path: root/content/renderer
diff options
context:
space:
mode:
authormkosiba@chromium.org <mkosiba@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-10 12:15:23 +0000
committermkosiba@chromium.org <mkosiba@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-10 12:15:23 +0000
commitb553edd5243866b3ef55e401a1ace2cc7e23f3ac (patch)
treebb73e9ddd493b189db76459452436a0127be917c /content/renderer
parent688933e8fa7abae19d0be485c08dc79746a3e455 (diff)
downloadchromium_src-b553edd5243866b3ef55e401a1ace2cc7e23f3ac.zip
chromium_src-b553edd5243866b3ef55e401a1ace2cc7e23f3ac.tar.gz
chromium_src-b553edd5243866b3ef55e401a1ace2cc7e23f3ac.tar.bz2
Return a specific error code for unknown URL schemes.
The ERR_ABORTED error code is very general and for this particular case we already have a corresponding net:: error case. BUG=105653 TEST=browser_tests,content_unittests Review URL: http://codereview.chromium.org/8895002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@117024 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/renderer')
-rw-r--r--content/renderer/render_view_impl.cc6
1 files changed, 5 insertions, 1 deletions
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
index a7fecfa..fcfcfe9 100644
--- a/content/renderer/render_view_impl.cc
+++ b/content/renderer/render_view_impl.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -2503,6 +2503,10 @@ void RenderViewImpl::didFailProvisionalLoad(WebFrame* frame,
// from being dumb, WebCore doesn't expect it and it will cause a crash.
if (error.reason == net::ERR_ABORTED)
return;
+ // Don't display an error message if the request was handled by an
+ // external protocol handler.
+ if (error.reason == net::ERR_UNKNOWN_URL_SCHEME)
+ return;
// Make sure we never show errors in view source mode.
frame->enableViewSourceMode(false);