From 247d031a5c06d4d9bfafc09dbf76d9332a40d0b1 Mon Sep 17 00:00:00 2001
From: "tony@chromium.org"
 <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Tue, 30 Aug 2011 16:50:33 +0000
Subject: Move the Chrome/Chromium icon from the locale dlls into
 npchrome_frame.dll.

This avoids us having 50 copies of the same icon (once per locale dll).
In practice, this wasn't so bad because they probably zipped well in the
7z file.

Review URL: http://codereview.chromium.org/7790011

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@98828 0039d316-1c4b-4281-b951-d872f2087c98
---
 chrome_frame/resources/chrome_frame_dialogs.grd   | 10 +---------
 chrome_frame/resources/chrome_frame_resources.grd |  6 ++++++
 2 files changed, 7 insertions(+), 9 deletions(-)

(limited to 'chrome_frame/resources')

diff --git a/chrome_frame/resources/chrome_frame_dialogs.grd b/chrome_frame/resources/chrome_frame_dialogs.grd
index be36810..19f71e3 100644
--- a/chrome_frame/resources/chrome_frame_dialogs.grd
+++ b/chrome_frame/resources/chrome_frame_dialogs.grd
@@ -3,7 +3,7 @@
       source_lang_id="en" enc_check="möl">
   <outputs>
     <output filename="grit/chrome_frame_dialogs.h" type="rc_header">
-      <emit emit_type='prepend'></emit>
+      <emit emit_type='prepend'>#include "grit/chrome_frame_resources.h"</emit>
     </output>
     <output filename="chrome_frame_dialogs_am.rc" type="rc_all" lang="am" />
     <output filename="chrome_frame_dialogs_ar.rc" type="rc_all" lang="ar" />
@@ -115,14 +115,6 @@
     <file path="../../chrome/app/resources/generated_resources_zh-TW.xtb" lang="zh-TW" />
   </translations>
   <release seq="1" allow_pseudo="false">
-    <includes>
-      <if expr="pp_ifdef('_google_chrome')">
-        <include name="IDI_CHROME_FRAME_ICON" file="../../chrome/app/theme/google_chrome/chrome.ico" type="ICON" />
-      </if>
-      <if expr="not pp_ifdef('_google_chrome')">
-        <include name="IDI_CHROME_FRAME_ICON" file="../../chrome/app/theme/chromium/chromium.ico" type="ICON" />
-      </if>
-    </includes>
     <structures fallback_to_english="true">
       <!-- Make sure these stay in sync with the structures in generated_resources.grd. -->
       <structure name="IDD_CHROME_FRAME_FIND_DIALOG" file="../../chrome/app/cf_resources.rc" type="dialog" >
diff --git a/chrome_frame/resources/chrome_frame_resources.grd b/chrome_frame/resources/chrome_frame_resources.grd
index fbf72a5..e9e1bc4 100644
--- a/chrome_frame/resources/chrome_frame_resources.grd
+++ b/chrome_frame/resources/chrome_frame_resources.grd
@@ -33,6 +33,12 @@ for localizable strings
       <include name="IDR_CHROMEFRAME_NPAPI" file="../chrome_frame_npapi.rgs" type="REGISTRY" />
       <include name="IDR_CHROMEPROTOCOL" file="../chrome_protocol.rgs" type="REGISTRY" />
       <include name="IDR_CHROMETAB" file="../chrome_tab.rgs" type="REGISTRY" />
+      <if expr="pp_ifdef('_google_chrome')">
+        <include name="IDI_CHROME_FRAME_ICON" file="../../chrome/app/theme/google_chrome/chrome.ico" type="ICON" />
+      </if>
+      <if expr="not pp_ifdef('_google_chrome')">
+        <include name="IDI_CHROME_FRAME_ICON" file="../../chrome/app/theme/chromium/chromium.ico" type="ICON" />
+      </if>
     </includes>
   </release>
 </grit>
-- 
cgit v1.1