diff options
| author | kalman <kalman@chromium.org> | 2014-12-14 19:59:09 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-12-15 03:59:33 +0000 |
| commit | 64210328fe91376da6cf6a21ac16db72efa6118a (patch) | |
| tree | 7ff1c62a09228eb7215c2bf66f2229e8a098f638 /extensions/extensions_resources.grd | |
| parent | 60e5f1185e04c0bcb43f82b2e224de2ad463abee (diff) | |
| download | chromium_src-64210328fe91376da6cf6a21ac16db72efa6118a.zip chromium_src-64210328fe91376da6cf6a21ac16db72efa6118a.tar.gz chromium_src-64210328fe91376da6cf6a21ac16db72efa6118a.tar.bz2 | |
Add the basic infrastructure for the Behavior feature type: BehaviorFeature and
_behavior_features.json. Arbitrarily use it to implement the allow-in-incognito
whitelist.
BUG=440194
R=rockot@chromium.org
Review URL: https://codereview.chromium.org/789383002
Cr-Commit-Position: refs/heads/master@{#308311}
Diffstat (limited to 'extensions/extensions_resources.grd')
| -rw-r--r-- | extensions/extensions_resources.grd | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/extensions/extensions_resources.grd b/extensions/extensions_resources.grd index 4799934..6406ce90 100644 --- a/extensions/extensions_resources.grd +++ b/extensions/extensions_resources.grd @@ -13,6 +13,7 @@ <include name="IDR_EXTENSION_API_JSON_WEB_VIEW_REQUEST" file="common\api\web_view_request.json" type="BINDATA" /> <include name="IDR_EXTENSION_MANIFEST_FEATURES" file="common\api\_manifest_features.json" type="BINDATA" /> <include name="IDR_EXTENSION_PERMISSION_FEATURES" file="common\api\_permission_features.json" type="BINDATA" /> + <include name="IDR_EXTENSION_BEHAVIOR_FEATURES" file="common\api\_behavior_features.json" type="BINDATA" /> </includes> </release> </grit> |