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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: chrome/app/theme/theme_resources.grd

Issue 1299513002: [Android] Add support for a hung renderer dialog (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 5 years, 3 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/app/generated_resources.grd ('k') | chrome/browser/android/hung_renderer_infobar_delegate.h » ('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 <!-- This grd file contains images that are pre-scaled for device scale 2 <!-- This grd file contains images that are pre-scaled for device scale
3 factors. The image returned by |base::ResourceBundle::GetImageNamed| 3 factors. The image returned by |base::ResourceBundle::GetImageNamed|
4 will contain multiple |gfx:ImageSkiaReps| for each scale factors. The 4 will contain multiple |gfx:ImageSkiaReps| for each scale factors. The
5 |fallback_to_low_resolution| attribute controls behavior when 5 |fallback_to_low_resolution| attribute controls behavior when
6 an image file is missing for target scale factor. If true, chrome 6 an image file is missing for target scale factor. If true, chrome
7 will automatically scale the 1x image to the target scale factor. 7 will automatically scale the 1x image to the target scale factor.
8 If false, build will fail due to missing resources. This is 8 If false, build will fail due to missing resources. This is
9 currently set to true for all resources, but the default will 9 currently set to true for all resources, but the default will
10 become false in near future. 10 become false in near future.
(...skipping 370 matching lines...) Expand 10 before | Expand all | Expand 10 after
381 <if expr="is_ios"> 381 <if expr="is_ios">
382 <structure type="chrome_scaled_image" name="IDR_INFOBAR_AUTOLOGIN" file= "common/infobar_autologin.png" /> 382 <structure type="chrome_scaled_image" name="IDR_INFOBAR_AUTOLOGIN" file= "common/infobar_autologin.png" />
383 </if> 383 </if>
384 <structure type="chrome_scaled_image" name="IDR_INFOBAR_COOKIE" file="comm on/infobar_cookie.png" /> 384 <structure type="chrome_scaled_image" name="IDR_INFOBAR_COOKIE" file="comm on/infobar_cookie.png" />
385 <structure type="chrome_scaled_image" name="IDR_INFOBAR_DESKTOP_NOTIFICATI ONS" file="common/infobar_desktop_notifications.png" /> 385 <structure type="chrome_scaled_image" name="IDR_INFOBAR_DESKTOP_NOTIFICATI ONS" file="common/infobar_desktop_notifications.png" />
386 <if expr="is_android"> 386 <if expr="is_android">
387 <!-- The actual image here is not used; this line only exists to 387 <!-- The actual image here is not used; this line only exists to
388 reserve a valid ID, so the Android code can map it to the 388 reserve a valid ID, so the Android code can map it to the
389 appropriate Android resource. So we just refer to a random 389 appropriate Android resource. So we just refer to a random
390 image. --> 390 image. -->
391 <structure type="chrome_scaled_image" name="IDR_INFOBAR_FROZEN_TAB" file ="chromium/product_logo_32.png" />
391 <structure type="chrome_scaled_image" name="IDR_INFOBAR_FULLSCREEN" file ="chromium/product_logo_32.png" /> 392 <structure type="chrome_scaled_image" name="IDR_INFOBAR_FULLSCREEN" file ="chromium/product_logo_32.png" />
392 </if> 393 </if>
393 <structure type="chrome_scaled_image" name="IDR_INFOBAR_GEOLOCATION" file= "common/infobar_geolocation.png" /> 394 <structure type="chrome_scaled_image" name="IDR_INFOBAR_GEOLOCATION" file= "common/infobar_geolocation.png" />
394 <structure type="chrome_scaled_image" name="IDR_INFOBAR_MEDIA_STREAM_CAMER A" file="common/infobar_media_stream_camera.png" /> 395 <structure type="chrome_scaled_image" name="IDR_INFOBAR_MEDIA_STREAM_CAMER A" file="common/infobar_media_stream_camera.png" />
395 <structure type="chrome_scaled_image" name="IDR_INFOBAR_MEDIA_STREAM_MIC" file="common/infobar_media_stream_mic.png" /> 396 <structure type="chrome_scaled_image" name="IDR_INFOBAR_MEDIA_STREAM_MIC" file="common/infobar_media_stream_mic.png" />
396 <structure type="chrome_scaled_image" name="IDR_INFOBAR_MIDI" file="common /infobar_midi.png" /> 397 <structure type="chrome_scaled_image" name="IDR_INFOBAR_MIDI" file="common /infobar_midi.png" />
397 <structure type="chrome_scaled_image" name="IDR_INFOBAR_MULTIPLE_DOWNLOADS " file="common/infobar_multiple_downloads.png" /> 398 <structure type="chrome_scaled_image" name="IDR_INFOBAR_MULTIPLE_DOWNLOADS " file="common/infobar_multiple_downloads.png" />
398 <structure type="chrome_scaled_image" name="IDR_INFOBAR_PLUGIN_CRASHED" fi le="common/infobar_plugin_crashed.png" /> 399 <structure type="chrome_scaled_image" name="IDR_INFOBAR_PLUGIN_CRASHED" fi le="common/infobar_plugin_crashed.png" />
399 <structure type="chrome_scaled_image" name="IDR_INFOBAR_PLUGIN_INSTALL" fi le="common/infobar_plugin_install.png" /> 400 <structure type="chrome_scaled_image" name="IDR_INFOBAR_PLUGIN_INSTALL" fi le="common/infobar_plugin_install.png" />
400 <if expr="is_android or chromeos"> 401 <if expr="is_android or chromeos">
(...skipping 630 matching lines...) Expand 10 before | Expand all | Expand 10 after
1031 <!-- People search images --> 1032 <!-- People search images -->
1032 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_EMAIL " file="common/mail.png" /> 1033 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_EMAIL " file="common/mail.png" />
1033 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_EMAIL _HOVER" file="common/mail_hover.png" /> 1034 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_EMAIL _HOVER" file="common/mail_hover.png" />
1034 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_EMAIL _PRESSED" file="common/mail_pressed.png" /> 1035 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_EMAIL _PRESSED" file="common/mail_pressed.png" />
1035 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_CHAT" file="common/chat.png" /> 1036 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_CHAT" file="common/chat.png" />
1036 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_CHAT_ HOVER" file="common/chat_hover.png" /> 1037 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_CHAT_ HOVER" file="common/chat_hover.png" />
1037 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_CHAT_ PRESSED" file="common/chat_pressed.png" /> 1038 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_CHAT_ PRESSED" file="common/chat_pressed.png" />
1038 </structures> 1039 </structures>
1039 </release> 1040 </release>
1040 </grit> 1041 </grit>
OLDNEW
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/android/hung_renderer_infobar_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698