summaryrefslogtreecommitdiffstats
path: root/extensions/extensions.gyp
diff options
context:
space:
mode:
authorhanxi <hanxi@chromium.org>2015-02-05 06:27:32 -0800
committerCommit bot <commit-bot@chromium.org>2015-02-05 14:28:16 +0000
commitc0503d76ca4216349132b8a2ca1db5a15a11292a (patch)
treeb2ecec27ca4f450e98017caf744d744cf8d490ab /extensions/extensions.gyp
parent159604379ff8ef8d3db4577f44d3d6438092ccf0 (diff)
downloadchromium_src-c0503d76ca4216349132b8a2ca1db5a15a11292a.zip
chromium_src-c0503d76ca4216349132b8a2ca1db5a15a11292a.tar.gz
chromium_src-c0503d76ca4216349132b8a2ca1db5a15a11292a.tar.bz2
Revert of Revert of Introduce HostID and de-couple Extensions from "script injection System" [browser side] (patchset #2 id:270001 of https://codereview.chromium.org/899983002/)
Reason for revert: It turns out that the crash wasn't caused by this CL. Original issue's description: > Revert of Introduce HostID and de-couple Extensions from "script injection System" [browser side] (patchset #20 id:760001 of https://codereview.chromium.org/822453002/) > > Reason for revert: > It might cause the crash https://code.google.com/p/chromium/issues/detail?id=454917. > > Original issue's description: > > Introduce HostID and de-couple Extensions from "script injection System" [browser side] > > > > The major refactor includes: > > - Introduce HostID (a pair of |id, type|) to replace extension_id in browser > > side. > > - Abstract UserScriptLoader to be a base class, and introduces > > a derived class ExtensionUserScriptLoader which is > > responsible for loading user scripts for extensions. > > - In DeclarativeUserScriptManager, a master is created per > > extension/webUI. > > - DeclarativeUserScriptManager becomes an > > ExtensionRegistryObserver and is responsible for clearing scripts > > for master objects when receive OnExensionUnloaded event. > > > > BUG=437566 > > > > Committed: https://crrev.com/b88fe3dc1072501bdd105fd95a8b3bc453fd2aa7 > > Cr-Commit-Position: refs/heads/master@{#313402} > > TBR=fsamuel@chromium.org,rdevlin.cronin@chromium.org > NOPRESUBMIT=true > NOTREECHECKS=true > NOTRY=true > BUG=437566 > > Committed: https://crrev.com/5eb894ea21637241e9a78fb9c2737d40d6dbf575 > Cr-Commit-Position: refs/heads/master@{#314631} TBR=fsamuel@chromium.org,rdevlin.cronin@chromium.org NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=437566 Review URL: https://codereview.chromium.org/903743002 Cr-Commit-Position: refs/heads/master@{#314807}
Diffstat (limited to 'extensions/extensions.gyp')
-rw-r--r--extensions/extensions.gyp1
1 files changed, 1 insertions, 0 deletions
diff --git a/extensions/extensions.gyp b/extensions/extensions.gyp
index b281f31..ac43483 100644
--- a/extensions/extensions.gyp
+++ b/extensions/extensions.gyp
@@ -88,6 +88,7 @@
'common/cast/cast_cert_validator.h',
'common/common_manifest_handlers.cc',
'common/common_manifest_handlers.h',
+ 'common/host_id.h',
'common/csp_validator.cc',
'common/csp_validator.h',
'common/dom_action_types.h',