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

Side by Side Diff: ui/resources/ui_resources.grd

Issue 661353002: Merged permissions in the App Info dialog into a single list (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@work_towards_app_info_ui_review
Patch Set: Added null-terminated bullet-point string Created 6 years, 1 month 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 | « ui/resources/default_200_percent/disable_pressed.png ('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 <grit latest_public_release="0" current_release="1"> 2 <grit latest_public_release="0" current_release="1">
3 <outputs> 3 <outputs>
4 <output filename="grit/ui_resources.h" type="rc_header" context="default_100 _percent"> 4 <output filename="grit/ui_resources.h" type="rc_header" context="default_100 _percent">
5 <emit emit_type='prepend'></emit> 5 <emit emit_type='prepend'></emit>
6 </output> 6 </output>
7 <output filename="grit/ui_resources_map.cc" type="resource_map_source" conte xt="default_100_percent" /> 7 <output filename="grit/ui_resources_map.cc" type="resource_map_source" conte xt="default_100_percent" />
8 <output filename="grit/ui_resources_map.h" type="resource_map_header" contex t="default_100_percent" /> 8 <output filename="grit/ui_resources_map.h" type="resource_map_header" contex t="default_100_percent" />
9 <output filename="ui_resources_100_percent.pak" type="data_package" context= "default_100_percent" /> 9 <output filename="ui_resources_100_percent.pak" type="data_package" context= "default_100_percent" />
10 <output filename="ui_resources_200_percent.pak" type="data_package" context= "default_200_percent" /> 10 <output filename="ui_resources_200_percent.pak" type="data_package" context= "default_200_percent" />
(...skipping 149 matching lines...) Expand 10 before | Expand all | Expand 10 after
160 <structure type="chrome_scaled_image" name="IDR_CLOSE" file="close.png" /> 160 <structure type="chrome_scaled_image" name="IDR_CLOSE" file="close.png" />
161 </if> 161 </if>
162 <structure type="chrome_scaled_image" name="IDR_CLOSE_2" file="close_2.png " /> 162 <structure type="chrome_scaled_image" name="IDR_CLOSE_2" file="close_2.png " />
163 <structure type="chrome_scaled_image" name="IDR_CLOSE_2_H" file="close_2_h over.png" /> 163 <structure type="chrome_scaled_image" name="IDR_CLOSE_2_H" file="close_2_h over.png" />
164 <structure type="chrome_scaled_image" name="IDR_CLOSE_2_MASK" file="close_ 2_mask.png" /> 164 <structure type="chrome_scaled_image" name="IDR_CLOSE_2_MASK" file="close_ 2_mask.png" />
165 <structure type="chrome_scaled_image" name="IDR_CLOSE_2_P" file="close_2_p ressed.png" /> 165 <structure type="chrome_scaled_image" name="IDR_CLOSE_2_P" file="close_2_p ressed.png" />
166 <structure type="chrome_scaled_image" name="IDR_CLOSE_3_MASK" file="common /close_3_mask.png" /> 166 <structure type="chrome_scaled_image" name="IDR_CLOSE_3_MASK" file="common /close_3_mask.png" />
167 <structure type="chrome_scaled_image" name="IDR_CLOSE_DIALOG" file="close_ dialog.png" /> 167 <structure type="chrome_scaled_image" name="IDR_CLOSE_DIALOG" file="close_ dialog.png" />
168 <structure type="chrome_scaled_image" name="IDR_CLOSE_DIALOG_H" file="clos e_dialog_hover.png" /> 168 <structure type="chrome_scaled_image" name="IDR_CLOSE_DIALOG_H" file="clos e_dialog_hover.png" />
169 <structure type="chrome_scaled_image" name="IDR_CLOSE_DIALOG_P" file="clos e_dialog_pressed.png" /> 169 <structure type="chrome_scaled_image" name="IDR_CLOSE_DIALOG_P" file="clos e_dialog_pressed.png" />
170 <structure type="chrome_scaled_image" name="IDR_DISABLE" file="disable.png " />
171 <structure type="chrome_scaled_image" name="IDR_DISABLE_H" file="disable_h over.png" />
172 <structure type="chrome_scaled_image" name="IDR_DISABLE_P" file="disable_p ressed.png" />
173
170 <if expr="desktop_linux"> 174 <if expr="desktop_linux">
171 <structure type="chrome_scaled_image" name="IDR_CLOSE_H" file="linux/lin ux_close_hover.png" /> 175 <structure type="chrome_scaled_image" name="IDR_CLOSE_H" file="linux/lin ux_close_hover.png" />
172 <structure type="chrome_scaled_image" name="IDR_CLOSE_P" file="linux/lin ux_close_pressed.png" /> 176 <structure type="chrome_scaled_image" name="IDR_CLOSE_P" file="linux/lin ux_close_pressed.png" />
173 </if> 177 </if>
174 <if expr="not desktop_linux and toolkit_views"> 178 <if expr="not desktop_linux and toolkit_views">
175 <structure type="chrome_scaled_image" name="IDR_CLOSE_H" file="close_hov er.png" /> 179 <structure type="chrome_scaled_image" name="IDR_CLOSE_H" file="close_hov er.png" />
176 <structure type="chrome_scaled_image" name="IDR_CLOSE_P" file="close_pre ssed.png" /> 180 <structure type="chrome_scaled_image" name="IDR_CLOSE_P" file="close_pre ssed.png" />
177 </if> 181 </if>
178 <if expr="toolkit_views"> 182 <if expr="toolkit_views">
179 <structure type="chrome_scaled_image" name="IDR_COMBOBOX_BUTTON_BOTTOM" file="common/combobox_button_bottom.png" /> 183 <structure type="chrome_scaled_image" name="IDR_COMBOBOX_BUTTON_BOTTOM" file="common/combobox_button_bottom.png" />
(...skipping 395 matching lines...) Expand 10 before | Expand all | Expand 10 after
575 <structure type="chrome_scaled_image" name="IDR_WINDOW_BUBBLE_SHADOW_SMA LL_TOP_LEFT" file="common/window_bubble_shadow_small_top_left.png" /> 579 <structure type="chrome_scaled_image" name="IDR_WINDOW_BUBBLE_SHADOW_SMA LL_TOP_LEFT" file="common/window_bubble_shadow_small_top_left.png" />
576 <structure type="chrome_scaled_image" name="IDR_WINDOW_BUBBLE_SHADOW_SMA LL_TOP_RIGHT" file="common/window_bubble_shadow_small_top_right.png" /> 580 <structure type="chrome_scaled_image" name="IDR_WINDOW_BUBBLE_SHADOW_SMA LL_TOP_RIGHT" file="common/window_bubble_shadow_small_top_right.png" />
577 <structure type="chrome_scaled_image" name="IDR_WINDOW_BUBBLE_SHADOW_SPI KE_SMALL_BOTTOM" file="common/window_bubble_shadow_spike_small_bottom.png" /> 581 <structure type="chrome_scaled_image" name="IDR_WINDOW_BUBBLE_SHADOW_SPI KE_SMALL_BOTTOM" file="common/window_bubble_shadow_spike_small_bottom.png" />
578 <structure type="chrome_scaled_image" name="IDR_WINDOW_BUBBLE_SHADOW_SPI KE_SMALL_LEFT" file="common/window_bubble_shadow_spike_small_left.png" /> 582 <structure type="chrome_scaled_image" name="IDR_WINDOW_BUBBLE_SHADOW_SPI KE_SMALL_LEFT" file="common/window_bubble_shadow_spike_small_left.png" />
579 <structure type="chrome_scaled_image" name="IDR_WINDOW_BUBBLE_SHADOW_SPI KE_SMALL_RIGHT" file="common/window_bubble_shadow_spike_small_right.png" /> 583 <structure type="chrome_scaled_image" name="IDR_WINDOW_BUBBLE_SHADOW_SPI KE_SMALL_RIGHT" file="common/window_bubble_shadow_spike_small_right.png" />
580 <structure type="chrome_scaled_image" name="IDR_WINDOW_BUBBLE_SHADOW_SPI KE_SMALL_TOP" file="common/window_bubble_shadow_spike_small_top.png" /> 584 <structure type="chrome_scaled_image" name="IDR_WINDOW_BUBBLE_SHADOW_SPI KE_SMALL_TOP" file="common/window_bubble_shadow_spike_small_top.png" />
581 </if> 585 </if>
582 </structures> 586 </structures>
583 </release> 587 </release>
584 </grit> 588 </grit>
OLDNEW
« no previous file with comments | « ui/resources/default_200_percent/disable_pressed.png ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698