diff options
| author | rafaelw@chromium.org <rafaelw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-23 03:29:55 +0000 |
|---|---|---|
| committer | rafaelw@chromium.org <rafaelw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-23 03:29:55 +0000 |
| commit | a0cf04ad9284bbdd0a87d0b22820eba9505f957d (patch) | |
| tree | d9fb8481addd7a6a2873be643a66a86a20be86e3 /chrome/renderer | |
| parent | 701fcfc8dd54119ea379f9e191f565b2f69d8367 (diff) | |
| download | chromium_src-a0cf04ad9284bbdd0a87d0b22820eba9505f957d.zip chromium_src-a0cf04ad9284bbdd0a87d0b22820eba9505f957d.tar.gz chromium_src-a0cf04ad9284bbdd0a87d0b22820eba9505f957d.tar.bz2 | |
Reland - Only allow installation of extensions/apps with gallery update url via download from gallery
original review here: http://codereview.chromium.org/2855009
BUG=45542
TEST=NONE
TBR=aa
Review URL: http://codereview.chromium.org/2872013
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50571 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer')
| -rw-r--r-- | chrome/renderer/render_view.cc | 4 | ||||
| -rw-r--r-- | chrome/renderer/user_script_slave.cc | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/chrome/renderer/render_view.cc b/chrome/renderer/render_view.cc index 5d5079f..1c14bd0 100644 --- a/chrome/renderer/render_view.cc +++ b/chrome/renderer/render_view.cc @@ -29,7 +29,7 @@ #include "chrome/common/chrome_constants.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_switches.h" -#include "chrome/common/extensions/extension_constants.h" +#include "chrome/common/extensions/extension.h" #include "chrome/common/jstemplate_builder.h" #include "chrome/common/page_zoom.h" #include "chrome/common/pepper_plugin_registry.h" @@ -4964,7 +4964,7 @@ 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()) { + if (frame_url.host() == GURL(Extension::ChromeStoreURL()).host()) { Send(new ViewMsg_ExecuteCodeFinished(routing_id_, params.request_id, true)); return; } diff --git a/chrome/renderer/user_script_slave.cc b/chrome/renderer/user_script_slave.cc index 4015484..11ad1f2 100644 --- a/chrome/renderer/user_script_slave.cc +++ b/chrome/renderer/user_script_slave.cc @@ -14,7 +14,6 @@ #include "base/string_util.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/extensions/extension.h" -#include "chrome/common/extensions/extension_constants.h" #include "chrome/renderer/extension_groups.h" #include "chrome/renderer/render_thread.h" #include "googleurl/src/gurl.h" @@ -151,7 +150,7 @@ bool UserScriptSlave::InjectScripts(WebFrame* frame, // Don't inject user scripts into the gallery itself. This prevents // a user script from removing the "report abuse" link, for example. - if (frame_url.host() == GURL(extension_urls::kGalleryBrowsePrefix).host()) + if (frame_url.host() == GURL(Extension::ChromeStoreURL()).host()) return true; PerfTimer timer; |