diff options
| author | tkent@chromium.org <tkent@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-21 04:56:30 +0000 |
|---|---|---|
| committer | tkent@chromium.org <tkent@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-21 04:56:30 +0000 |
| commit | 4fba649e127a7e1ea6a359edf560fc4be86e92c0 (patch) | |
| tree | af16a66705dcab124b7ad7847eb38e7d222c21c9 /chrome/renderer/user_script_slave.cc | |
| parent | 26f16b508c8f1d44ca12a95dfcc25193c700f6c3 (diff) | |
| download | chromium_src-4fba649e127a7e1ea6a359edf560fc4be86e92c0.zip chromium_src-4fba649e127a7e1ea6a359edf560fc4be86e92c0.tar.gz chromium_src-4fba649e127a7e1ea6a359edf560fc4be86e92c0.tar.bz2 | |
Revert 50333 - Only allow installation of extensions/apps with gallery update url via download from gallery
Because of multiple failures of unit_tests and interactive_ui_tests.
BUG=45542
TEST=NONE
Review URL: http://codereview.chromium.org/2855009
TBR=rafaelw@chromium.org
Review URL: http://codereview.chromium.org/2822021
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50334 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer/user_script_slave.cc')
| -rw-r--r-- | chrome/renderer/user_script_slave.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/chrome/renderer/user_script_slave.cc b/chrome/renderer/user_script_slave.cc index 11ad1f2..4015484 100644 --- a/chrome/renderer/user_script_slave.cc +++ b/chrome/renderer/user_script_slave.cc @@ -14,6 +14,7 @@ #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" @@ -150,7 +151,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::ChromeStoreURL()).host()) + if (frame_url.host() == GURL(extension_urls::kGalleryBrowsePrefix).host()) return true; PerfTimer timer; |