Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(575)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome_frame/resources/chrome_frame_resources.grd

Issue 7790011: Move the Chrome/Chromium icon from the locale dlls into npchrome_frame.dll. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome_frame/resources/chrome_frame_dialogs.grd ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome_frame/resources/chrome_frame_resources.grd
diff --git a/chrome_frame/resources/chrome_frame_resources.grd b/chrome_frame/resources/chrome_frame_resources.grd
index fbf72a5328549267aa4ae5cf4ca334da021b37a0..e9e1bc4122e2098cee165fbd343af7632a0f908f 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>
« no previous file with comments | « chrome_frame/resources/chrome_frame_dialogs.grd ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698