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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 863263007: media: Enable ProtectedMediaIdentifierPermissionContext on ChromeOS. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase only Created 5 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
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/chrome_content_browser_client.cc » ('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 420 matching lines...) Expand 10 before | Expand all | Expand 10 after
431 <structure type="chrome_scaled_image" name="IDR_INFOBAR_CRYPTOTOKEN" fil e="common/infobar_cryptotoken.png" /> 431 <structure type="chrome_scaled_image" name="IDR_INFOBAR_CRYPTOTOKEN" fil e="common/infobar_cryptotoken.png" />
432 </if> 432 </if>
433 <structure type="chrome_scaled_image" name="IDR_INFOBAR_DESKTOP_NOTIFICATI ONS" file="common/infobar_desktop_notifications.png" /> 433 <structure type="chrome_scaled_image" name="IDR_INFOBAR_DESKTOP_NOTIFICATI ONS" file="common/infobar_desktop_notifications.png" />
434 <structure type="chrome_scaled_image" name="IDR_INFOBAR_GEOLOCATION" file= "common/infobar_geolocation.png" /> 434 <structure type="chrome_scaled_image" name="IDR_INFOBAR_GEOLOCATION" file= "common/infobar_geolocation.png" />
435 <structure type="chrome_scaled_image" name="IDR_INFOBAR_MEDIA_STREAM_CAMER A" file="common/infobar_media_stream_camera.png" /> 435 <structure type="chrome_scaled_image" name="IDR_INFOBAR_MEDIA_STREAM_CAMER A" file="common/infobar_media_stream_camera.png" />
436 <structure type="chrome_scaled_image" name="IDR_INFOBAR_MEDIA_STREAM_MIC" file="common/infobar_media_stream_mic.png" /> 436 <structure type="chrome_scaled_image" name="IDR_INFOBAR_MEDIA_STREAM_MIC" file="common/infobar_media_stream_mic.png" />
437 <structure type="chrome_scaled_image" name="IDR_INFOBAR_MIDI" file="common /infobar_midi.png" /> 437 <structure type="chrome_scaled_image" name="IDR_INFOBAR_MIDI" file="common /infobar_midi.png" />
438 <structure type="chrome_scaled_image" name="IDR_INFOBAR_MULTIPLE_DOWNLOADS " file="common/infobar_multiple_downloads.png" /> 438 <structure type="chrome_scaled_image" name="IDR_INFOBAR_MULTIPLE_DOWNLOADS " file="common/infobar_multiple_downloads.png" />
439 <structure type="chrome_scaled_image" name="IDR_INFOBAR_PLUGIN_CRASHED" fi le="common/infobar_plugin_crashed.png" /> 439 <structure type="chrome_scaled_image" name="IDR_INFOBAR_PLUGIN_CRASHED" fi le="common/infobar_plugin_crashed.png" />
440 <structure type="chrome_scaled_image" name="IDR_INFOBAR_PLUGIN_INSTALL" fi le="common/infobar_plugin_install.png" /> 440 <structure type="chrome_scaled_image" name="IDR_INFOBAR_PLUGIN_INSTALL" fi le="common/infobar_plugin_install.png" />
441 <if expr="is_android"> 441 <if expr="is_android or chromeos">
442 <!-- The actual image here is not used; this line only exists to 442 <!-- The actual image here is not used; this line only exists to
443 reserve a valid ID, so the Android code can map it to the 443 reserve a valid ID, so the Android code can map it to the
444 appropriate Android resource. So we just refer to a random 444 appropriate Android resource. So we just refer to a random
445 image. --> 445 image. -->
446 <structure type="chrome_scaled_image" name="IDR_INFOBAR_PROTECTED_MEDIA_ IDENTIFIER" file="chromium/product_logo_32.png" /> 446 <structure type="chrome_scaled_image" name="IDR_INFOBAR_PROTECTED_MEDIA_ IDENTIFIER" file="chromium/product_logo_32.png" />
447 </if> 447 </if>
448 <structure type="chrome_scaled_image" name="IDR_INFOBAR_RESTORE_SESSION" f ile="common/infobar_restore_session.png" /> 448 <structure type="chrome_scaled_image" name="IDR_INFOBAR_RESTORE_SESSION" f ile="common/infobar_restore_session.png" />
449 <structure type="chrome_scaled_image" name="IDR_INFOBAR_SAVE_PASSWORD" fil e="common/infobar_save_password.png" /> 449 <structure type="chrome_scaled_image" name="IDR_INFOBAR_SAVE_PASSWORD" fil e="common/infobar_save_password.png" />
450 <structure type="chrome_scaled_image" name="IDR_INFOBAR_THEME" file="commo n/infobar_theme.png" /> 450 <structure type="chrome_scaled_image" name="IDR_INFOBAR_THEME" file="commo n/infobar_theme.png" />
451 <structure type="chrome_scaled_image" name="IDR_INFOBAR_TRANSLATE" file="c ommon/infobar_translate.png" /> 451 <structure type="chrome_scaled_image" name="IDR_INFOBAR_TRANSLATE" file="c ommon/infobar_translate.png" />
(...skipping 762 matching lines...) Expand 10 before | Expand all | Expand 10 after
1214 <!-- People search images --> 1214 <!-- People search images -->
1215 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_EMAIL " file="common/mail.png" /> 1215 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_EMAIL " file="common/mail.png" />
1216 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_EMAIL _HOVER" file="common/mail_hover.png" /> 1216 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_EMAIL _HOVER" file="common/mail_hover.png" />
1217 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_EMAIL _PRESSED" file="common/mail_pressed.png" /> 1217 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_EMAIL _PRESSED" file="common/mail_pressed.png" />
1218 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_CHAT" file="common/chat.png" /> 1218 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_CHAT" file="common/chat.png" />
1219 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_CHAT_ HOVER" file="common/chat_hover.png" /> 1219 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_CHAT_ HOVER" file="common/chat_hover.png" />
1220 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_CHAT_ PRESSED" file="common/chat_pressed.png" /> 1220 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_CHAT_ PRESSED" file="common/chat_pressed.png" />
1221 </structures> 1221 </structures>
1222 </release> 1222 </release>
1223 </grit> 1223 </grit>
OLDNEW
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/chrome_content_browser_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698