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

Side by Side Diff: ash/resources/ash_resources.grd

Issue 169063004: Remove pp_ifdef from grd files in ash/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 10 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 | « ash/ash_strings.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 <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/ash_resources.h" type="rc_header" context="default_10 0_percent"> 4 <output filename="grit/ash_resources.h" type="rc_header" context="default_10 0_percent">
5 <emit emit_type='prepend'></emit> 5 <emit emit_type='prepend'></emit>
6 </output> 6 </output>
7 <output filename="ash_resources_100_percent.pak" type="data_package" context ="default_100_percent" /> 7 <output filename="ash_resources_100_percent.pak" type="data_package" context ="default_100_percent" />
8 <output filename="ash_resources_200_percent.pak" type="data_package" context ="default_200_percent" /> 8 <output filename="ash_resources_200_percent.pak" type="data_package" context ="default_200_percent" />
9 </outputs> 9 </outputs>
10 <release seq="1"> 10 <release seq="1">
(...skipping 136 matching lines...) Expand 10 before | Expand all | Expand 10 after
147 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_SCREENSHARE " file="cros/status/status_screenshare.png" /> 147 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_SCREENSHARE " file="cros/status/status_screenshare.png" />
148 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_SCREENSHARE _DARK" file="cros/status/status_screenshare_dark.png" /> 148 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_SCREENSHARE _DARK" file="cros/status/status_screenshare_dark.png" />
149 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_SESSION_LEN GTH_LIMIT_TIMER" file="cros/status/status_session_length_limit_timer.png" /> 149 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_SESSION_LEN GTH_LIMIT_TIMER" file="cros/status/status_session_length_limit_timer.png" />
150 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_SETTINGS" f ile="cros/status/status_settings.png" /> 150 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_SETTINGS" f ile="cros/status/status_settings.png" />
151 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_SHUTDOWN" f ile="cros/status/status_shutdown.png" /> 151 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_SHUTDOWN" f ile="cros/status/status_shutdown.png" />
152 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_SHUTDOWN_HO VER" file="cros/status/status_shutdown_hover.png" /> 152 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_SHUTDOWN_HO VER" file="cros/status/status_shutdown_hover.png" />
153 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_SMS" file=" cros/status/status_sms.png" /> 153 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_SMS" file=" cros/status/status_sms.png" />
154 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_TRACING" fi le="cros/status/status_tracing.png" /> 154 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_TRACING" fi le="cros/status/status_tracing.png" />
155 155
156 <!-- ChromeOS specific icons --> 156 <!-- ChromeOS specific icons -->
157 <if expr="pp_ifdef('chromeos')"> 157 <if expr="chromeos">
158 <structure type="chrome_scaled_image" name="IDR_AURA_NOTIFICATION_LOW_PO WER_CHARGER" file="cros/notification/notification_low_power_charger.png" /> 158 <structure type="chrome_scaled_image" name="IDR_AURA_NOTIFICATION_LOW_PO WER_CHARGER" file="cros/notification/notification_low_power_charger.png" />
159 <structure type="chrome_scaled_image" name="IDR_AURA_NOTIFICATION_DISPLA Y" file="cros/notification/display_notification_icon.png" /> 159 <structure type="chrome_scaled_image" name="IDR_AURA_NOTIFICATION_DISPLA Y" file="cros/notification/display_notification_icon.png" />
160 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_ENTERPRIS E_DARK" file="cros/status/status_managed.png" /> 160 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_ENTERPRIS E_DARK" file="cros/status/status_managed.png" />
161 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_MANAGED_U SER" file="cros/status/status_managed_mode_user.png" /> 161 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_MANAGED_U SER" file="cros/status/status_managed_mode_user.png" />
162 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NETWORK_1 X" file="cros/network/statusbar_network_1x.png" /> 162 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NETWORK_1 X" file="cros/network/statusbar_network_1x.png" />
163 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NETWORK_3 G_DARK" file="cros/network/statusbar_network_3g_dark.png" /> 163 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NETWORK_3 G_DARK" file="cros/network/statusbar_network_3g_dark.png" />
164 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NETWORK_3 G_LIGHT" file="cros/network/statusbar_network_3g_light.png" /> 164 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NETWORK_3 G_LIGHT" file="cros/network/statusbar_network_3g_light.png" />
165 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NETWORK_4 G_DARK" file="cros/network/statusbar_network_4g_dark.png" /> 165 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NETWORK_4 G_DARK" file="cros/network/statusbar_network_4g_dark.png" />
166 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NETWORK_4 G_LIGHT" file="cros/network/statusbar_network_4g_light.png" /> 166 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NETWORK_4 G_LIGHT" file="cros/network/statusbar_network_4g_light.png" />
167 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NETWORK_A RCS_DARK" file="cros/network/statusbar_network_arcs_dark.png" /> 167 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NETWORK_A RCS_DARK" file="cros/network/statusbar_network_arcs_dark.png" />
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after
260 <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_POSITION_RIGHT _P" file="common/window_position_right_pressed.png" /> 260 <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_POSITION_RIGHT _P" file="common/window_position_right_pressed.png" />
261 <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_POSITION_LEFT_ RESTORE" file="common/window_position_left_normal_restore.png" /> 261 <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_POSITION_LEFT_ RESTORE" file="common/window_position_left_normal_restore.png" />
262 <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_POSITION_LEFT_ RESTORE_H" file="common/window_position_left_hover_restore.png" /> 262 <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_POSITION_LEFT_ RESTORE_H" file="common/window_position_left_hover_restore.png" />
263 <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_POSITION_LEFT_ RESTORE_P" file="common/window_position_left_pressed_restore.png" /> 263 <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_POSITION_LEFT_ RESTORE_P" file="common/window_position_left_pressed_restore.png" />
264 <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_POSITION_RIGHT _RESTORE" file="common/window_position_right_normal_restore.png" /> 264 <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_POSITION_RIGHT _RESTORE" file="common/window_position_right_normal_restore.png" />
265 <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_POSITION_RIGHT _RESTORE_H" file="common/window_position_right_hover_restore.png" /> 265 <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_POSITION_RIGHT _RESTORE_H" file="common/window_position_right_hover_restore.png" />
266 <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_POSITION_RIGHT _RESTORE_P" file="common/window_position_right_pressed_restore.png" /> 266 <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_POSITION_RIGHT _RESTORE_P" file="common/window_position_right_pressed_restore.png" />
267 </structures> 267 </structures>
268 </release> 268 </release>
269 </grit> 269 </grit>
OLDNEW
« no previous file with comments | « ash/ash_strings.grd ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698