summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--chrome/app/theme/theme_resources.grd1
-rw-r--r--tools/grit/grit/tool/build.py3
2 files changed, 0 insertions, 4 deletions
diff --git a/chrome/app/theme/theme_resources.grd b/chrome/app/theme/theme_resources.grd
index 2efd516..0993f7c 100644
--- a/chrome/app/theme/theme_resources.grd
+++ b/chrome/app/theme/theme_resources.grd
@@ -269,7 +269,6 @@
<include name="IDR_SEARCH_ENGINE_LOGO_CENTRUM" file="notused.png" type="BINDATA" />
<include name="IDR_SEARCH_ENGINE_LOGO_DAUM" file="notused.png" type="BINDATA" />
<include name="IDR_SEARCH_ENGINE_LOGO_DELFI" file="notused.png" type="BINDATA" />
- <include name="IDR_SEARCH_ENGINE_LOGO_DIRI" file="notused.png" type="BINDATA" />
<include name="IDR_SEARCH_ENGINE_LOGO_GOO" file="notused.png" type="BINDATA" />
<include name="IDR_SEARCH_ENGINE_LOGO_GOOGLE" file="notused.png" type="BINDATA" />
<include name="IDR_SEARCH_ENGINE_LOGO_IN" file="notused.png" type="BINDATA" />
diff --git a/tools/grit/grit/tool/build.py b/tools/grit/grit/tool/build.py
index 7d3e864..635cc41 100644
--- a/tools/grit/grit/tool/build.py
+++ b/tools/grit/grit/tool/build.py
@@ -176,9 +176,6 @@ are exported to translation interchange files (e.g. XMB files), etc.
base_dir = util.dirname(output_node.GetOutputFilename())
- if node.name == 'if' and not node.IsConditionSatisfied():
- return
-
try:
formatter = node.ItemFormatter(output_node.GetType())
if formatter: