diff options
| author | rlarocque@chromium.org <rlarocque@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-03 20:25:45 +0000 |
|---|---|---|
| committer | rlarocque@chromium.org <rlarocque@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-03 20:25:45 +0000 |
| commit | f85336586eb978d9e5da010a9956190541e996aa (patch) | |
| tree | 48a50921ecd056d14b37da81fab887094c1a38b0 /chrome/renderer | |
| parent | 3424379863c2241262468671579f5672369d436a (diff) | |
| download | chromium_src-f85336586eb978d9e5da010a9956190541e996aa.zip chromium_src-f85336586eb978d9e5da010a9956190541e996aa.tar.gz chromium_src-f85336586eb978d9e5da010a9956190541e996aa.tar.bz2 | |
Revert 159950 - Give Chrome Web Store app an icon in its manifest file.
This fixes no icon being shown in the "The app is currently unreachable" page for the chrome web store.
Also added is another exception to ResourceRequestPolicy::CanRequestResource to make sure the error
page is always allowed to display the app's icon, even in a manifest v2 app that doesn't list its
icons in web_accessible_resources.
BUG=135549
Review URL: https://chromiumcodereview.appspot.com/10985028
TBR=mek@chromium.org
Review URL: https://codereview.chromium.org/11056005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@159963 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer')
| -rw-r--r-- | chrome/renderer/extensions/resource_request_policy.cc | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/chrome/renderer/extensions/resource_request_policy.cc b/chrome/renderer/extensions/resource_request_policy.cc index da83a32..c9973c8 100644 --- a/chrome/renderer/extensions/resource_request_policy.cc +++ b/chrome/renderer/extensions/resource_request_policy.cc @@ -70,12 +70,9 @@ bool ResourceRequestPolicy::CanRequestResource( !extension->devtools_url().is_empty(); bool transition_allowed = !content::PageTransitionIsWebTriggerable(transition_type); - // - unreachable web page error page (to allow showing the icon of the - // unreachable app on this page) - bool is_error_page = frame_url == GURL(content::kUnreachableWebDataURL); if (!is_empty_origin && !is_own_resource && - !is_dev_tools && !transition_allowed && !is_error_page) { + !is_dev_tools && !transition_allowed) { std::string message = base::StringPrintf( "Denying load of %s. Resources must be listed in the " "web_accessible_resources manifest key in order to be loaded by " |