From 64210328fe91376da6cf6a21ac16db72efa6118a Mon Sep 17 00:00:00 2001
From: kalman <kalman@chromium.org>
Date: Sun, 14 Dec 2014 19:59:09 -0800
Subject: 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}
---
 extensions/extensions_resources.grd | 1 +
 1 file changed, 1 insertion(+)

(limited to 'extensions/extensions_resources.grd')

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>
-- 
cgit v1.1