chrome/browser/resources/component_extension_resources.grd - Issue 8051010: Separate Virtual Keyboard related conditionals from TouchUI

Side by Side Diff: chrome/browser/resources/component_extension_resources.grd

Issue 8051010: Separate Virtual Keyboard related conditionals from TouchUI (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: Rebased on ToT, fix along with review comments Created 9 years, 2 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

« no previous file with comments | « chrome/browser/profiles/profile_impl.cc ('k') | chrome/browser/resources/options/language_options.html » ('j') | no next file with comments »

OLD	NEW
1 <?xml version="1.0" encoding="UTF-8"?>	1 <?xml version="1.0" encoding="UTF-8"?>

2 <!-- This comment is only here because changes to resources are not picked up	2 <!-- This comment is only here because changes to resources are not picked up

3 without changes to the corresponding grd file. -->	3 without changes to the corresponding grd file. -->

4 <grit latest_public_release="0" current_release="1">	4 <grit latest_public_release="0" current_release="1">

5 <outputs>	5 <outputs>

6 <output filename="grit/component_extension_resources.h" type="rc_header">	6 <output filename="grit/component_extension_resources.h" type="rc_header">

7 <emit emit_type='prepend'></emit>	7 <emit emit_type='prepend'></emit>

8 </output>	8 </output>

9 <output filename="grit/component_extension_resources_map.cc" type="resource_ file_map_source" />	9 <output filename="grit/component_extension_resources_map.cc" type="resource_ file_map_source" />

10 <output filename="grit/component_extension_resources_map.h" type="resource_m ap_header" />	10 <output filename="grit/component_extension_resources_map.h" type="resource_m ap_header" />

(...skipping 76 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
87 <include name="IDR_FILE_MANAGER_IMG_GALLERY_CLOSE" file="file_manager/im ages/gallery/close_x.png" type="BINDATA" />	87 <include name="IDR_FILE_MANAGER_IMG_GALLERY_CLOSE" file="file_manager/im ages/gallery/close_x.png" type="BINDATA" />

88	88

89 <include name="IDR_FILE_MANAGER_ICON_DETAIL_VIEW" file="file_manager/ima ges/icon-detail-view.png" type="BINDATA" />	89 <include name="IDR_FILE_MANAGER_ICON_DETAIL_VIEW" file="file_manager/ima ges/icon-detail-view.png" type="BINDATA" />

90 <include name="IDR_FILE_MANAGER_ICON_THUMB_VIEW" file="file_manager/imag es/icon-thumb-view.png" type="BINDATA" />	90 <include name="IDR_FILE_MANAGER_ICON_THUMB_VIEW" file="file_manager/imag es/icon-thumb-view.png" type="BINDATA" />

91 <include name="IDR_FILE_MANAGER_WARNING_ICON" file="file_manager/images/ warning_icon_square_26x26.png" type="BINDATA"/>	91 <include name="IDR_FILE_MANAGER_WARNING_ICON" file="file_manager/images/ warning_icon_square_26x26.png" type="BINDATA"/>

92	92

93 <include name="IDR_FILE_MANAGER_BUTTON_ICON_COPY" file="file_manager/ima ges/button-icon-copy.png" type="BINDATA" />	93 <include name="IDR_FILE_MANAGER_BUTTON_ICON_COPY" file="file_manager/ima ges/button-icon-copy.png" type="BINDATA" />

94 <include name="IDR_FILE_MANAGER_BUTTON_ICON_PASTE" file="file_manager/im ages/button-icon-paste.png" type="BINDATA" />	94 <include name="IDR_FILE_MANAGER_BUTTON_ICON_PASTE" file="file_manager/im ages/button-icon-paste.png" type="BINDATA" />

95 </if>	95 </if>

96	96

97 <if expr="pp_ifdef('touchui')">	97 <if expr="pp_ifdef('use_virtual_keyboard')">

98 <include name="IDR_KEYBOARD_INDEX" file="keyboard/index.html" flattenhtm l="true" type="BINDATA" />	98 <include name="IDR_KEYBOARD_INDEX" file="keyboard/index.html" flattenhtm l="true" type="BINDATA" />

99 </if>	99 </if>

100 </includes>	100 </includes>

101 </release>	101 </release>

102 </grit>	102 </grit>

OLD	NEW