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

Side by Side 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, 3 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome_frame/resources/chrome_frame_dialogs.grd ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 <?xml version="1.0" encoding="UTF-8"?> 1 <?xml version="1.0" encoding="UTF-8"?>
2 2
3 <!-- 3 <!--
4 Copyright (c) 2010 The Chromium Authors. All rights reserved. Use of this 4 Copyright (c) 2010 The Chromium Authors. All rights reserved. Use of this
5 source code is governed by a BSD-style license that can be found in the LICENSE 5 source code is governed by a BSD-style license that can be found in the LICENSE
6 file. 6 file.
7 --> 7 -->
8 8
9 <!-- 9 <!--
10 Embeded strings, branding resource, etc. See chrome_frame_strings.grd 10 Embeded strings, branding resource, etc. See chrome_frame_strings.grd
(...skipping 15 matching lines...) Expand all
26 </structures> 26 </structures>
27 <includes> 27 <includes>
28 <include name="IDR_REGISTER_BHO" file="../register_bho.rgs" type="REGISTRY " /> 28 <include name="IDR_REGISTER_BHO" file="../register_bho.rgs" type="REGISTRY " />
29 <include name="IDR_BHO" file="../bho.rgs" type="REGISTRY" /> 29 <include name="IDR_BHO" file="../bho.rgs" type="REGISTRY" />
30 <include name="IDR_CHROMEACTIVEDOCUMENT" file="../chrome_active_document.r gs" type="REGISTRY" /> 30 <include name="IDR_CHROMEACTIVEDOCUMENT" file="../chrome_active_document.r gs" type="REGISTRY" />
31 <include name="IDR_CHROMEFRAME_ACTIVEX" file="../chrome_frame_activex.rgs" type="REGISTRY" /> 31 <include name="IDR_CHROMEFRAME_ACTIVEX" file="../chrome_frame_activex.rgs" type="REGISTRY" />
32 <include name="IDR_CHROMEFRAME_ELEVATION" file="../chrome_frame_elevation. rgs" type="REGISTRY" /> 32 <include name="IDR_CHROMEFRAME_ELEVATION" file="../chrome_frame_elevation. rgs" type="REGISTRY" />
33 <include name="IDR_CHROMEFRAME_NPAPI" file="../chrome_frame_npapi.rgs" typ e="REGISTRY" /> 33 <include name="IDR_CHROMEFRAME_NPAPI" file="../chrome_frame_npapi.rgs" typ e="REGISTRY" />
34 <include name="IDR_CHROMEPROTOCOL" file="../chrome_protocol.rgs" type="REG ISTRY" /> 34 <include name="IDR_CHROMEPROTOCOL" file="../chrome_protocol.rgs" type="REG ISTRY" />
35 <include name="IDR_CHROMETAB" file="../chrome_tab.rgs" type="REGISTRY" /> 35 <include name="IDR_CHROMETAB" file="../chrome_tab.rgs" type="REGISTRY" />
36 <if expr="pp_ifdef('_google_chrome')">
37 <include name="IDI_CHROME_FRAME_ICON" file="../../chrome/app/theme/googl e_chrome/chrome.ico" type="ICON" />
38 </if>
39 <if expr="not pp_ifdef('_google_chrome')">
40 <include name="IDI_CHROME_FRAME_ICON" file="../../chrome/app/theme/chrom ium/chromium.ico" type="ICON" />
41 </if>
36 </includes> 42 </includes>
37 </release> 43 </release>
38 </grit> 44 </grit>
OLDNEW
« 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