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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 262973004: Move session length timer into tray bubble. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase. Created 6 years, 7 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/ash_strings.grd ('k') | ash/resources/default_100_percent/cros/notification/notification_session_length_timer.png » ('j') | 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 125 matching lines...) Expand 10 before | Expand all | Expand 10 after
136 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NETWORK_INF O_HOVER" file="cros/network/status_network_info_hover.png" /> 136 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NETWORK_INF O_HOVER" file="cros/network/status_network_info_hover.png" />
137 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NOTIFICATIO N_3G" file="cros/network/notification_3g.png" /> 137 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NOTIFICATIO N_3G" file="cros/network/notification_3g.png" />
138 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NOTIFICATIO N_LTE" file="cros/network/notification_lte.png" /> 138 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NOTIFICATIO N_LTE" file="cros/network/notification_lte.png" />
139 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_OVERVIEW_MO DE" file="cros/status/status_overview_mode.png" /> 139 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_OVERVIEW_MO DE" file="cros/status/status_overview_mode.png" />
140 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_POWER_SMALL " file="cros/status/status_power_small_all.png" /> 140 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_POWER_SMALL " file="cros/status/status_power_small_all.png" />
141 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_POWER_SMALL _DARK" file="cros/status/status_power_small_all_dark.png" /> 141 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_POWER_SMALL _DARK" file="cros/status/status_power_small_all_dark.png" />
142 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_POWER_SMALL _CHARGING_UNRELIABLE" file="cros/status/status_power_small_all_fluctuating.png" /> 142 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_POWER_SMALL _CHARGING_UNRELIABLE" file="cros/status/status_power_small_all_fluctuating.png" />
143 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_POWER_SMALL _CHARGING_UNRELIABLE_DARK" file="cros/status/status_power_small_all_dark_fluctua ting.png" /> 143 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_POWER_SMALL _CHARGING_UNRELIABLE_DARK" file="cros/status/status_power_small_all_dark_fluctua ting.png" />
144 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_SCREENSHARE " file="cros/status/status_screenshare.png" /> 144 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_SCREENSHARE " file="cros/status/status_screenshare.png" />
145 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_SCREENSHARE _DARK" file="cros/status/status_screenshare_dark.png" /> 145 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_SCREENSHARE _DARK" file="cros/status/status_screenshare_dark.png" />
146 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_SESSION_LEN GTH_LIMIT_TIMER" file="cros/status/status_session_length_limit_timer.png" />
147 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_SETTINGS" f ile="cros/status/status_settings.png" /> 146 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_SETTINGS" f ile="cros/status/status_settings.png" />
148 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_SHUTDOWN" f ile="cros/status/status_shutdown.png" /> 147 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_SHUTDOWN" f ile="cros/status/status_shutdown.png" />
149 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_SHUTDOWN_HO VER" file="cros/status/status_shutdown_hover.png" /> 148 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_SHUTDOWN_HO VER" file="cros/status/status_shutdown_hover.png" />
150 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_SMS" file=" cros/status/status_sms.png" /> 149 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_SMS" file=" cros/status/status_sms.png" />
151 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_SMS_DISMISS " file="cros/status/status_sms_dismiss.png" /> 150 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_SMS_DISMISS " file="cros/status/status_sms_dismiss.png" />
152 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_TRACING" fi le="cros/status/status_tracing.png" /> 151 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_TRACING" fi le="cros/status/status_tracing.png" />
153 152
154 <!-- ChromeOS specific icons --> 153 <!-- ChromeOS specific icons -->
155 <if expr="chromeos"> 154 <if expr="chromeos">
156 <structure type="chrome_scaled_image" name="IDR_AURA_NOTIFICATION_LOW_PO WER_CHARGER" file="cros/notification/notification_low_power_charger.png" /> 155 <structure type="chrome_scaled_image" name="IDR_AURA_NOTIFICATION_LOW_PO WER_CHARGER" file="cros/notification/notification_low_power_charger.png" />
157 <structure type="chrome_scaled_image" name="IDR_AURA_NOTIFICATION_DISPLA Y" file="cros/notification/display_notification_icon.png" /> 156 <structure type="chrome_scaled_image" name="IDR_AURA_NOTIFICATION_DISPLA Y" file="cros/notification/display_notification_icon.png" />
157 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_BUBBLE_SE SSION_LENGTH_LIMIT" file="cros/status/status_session_length_timer.png" />
158 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_ENTERPRIS E" file="cros/status/status_managed.png" /> 158 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_ENTERPRIS E" file="cros/status/status_managed.png" />
159 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_MANAGED_U SER" file="cros/status/status_managed_mode_user.png" /> 159 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_MANAGED_U SER" file="cros/status/status_managed_mode_user.png" />
160 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NETWORK_1 X" file="cros/network/statusbar_network_1x.png" /> 160 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NETWORK_1 X" file="cros/network/statusbar_network_1x.png" />
161 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NETWORK_3 G_DARK" file="cros/network/statusbar_network_3g_dark.png" /> 161 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NETWORK_3 G_DARK" file="cros/network/statusbar_network_3g_dark.png" />
162 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NETWORK_3 G_LIGHT" file="cros/network/statusbar_network_3g_light.png" /> 162 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NETWORK_3 G_LIGHT" file="cros/network/statusbar_network_3g_light.png" />
163 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NETWORK_4 G_DARK" file="cros/network/statusbar_network_4g_dark.png" /> 163 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NETWORK_4 G_DARK" file="cros/network/statusbar_network_4g_dark.png" />
164 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NETWORK_4 G_LIGHT" file="cros/network/statusbar_network_4g_light.png" /> 164 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NETWORK_4 G_LIGHT" file="cros/network/statusbar_network_4g_light.png" />
165 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NETWORK_A RCS_DARK" file="cros/network/statusbar_network_arcs_dark.png" /> 165 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NETWORK_A RCS_DARK" file="cros/network/statusbar_network_arcs_dark.png" />
166 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NETWORK_A RCS_LIGHT" file="cros/network/statusbar_network_arcs_light.png" /> 166 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NETWORK_A RCS_LIGHT" file="cros/network/statusbar_network_arcs_light.png" />
167 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NETWORK_B ARS_DARK" file="cros/network/statusbar_network_bars_dark.png" /> 167 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NETWORK_B ARS_DARK" file="cros/network/statusbar_network_bars_dark.png" />
(...skipping 13 matching lines...) Expand all
181 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NETWORK_L TE_ADVANCED_DARK" file="cros/network/statusbar_network_lte_advanced_dark.png" /> 181 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NETWORK_L TE_ADVANCED_DARK" file="cros/network/statusbar_network_lte_advanced_dark.png" />
182 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NETWORK_L TE_ADVANCED_LIGHT" file="cros/network/statusbar_network_lte_advanced_light.png" /> 182 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NETWORK_L TE_ADVANCED_LIGHT" file="cros/network/statusbar_network_lte_advanced_light.png" />
183 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NETWORK_P ORTAL_DARK" file="cros/network/statusbar_network_active_portal_dark.png" /> 183 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NETWORK_P ORTAL_DARK" file="cros/network/statusbar_network_active_portal_dark.png" />
184 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NETWORK_P ORTAL_LIGHT" file="cros/network/statusbar_network_active_portal_light.png" /> 184 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NETWORK_P ORTAL_LIGHT" file="cros/network/statusbar_network_active_portal_light.png" />
185 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NETWORK_R OAMING_DARK" file="cros/network/statusbar_network_roaming_dark.png" /> 185 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NETWORK_R OAMING_DARK" file="cros/network/statusbar_network_roaming_dark.png" />
186 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NETWORK_R OAMING_LIGHT" file="cros/network/statusbar_network_roaming_light.png" /> 186 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NETWORK_R OAMING_LIGHT" file="cros/network/statusbar_network_roaming_light.png" />
187 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NETWORK_S ECURE_DARK" file="cros/network/statusbar_network_secure_dark.png" /> 187 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NETWORK_S ECURE_DARK" file="cros/network/statusbar_network_secure_dark.png" />
188 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NETWORK_V PN" file="cros/network/statusbar_vpn_dark.png" /> 188 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NETWORK_V PN" file="cros/network/statusbar_vpn_dark.png" />
189 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NETWORK_V PN_BADGE" file="cros/network/statusbar_network_vpn_badge.png" /> 189 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NETWORK_V PN_BADGE" file="cros/network/statusbar_network_vpn_badge.png" />
190 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NETWORK_W IRED" file="cros/network/statusbar_wired.png" /> 190 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NETWORK_W IRED" file="cros/network/statusbar_wired.png" />
191 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NOTIFICAT ION_SESSION_LENGTH_LIMIT" file="cros/notification/notification_session_length_ti mer.png" />
191 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_RECORDING " file="cros/status/status_recording.png" /> 192 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_RECORDING " file="cros/status/status_recording.png" />
192 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_RECORDING _RED" file="cros/status/status_recording_red.png" /> 193 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_RECORDING _RED" file="cros/status/status_recording_red.png" />
193 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_VIRTUAL_K EYBOARD" file="cros/status/status_virtual_keyboard.png" /> 194 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_VIRTUAL_K EYBOARD" file="cros/status/status_virtual_keyboard.png" />
194 </if> 195 </if>
195 196
196 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_AUTO_ROTATI ON" file="cros/status/status_auto_rotate.png" /> 197 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_AUTO_ROTATI ON" file="cros/status/status_auto_rotate.png" />
197 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_AUTO_ROTATI ON_DARK" file="cros/status/status_auto_rotate_dark.png" /> 198 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_AUTO_ROTATI ON_DARK" file="cros/status/status_auto_rotate_dark.png" />
198 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_AUTO_ROTATI ON_LOCKED" file="cros/status/status_auto_rotate_locked.png" /> 199 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_AUTO_ROTATI ON_LOCKED" file="cros/status/status_auto_rotate_locked.png" />
199 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_AUTO_ROTATI ON_LOCKED_DARK" file="cros/status/status_auto_rotate_locked_dark.png" /> 200 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_AUTO_ROTATI ON_LOCKED_DARK" file="cros/status/status_auto_rotate_locked_dark.png" />
200 201
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
239 240
240 <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_OVERVIEW_CLOSE " file="common/window_overview_close_normal.png" /> 241 <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_OVERVIEW_CLOSE " file="common/window_overview_close_normal.png" />
241 <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_OVERVIEW_CLOSE _H" file="common/window_overview_close_hover.png" /> 242 <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_OVERVIEW_CLOSE _H" file="common/window_overview_close_hover.png" />
242 <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_OVERVIEW_CLOSE _P" file="common/window_overview_close_pressed.png" /> 243 <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_OVERVIEW_CLOSE _P" file="common/window_overview_close_pressed.png" />
243 244
244 <structure type="chrome_scaled_image" name="IDR_AVATAR_HOLDER" file="cros/ avatar_holder.png" /> 245 <structure type="chrome_scaled_image" name="IDR_AVATAR_HOLDER" file="cros/ avatar_holder.png" />
245 <structure type="chrome_scaled_image" name="IDR_AVATAR_HOLDER_MASK" file=" cros/avatar_holder_mask.png" /> 246 <structure type="chrome_scaled_image" name="IDR_AVATAR_HOLDER_MASK" file=" cros/avatar_holder_mask.png" />
246 </structures> 247 </structures>
247 </release> 248 </release>
248 </grit> 249 </grit>
OLDNEW
« no previous file with comments | « ash/ash_strings.grd ('k') | ash/resources/default_100_percent/cros/notification/notification_session_length_timer.png » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698