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

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

Issue 1280033002: Revert of Add channel-specific product logo to chrome://help (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 4 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 | « no previous file | chrome/browser/resources/help/help_content.html » ('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 584 matching lines...) Expand 10 before | Expand all | Expand 10 after
595 <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_26" file="c hromium/product_logo_26.png" /> 595 <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_26" file="c hromium/product_logo_26.png" />
596 <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_32" file="c hromium/product_logo_32.png" /> 596 <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_32" file="c hromium/product_logo_32.png" />
597 <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_NAME_48" fi le="chromium/product_logo_name_48.png" /> 597 <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_NAME_48" fi le="chromium/product_logo_name_48.png" />
598 <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_WHITE" file ="chromium/product_logo_white.png" /> 598 <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_WHITE" file ="chromium/product_logo_white.png" />
599 </if> 599 </if>
600 <if expr="_google_chrome"> 600 <if expr="_google_chrome">
601 <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO" file="goog le_chrome/product_logo.png" /> 601 <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO" file="goog le_chrome/product_logo.png" />
602 <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_16" file="g oogle_chrome/product_logo_16.png" /> 602 <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_16" file="g oogle_chrome/product_logo_16.png" />
603 <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_26" file="g oogle_chrome/product_logo_26.png" /> 603 <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_26" file="g oogle_chrome/product_logo_26.png" />
604 <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_32" file="g oogle_chrome/product_logo_32.png" /> 604 <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_32" file="g oogle_chrome/product_logo_32.png" />
605 <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_32_BETA" fi le="google_chrome/product_logo_32_beta.png" />
606 <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_32_CANARY" file="google_chrome/product_logo_32_canary.png" />
607 <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_32_DEV" fil e="google_chrome/product_logo_32_dev.png" />
608 <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_NAME_48" fi le="google_chrome/product_logo_name_48.png" /> 605 <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_NAME_48" fi le="google_chrome/product_logo_name_48.png" />
609 <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_WHITE" file ="google_chrome/product_logo_white.png" /> 606 <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_WHITE" file ="google_chrome/product_logo_white.png" />
610 </if> 607 </if>
611 608
612 <!-- TODO(noms): Once -enable-new-avatar-menu has landed and did not 609 <!-- TODO(noms): Once -enable-new-avatar-menu has landed and did not
613 get reverted for an entire release, delete the old windows-only 610 get reverted for an entire release, delete the old windows-only
614 resources, and rename these to not be mac-specific --> 611 resources, and rename these to not be mac-specific -->
615 <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_0" file="co mmon/profile_avatar_generic_mac.png" /> 612 <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_0" file="co mmon/profile_avatar_generic_mac.png" />
616 <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_1" file="co mmon/profile_avatar_generic_aqua_mac.png" /> 613 <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_1" file="co mmon/profile_avatar_generic_aqua_mac.png" />
617 <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_2" file="co mmon/profile_avatar_generic_blue_mac.png" /> 614 <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_2" file="co mmon/profile_avatar_generic_blue_mac.png" />
(...skipping 407 matching lines...) Expand 10 before | Expand all | Expand 10 after
1025 <!-- People search images --> 1022 <!-- People search images -->
1026 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_EMAIL " file="common/mail.png" /> 1023 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_EMAIL " file="common/mail.png" />
1027 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_EMAIL _HOVER" file="common/mail_hover.png" /> 1024 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_EMAIL _HOVER" file="common/mail_hover.png" />
1028 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_EMAIL _PRESSED" file="common/mail_pressed.png" /> 1025 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_EMAIL _PRESSED" file="common/mail_pressed.png" />
1029 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_CHAT" file="common/chat.png" /> 1026 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_CHAT" file="common/chat.png" />
1030 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_CHAT_ HOVER" file="common/chat_hover.png" /> 1027 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_CHAT_ HOVER" file="common/chat_hover.png" />
1031 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_CHAT_ PRESSED" file="common/chat_pressed.png" /> 1028 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_CHAT_ PRESSED" file="common/chat_pressed.png" />
1032 </structures> 1029 </structures>
1033 </release> 1030 </release>
1034 </grit> 1031 </grit>
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/resources/help/help_content.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698