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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 980943005: Add ash UI for third-party VPNs (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@f_2_407541_434711_remove_combined_name
Patch Set: Created 5 years, 9 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 | « ash/metrics/user_metrics_recorder.cc ('k') | ash/resources/default_100_percent/cros/network/status_vpn_disconnect.png » ('j') | ash/system/chromeos/network/network_state_list_detailed_view.h » ('J')
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 147 matching lines...) Expand 10 before | Expand all | Expand 10 after
158 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_SCREENSHA RE" file="cros/status/status_screenshare.png" /> 158 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_SCREENSHA RE" file="cros/status/status_screenshare.png" />
159 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_SCREENSHA RE_DARK" file="cros/status/status_screenshare_dark.png" /> 159 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_SCREENSHA RE_DARK" file="cros/status/status_screenshare_dark.png" />
160 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_SETTINGS" file="cros/status/status_settings.png" /> 160 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_SETTINGS" file="cros/status/status_settings.png" />
161 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_SMS" file ="cros/status/status_sms.png" /> 161 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_SMS" file ="cros/status/status_sms.png" />
162 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_SMS_DISMI SS" file="cros/status/status_sms_dismiss.png" /> 162 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_SMS_DISMI SS" file="cros/status/status_sms_dismiss.png" />
163 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_TRACING" file="cros/status/status_tracing.png" /> 163 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_TRACING" file="cros/status/status_tracing.png" />
164 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_VIRTUAL_K EYBOARD" file="cros/status/status_virtual_keyboard.png" /> 164 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_VIRTUAL_K EYBOARD" file="cros/status/status_virtual_keyboard.png" />
165 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_VIRTUAL_K EYBOARD_DISABLED" file="cros/status/status_on_screen_keyboard_disabled.png" /> 165 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_VIRTUAL_K EYBOARD_DISABLED" file="cros/status/status_on_screen_keyboard_disabled.png" />
166 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_VIRTUAL_K EYBOARD_ENABLED" file="cros/status/status_on_screen_keyboard_enabled.png" /> 166 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_VIRTUAL_K EYBOARD_ENABLED" file="cros/status/status_on_screen_keyboard_enabled.png" />
167 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_VIRTUAL_K EYBOARD_SUPPRESSED" file="cros/status/status_accessibility_keyboard.png" /> 167 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_VIRTUAL_K EYBOARD_SUPPRESSED" file="cros/status/status_accessibility_keyboard.png" />
168 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_VPN_DISCO NNECT" file="cros/network/status_vpn_disconnect.png" />
168 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_WIFI_DISA BLED" file="cros/network/status_wifi_disabled.png" /> 169 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_WIFI_DISA BLED" file="cros/network/status_wifi_disabled.png" />
169 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_WIFI_DISA BLED_HOVER" file="cros/network/status_wifi_disabled_hover.png" /> 170 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_WIFI_DISA BLED_HOVER" file="cros/network/status_wifi_disabled_hover.png" />
170 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_WIFI_ENAB LED" file="cros/network/status_wifi_enabled.png" /> 171 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_WIFI_ENAB LED" file="cros/network/status_wifi_enabled.png" />
171 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_WIFI_ENAB LED_HOVER" file="cros/network/status_wifi_enabled_hover.png" /> 172 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_WIFI_ENAB LED_HOVER" file="cros/network/status_wifi_enabled_hover.png" />
172 </if> 173 </if>
173 174
174 175
175 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_UPDATE" fil e="cros/status/status_update.png" /> 176 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_UPDATE" fil e="cros/status/status_update.png" />
176 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_UPDATE_GREE N" file="cros/status/status_update_green.png" /> 177 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_UPDATE_GREE N" file="cros/status/status_update_green.png" />
177 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_UPDATE_ORAN GE" file="cros/status/status_update_orange.png" /> 178 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_UPDATE_ORAN GE" file="cros/status/status_update_orange.png" />
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
213 214
214 <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_OVERVIEW_CLOSE " file="common/window_overview_close_normal.png" /> 215 <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_OVERVIEW_CLOSE " file="common/window_overview_close_normal.png" />
215 <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_OVERVIEW_CLOSE _H" file="common/window_overview_close_hover.png" /> 216 <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_OVERVIEW_CLOSE _H" file="common/window_overview_close_hover.png" />
216 <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_OVERVIEW_CLOSE _P" file="common/window_overview_close_pressed.png" /> 217 <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_OVERVIEW_CLOSE _P" file="common/window_overview_close_pressed.png" />
217 218
218 <structure type="chrome_scaled_image" name="IDR_AVATAR_HOLDER" file="cros/ avatar_holder.png" /> 219 <structure type="chrome_scaled_image" name="IDR_AVATAR_HOLDER" file="cros/ avatar_holder.png" />
219 <structure type="chrome_scaled_image" name="IDR_AVATAR_HOLDER_MASK" file=" cros/avatar_holder_mask.png" /> 220 <structure type="chrome_scaled_image" name="IDR_AVATAR_HOLDER_MASK" file=" cros/avatar_holder_mask.png" />
220 </structures> 221 </structures>
221 </release> 222 </release>
222 </grit> 223 </grit>
OLDNEW
« no previous file with comments | « ash/metrics/user_metrics_recorder.cc ('k') | ash/resources/default_100_percent/cros/network/status_vpn_disconnect.png » ('j') | ash/system/chromeos/network/network_state_list_detailed_view.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698