diff options
| author | hirono@chromium.org <hirono@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-12 10:32:35 +0000 |
|---|---|---|
| committer | hirono@chromium.org <hirono@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-12 10:32:35 +0000 |
| commit | 6bdd364fcf71a962b9846a38f4da4be4188db8f4 (patch) | |
| tree | acea90deb77c0cb20530cd11e90848cfe6fa4813 /content/browser | |
| parent | 94ba2e0a74a14676f4f8e365ad00c5018e030e31 (diff) | |
| download | chromium_src-6bdd364fcf71a962b9846a38f4da4be4188db8f4.zip chromium_src-6bdd364fcf71a962b9846a38f4da4be4188db8f4.tar.gz chromium_src-6bdd364fcf71a962b9846a38f4da4be4188db8f4.tar.bz2 | |
Files.app: Allow to load icons from chrome://extension-icon/.
This CL adds a conditional for chrome://extension-icon to the
CheckStoragePartitionMatches function so that Files.app can load extension icon
from the URL.
BUG=350314
TEST=manually
Review URL: https://codereview.chromium.org/194213002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@256514 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser')
| -rw-r--r-- | content/browser/webui/url_data_manager_backend.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/content/browser/webui/url_data_manager_backend.cc b/content/browser/webui/url_data_manager_backend.cc index 22f275e..8d0ab0a 100644 --- a/content/browser/webui/url_data_manager_backend.cc +++ b/content/browser/webui/url_data_manager_backend.cc @@ -356,12 +356,13 @@ void URLRequestChromeJob::CheckStoragePartitionMatches( // being in the same process. We do an extra check to guard against an // exploited renderer pretending to add them as a subframe. We skip this check // for resources. - // TODO(guohui): move URL constants for favicon, theme, thumb, thumb and - // thumbnails from chrome/common/url_constants.h to + // TODO(guohui): move URL constants for extension-icon, favicon, theme, thumb, + // thumb and thumbnails from chrome/common/url_constants.h to // content/public/common/url_constants.h, so that they could be reused here. bool allowed = false; if (url.SchemeIs(kChromeUIScheme) && (url.host() == kChromeUIResourcesHost || + url.host() == "extension-icon" || url.host() == "favicon" || url.host() == "theme" || url.host() == "thumb" || |