summaryrefslogtreecommitdiffstats
path: root/content
diff options
context:
space:
mode:
authorapavlov@chromium.org <apavlov@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-04-03 13:51:58 +0000
committerapavlov@chromium.org <apavlov@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-04-03 13:51:58 +0000
commitf1f8639f531a3a919a13d8f8aa8008e8b88e3b1f (patch)
tree74fb091262f2850a55aa99bbedcdaa163f0c09d1 /content
parentbd070e2f0795ef0661be6be7585a62c81fbf7459 (diff)
downloadchromium_src-f1f8639f531a3a919a13d8f8aa8008e8b88e3b1f.zip
chromium_src-f1f8639f531a3a919a13d8f8aa8008e8b88e3b1f.tar.gz
chromium_src-f1f8639f531a3a919a13d8f8aa8008e8b88e3b1f.tar.bz2
Reapply 130248 - Add full support for filesystem URLs. Trying to get the build into the right state.
TBR=pfeldman Review URL: https://chromiumcodereview.appspot.com/9956101 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@130363 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
-rw-r--r--content/browser/browser_url_handler_impl.cc4
-rw-r--r--content/public/common/url_constants.cc1
2 files changed, 3 insertions, 2 deletions
diff --git a/content/browser/browser_url_handler_impl.cc b/content/browser/browser_url_handler_impl.cc
index 7eef43f..2585844 100644
--- a/content/browser/browser_url_handler_impl.cc
+++ b/content/browser/browser_url_handler_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.
@@ -24,7 +24,7 @@ static bool HandleViewSource(GURL* url,
static const char* const allowed_sub_schemes[] = {
chrome::kHttpScheme, chrome::kHttpsScheme, chrome::kFtpScheme,
chrome::kChromeDevToolsScheme, chrome::kChromeUIScheme,
- chrome::kFileScheme
+ chrome::kFileScheme, chrome::kFileSystemScheme
};
bool is_sub_scheme_allowed = false;
diff --git a/content/public/common/url_constants.cc b/content/public/common/url_constants.cc
index 26dee8e..bbc5c2f 100644
--- a/content/public/common/url_constants.cc
+++ b/content/public/common/url_constants.cc
@@ -12,6 +12,7 @@ const char* kDefaultSavableSchemes[] = {
chrome::kHttpScheme,
chrome::kHttpsScheme,
chrome::kFileScheme,
+ chrome::kFileSystemScheme,
chrome::kFtpScheme,
chrome::kChromeDevToolsScheme,
chrome::kChromeUIScheme,