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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 464603002: [Resources] Use the correct orientation for avatars in the new-avatar-menu world. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix when the resources are included (was too conservative and bots are angry) Created 6 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 | no next file » | 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 625 matching lines...) Expand 10 before | Expand all | Expand 10 after
636 <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_WHITE" file ="chromium/product_logo_white.png" /> 636 <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_WHITE" file ="chromium/product_logo_white.png" />
637 </if> 637 </if>
638 <if expr="_google_chrome"> 638 <if expr="_google_chrome">
639 <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO" file="goog le_chrome/product_logo.png" /> 639 <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO" file="goog le_chrome/product_logo.png" />
640 <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_16" file="g oogle_chrome/product_logo_16.png" /> 640 <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_16" file="g oogle_chrome/product_logo_16.png" />
641 <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_26" file="g oogle_chrome/product_logo_26.png" /> 641 <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_26" file="g oogle_chrome/product_logo_26.png" />
642 <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_32" file="g oogle_chrome/product_logo_32.png" /> 642 <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_32" file="g oogle_chrome/product_logo_32.png" />
643 <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_NAME_48" fi le="google_chrome/product_logo_name_48.png" /> 643 <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_NAME_48" fi le="google_chrome/product_logo_name_48.png" />
644 <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_WHITE" file ="google_chrome/product_logo_white.png" /> 644 <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_WHITE" file ="google_chrome/product_logo_white.png" />
645 </if> 645 </if>
646 <if expr="is_macosx or is_ios"> 646
647 <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_0" file=" common/profile_avatar_generic_mac.png" /> 647 <!-- TODO(noms): Once -enable-new-avatar-menu has landed and did not
648 <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_1" file=" common/profile_avatar_generic_aqua_mac.png" /> 648 get reverted for an entire release, delete the old windows-only
649 <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_2" file=" common/profile_avatar_generic_blue_mac.png" /> 649 resources, and rename these to not be mac-specific -->
650 <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_3" file=" common/profile_avatar_generic_green_mac.png" /> 650 <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_0" file="co mmon/profile_avatar_generic_mac.png" />
651 <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_4" file=" common/profile_avatar_generic_orange_mac.png" /> 651 <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_1" file="co mmon/profile_avatar_generic_aqua_mac.png" />
652 <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_5" file=" common/profile_avatar_generic_purple_mac.png" /> 652 <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_2" file="co mmon/profile_avatar_generic_blue_mac.png" />
653 <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_6" file=" common/profile_avatar_generic_red_mac.png" /> 653 <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_3" file="co mmon/profile_avatar_generic_green_mac.png" />
654 <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_7" file=" common/profile_avatar_generic_yellow_mac.png" /> 654 <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_4" file="co mmon/profile_avatar_generic_orange_mac.png" />
655 <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_8" file=" common/profile_avatar_secret_agent_mac.png" /> 655 <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_5" file="co mmon/profile_avatar_generic_purple_mac.png" />
656 <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_9" file=" common/profile_avatar_superhero_mac.png" /> 656 <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_6" file="co mmon/profile_avatar_generic_red_mac.png" />
657 <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_10" file= "common/profile_avatar_volley_ball_mac.png" /> 657 <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_7" file="co mmon/profile_avatar_generic_yellow_mac.png" />
658 <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_11" file= "common/profile_avatar_businessman_mac.png" /> 658 <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_8" file="co mmon/profile_avatar_secret_agent_mac.png" />
659 <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_12" file= "common/profile_avatar_ninja_mac.png" /> 659 <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_9" file="co mmon/profile_avatar_superhero_mac.png" />
660 <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_13" file= "common/profile_avatar_alien_mac.png" /> 660 <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_10" file="c ommon/profile_avatar_volley_ball_mac.png" />
661 <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_14" file= "common/profile_avatar_awesome_mac.png" /> 661 <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_11" file="c ommon/profile_avatar_businessman_mac.png" />
662 <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_15" file= "common/profile_avatar_flower_mac.png" /> 662 <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_12" file="c ommon/profile_avatar_ninja_mac.png" />
663 <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_16" file= "common/profile_avatar_pizza_mac.png" /> 663 <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_13" file="c ommon/profile_avatar_alien_mac.png" />
664 <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_17" file= "common/profile_avatar_soccer_mac.png" /> 664 <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_14" file="c ommon/profile_avatar_awesome_mac.png" />
665 <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_18" file= "common/profile_avatar_burger_mac.png" /> 665 <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_15" file="c ommon/profile_avatar_flower_mac.png" />
666 <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_19" file= "common/profile_avatar_cat_mac.png" /> 666 <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_16" file="c ommon/profile_avatar_pizza_mac.png" />
667 <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_20" file= "common/profile_avatar_cupcake_mac.png" /> 667 <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_17" file="c ommon/profile_avatar_soccer_mac.png" />
668 <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_21" file= "common/profile_avatar_dog_mac.png" /> 668 <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_18" file="c ommon/profile_avatar_burger_mac.png" />
669 <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_22" file= "common/profile_avatar_horse_mac.png" /> 669 <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_19" file="c ommon/profile_avatar_cat_mac.png" />
670 <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_23" file= "common/profile_avatar_margarita_mac.png" /> 670 <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_20" file="c ommon/profile_avatar_cupcake_mac.png" />
671 <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_24" file= "common/profile_avatar_note_mac.png" /> 671 <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_21" file="c ommon/profile_avatar_dog_mac.png" />
672 <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_25" file= "common/profile_avatar_sun_cloud_mac.png" /> 672 <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_22" file="c ommon/profile_avatar_horse_mac.png" />
673 <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_26" file= "common/login_guest.png" /> 673 <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_23" file="c ommon/profile_avatar_margarita_mac.png" />
674 </if> 674 <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_24" file="c ommon/profile_avatar_note_mac.png" />
675 <if expr="not is_macosx and not is_ios"> 675 <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_25" file="c ommon/profile_avatar_sun_cloud_mac.png" />
676 <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_0" file=" common/profile_avatar_generic.png" /> 676 <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_26" file="c ommon/login_guest.png" />
677 <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_1" file=" common/profile_avatar_generic_aqua.png" />
678 <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_2" file=" common/profile_avatar_generic_blue.png" />
679 <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_3" file=" common/profile_avatar_generic_green.png" />
680 <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_4" file=" common/profile_avatar_generic_orange.png" />
681 <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_5" file=" common/profile_avatar_generic_purple.png" />
682 <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_6" file=" common/profile_avatar_generic_red.png" />
683 <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_7" file=" common/profile_avatar_generic_yellow.png" />
684 <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_8" file=" common/profile_avatar_secret_agent.png" />
685 <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_9" file=" common/profile_avatar_superhero.png" />
686 <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_10" file= "common/profile_avatar_volley_ball.png" />
687 <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_11" file= "common/profile_avatar_businessman.png" />
688 <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_12" file= "common/profile_avatar_ninja.png" />
689 <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_13" file= "common/profile_avatar_alien.png" />
690 <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_14" file= "common/profile_avatar_awesome.png" />
691 <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_15" file= "common/profile_avatar_flower.png" />
692 <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_16" file= "common/profile_avatar_pizza.png" />
693 <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_17" file= "common/profile_avatar_soccer.png" />
694 <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_18" file= "common/profile_avatar_burger.png" />
695 <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_19" file= "common/profile_avatar_cat.png" />
696 <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_20" file= "common/profile_avatar_cupcake.png" />
697 <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_21" file= "common/profile_avatar_dog.png" />
698 <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_22" file= "common/profile_avatar_horse.png" />
699 <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_23" file= "common/profile_avatar_margarita.png" />
700 <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_24" file= "common/profile_avatar_note.png" />
701 <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_25" file= "common/profile_avatar_sun_cloud.png" />
702 <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_26" file= "common/login_guest.png" />
703 </if>
704 677
705 <!-- New style avatar button --> 678 <!-- New style avatar button -->
706 <if expr="toolkit_views"> 679 <if expr="toolkit_views">
707 <!-- Windows, themed --> 680 <!-- Windows, themed -->
708 <structure type="chrome_scaled_image" name="IDR_AVATAR_THEMED_BUTTON_DRO PARROW" file="win/avatar_button/themed/sign_in_button_arrow.png" /> 681 <structure type="chrome_scaled_image" name="IDR_AVATAR_THEMED_BUTTON_DRO PARROW" file="win/avatar_button/themed/sign_in_button_arrow.png" />
709 <structure type="chrome_scaled_image" name="IDR_AVATAR_THEMED_BUTTON_NOR MAL_BOTTOM" file="win/avatar_button/themed/sign_in_button_bottom.png" /> 682 <structure type="chrome_scaled_image" name="IDR_AVATAR_THEMED_BUTTON_NOR MAL_BOTTOM" file="win/avatar_button/themed/sign_in_button_bottom.png" />
710 <structure type="chrome_scaled_image" name="IDR_AVATAR_THEMED_BUTTON_NOR MAL_BOTTOM_LEFT" file="win/avatar_button/themed/sign_in_button_bottom_left.png" /> 683 <structure type="chrome_scaled_image" name="IDR_AVATAR_THEMED_BUTTON_NOR MAL_BOTTOM_LEFT" file="win/avatar_button/themed/sign_in_button_bottom_left.png" />
711 <structure type="chrome_scaled_image" name="IDR_AVATAR_THEMED_BUTTON_NOR MAL_BOTTOM_RIGHT" file="win/avatar_button/themed/sign_in_button_bottom_right.png " /> 684 <structure type="chrome_scaled_image" name="IDR_AVATAR_THEMED_BUTTON_NOR MAL_BOTTOM_RIGHT" file="win/avatar_button/themed/sign_in_button_bottom_right.png " />
712 <structure type="chrome_scaled_image" name="IDR_AVATAR_THEMED_BUTTON_NOR MAL_CENTER" file="win/avatar_button/themed/sign_in_button_center.png" /> 685 <structure type="chrome_scaled_image" name="IDR_AVATAR_THEMED_BUTTON_NOR MAL_CENTER" file="win/avatar_button/themed/sign_in_button_center.png" />
713 <structure type="chrome_scaled_image" name="IDR_AVATAR_THEMED_BUTTON_NOR MAL_LEFT" file="win/avatar_button/themed/sign_in_button_left.png" /> 686 <structure type="chrome_scaled_image" name="IDR_AVATAR_THEMED_BUTTON_NOR MAL_LEFT" file="win/avatar_button/themed/sign_in_button_left.png" />
(...skipping 505 matching lines...) Expand 10 before | Expand all | Expand 10 after
1219 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_EMAIL " file="common/mail.png" /> 1192 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_EMAIL " file="common/mail.png" />
1220 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_EMAIL _HOVER" file="common/mail_hover.png" /> 1193 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_EMAIL _HOVER" file="common/mail_hover.png" />
1221 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_EMAIL _PRESSED" file="common/mail_pressed.png" /> 1194 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_EMAIL _PRESSED" file="common/mail_pressed.png" />
1222 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_CHAT" file="common/chat.png" /> 1195 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_CHAT" file="common/chat.png" />
1223 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_CHAT_ HOVER" file="common/chat_hover.png" /> 1196 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_CHAT_ HOVER" file="common/chat_hover.png" />
1224 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_CHAT_ PRESSED" file="common/chat_pressed.png" /> 1197 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_CHAT_ PRESSED" file="common/chat_pressed.png" />
1225 1198
1226 </structures> 1199 </structures>
1227 </release> 1200 </release>
1228 </grit> 1201 </grit>
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698