diff options
| author | rafaelw@chromium.org <rafaelw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-23 02:45:48 +0000 |
|---|---|---|
| committer | rafaelw@chromium.org <rafaelw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-23 02:45:48 +0000 |
| commit | d146b8311c38186872d2be3764e2c2d66827107f (patch) | |
| tree | d9ee73fe6c704a3964f87ad15248274048779233 /chrome/renderer | |
| parent | 6ab764bdbed6489c5eaf5f50923bce20bcf6c854 (diff) | |
| download | chromium_src-d146b8311c38186872d2be3764e2c2d66827107f.zip chromium_src-d146b8311c38186872d2be3764e2c2d66827107f.tar.gz chromium_src-d146b8311c38186872d2be3764e2c2d66827107f.tar.bz2 | |
(fix merge error).
Reland Disallow chrome.tabs.executeScript from injecting code into gallery
TBR=aa
BUG=30146
TEST=browertest is pending: http://codereview.chromium.org/506066
Original review: http://codereview.chromium.org/501098/
Review URL: http://codereview.chromium.org/518005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@35202 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer')
| -rw-r--r-- | chrome/renderer/render_view.cc | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/chrome/renderer/render_view.cc b/chrome/renderer/render_view.cc index 6313755..709c313 100644 --- a/chrome/renderer/render_view.cc +++ b/chrome/renderer/render_view.cc @@ -26,6 +26,7 @@ #include "chrome/common/child_process_logging.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/chrome_constants.h" +#include "chrome/common/extensions/extension_constants.h" #include "chrome/common/jstemplate_builder.h" #include "chrome/common/page_zoom.h" #include "chrome/common/plugin_messages.h" @@ -3841,6 +3842,13 @@ void RenderView::OnExecuteCode(const ViewMsg_ExecuteCode_Params& params) { void RenderView::ExecuteCodeImpl(WebFrame* frame, const ViewMsg_ExecuteCode_Params& params) { + // Don't execute scripts in gallery pages. + GURL frame_url = GURL(frame->url()); + if (frame_url.host() == GURL(extension_urls::kGalleryBrowsePrefix).host()) { + Send(new ViewMsg_ExecuteCodeFinished(routing_id_, params.request_id, true)); + return; + } + std::vector<WebFrame*> frame_vector; frame_vector.push_back(frame); if (params.all_frames) |