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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 1677303002: Remove win aura theme references (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 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 | « no previous file | chrome/browser/themes/browser_theme_pack.cc » ('j') | chrome/browser/themes/browser_theme_pack.cc » ('J')
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 504 matching lines...) Expand 10 before | Expand all | Expand 10 after
515 <structure type="chrome_scaled_image" name="IDR_OMNIBOX_STAR_SELECTED" fil e="common/omnibox_star_selected.png" /> 515 <structure type="chrome_scaled_image" name="IDR_OMNIBOX_STAR_SELECTED" fil e="common/omnibox_star_selected.png" />
516 <structure type="chrome_scaled_image" name="IDR_OMNIBOX_TTS" file="common/ omnibox_tts.png" /> 516 <structure type="chrome_scaled_image" name="IDR_OMNIBOX_TTS" file="common/ omnibox_tts.png" />
517 <structure type="chrome_scaled_image" name="IDR_OMNIBOX_TTS_SELECTED" file ="common/omnibox_tts_selected.png" /> 517 <structure type="chrome_scaled_image" name="IDR_OMNIBOX_TTS_SELECTED" file ="common/omnibox_tts_selected.png" />
518 <if expr="toolkit_views and not is_macosx"> 518 <if expr="toolkit_views and not is_macosx">
519 <!-- This image is not used in Material Design and can be removed when t hat mode is default. --> 519 <!-- This image is not used in Material Design and can be removed when t hat mode is default. -->
520 <if expr="not use_ash"> 520 <if expr="not use_ash">
521 <structure type="chrome_scaled_image" name="IDR_OTR_ICON" file="common /otr_icon.png" /> 521 <structure type="chrome_scaled_image" name="IDR_OTR_ICON" file="common /otr_icon.png" />
522 </if> 522 </if>
523 <if expr="use_ash"> 523 <if expr="use_ash">
524 <structure type="chrome_scaled_image" name="IDR_OTR_ICON" file="common /ash/otr_icon.png" /> 524 <structure type="chrome_scaled_image" name="IDR_OTR_ICON" file="common /ash/otr_icon.png" />
525 <if expr="not chromeos">
526 <structure type="chrome_scaled_image" name="IDR_OTR_ICON_DESKTOP" fi le="common/otr_icon.png" />
527 </if>
528 </if> 525 </if>
529 </if> 526 </if>
530 <if expr="is_macosx or is_ios"> 527 <if expr="is_macosx or is_ios">
531 <structure type="chrome_scaled_image" name="IDR_OTR_ICON" file="mac/otr_ icon.png" /> 528 <structure type="chrome_scaled_image" name="IDR_OTR_ICON" file="mac/otr_ icon.png" />
532 </if> 529 </if>
533 <if expr="is_macosx"> 530 <if expr="is_macosx">
534 <structure type="chrome_scaled_image" name="IDR_OVERLAY_DROP_SHADOW" fil e="mac/overlay_drop_shadow.png" /> 531 <structure type="chrome_scaled_image" name="IDR_OVERLAY_DROP_SHADOW" fil e="mac/overlay_drop_shadow.png" />
535 </if> 532 </if>
536 <structure type="chrome_scaled_image" name="IDR_PAGEINFO_BAD" file="common /pageinfo_bad.png" /> 533 <structure type="chrome_scaled_image" name="IDR_PAGEINFO_BAD" file="common /pageinfo_bad.png" />
537 <structure type="chrome_scaled_image" name="IDR_PAGEINFO_GOOD" file="commo n/pageinfo_good.png" /> 534 <structure type="chrome_scaled_image" name="IDR_PAGEINFO_GOOD" file="commo n/pageinfo_good.png" />
(...skipping 309 matching lines...) Expand 10 before | Expand all | Expand 10 after
847 <structure type="chrome_scaled_image" name="IDR_THEME_FRAME_INACTIVE" fi le="theme_frame_inactive.png" /> 844 <structure type="chrome_scaled_image" name="IDR_THEME_FRAME_INACTIVE" fi le="theme_frame_inactive.png" />
848 <structure type="chrome_scaled_image" name="IDR_THEME_FRAME_INCOGNITO" f ile="theme_frame_incognito.png" /> 845 <structure type="chrome_scaled_image" name="IDR_THEME_FRAME_INCOGNITO" f ile="theme_frame_incognito.png" />
849 <structure type="chrome_scaled_image" name="IDR_THEME_FRAME_INCOGNITO_IN ACTIVE" file="theme_frame_incognito_inactive.png" /> 846 <structure type="chrome_scaled_image" name="IDR_THEME_FRAME_INCOGNITO_IN ACTIVE" file="theme_frame_incognito_inactive.png" />
850 </if> 847 </if>
851 <if expr="use_ash"> 848 <if expr="use_ash">
852 <!-- Ash has a gray frame, Windows uses blue. --> 849 <!-- Ash has a gray frame, Windows uses blue. -->
853 <structure type="chrome_scaled_image" name="IDR_THEME_FRAME" file="commo n/ash/theme_frame_active.png" /> 850 <structure type="chrome_scaled_image" name="IDR_THEME_FRAME" file="commo n/ash/theme_frame_active.png" />
854 <structure type="chrome_scaled_image" name="IDR_THEME_FRAME_INACTIVE" fi le="common/ash/theme_frame_inactive.png" /> 851 <structure type="chrome_scaled_image" name="IDR_THEME_FRAME_INACTIVE" fi le="common/ash/theme_frame_inactive.png" />
855 <structure type="chrome_scaled_image" name="IDR_THEME_FRAME_INCOGNITO" f ile="common/ash/theme_frame_incognito_active.png" /> 852 <structure type="chrome_scaled_image" name="IDR_THEME_FRAME_INCOGNITO" f ile="common/ash/theme_frame_incognito_active.png" />
856 <structure type="chrome_scaled_image" name="IDR_THEME_FRAME_INCOGNITO_IN ACTIVE" file="common/ash/theme_frame_incognito_inactive.png" /> 853 <structure type="chrome_scaled_image" name="IDR_THEME_FRAME_INCOGNITO_IN ACTIVE" file="common/ash/theme_frame_incognito_inactive.png" />
857 <if expr="not chromeos">
858 <structure type="chrome_scaled_image" name="IDR_THEME_FRAME_DESKTOP" f ile="theme_frame.png" />
859 <structure type="chrome_scaled_image" name="IDR_THEME_FRAME_INACTIVE_D ESKTOP" file="theme_frame_inactive.png" />
860 <structure type="chrome_scaled_image" name="IDR_THEME_FRAME_INCOGNITO_ DESKTOP" file="theme_frame_incognito.png" />
861 <structure type="chrome_scaled_image" name="IDR_THEME_FRAME_INCOGNITO_ INACTIVE_DESKTOP" file="theme_frame_incognito_inactive.png" />
862 </if>
863 </if> 854 </if>
864 <structure type="chrome_scaled_image" name="IDR_THEME_FRAME_OVERLAY" file= "notused.png" /> 855 <structure type="chrome_scaled_image" name="IDR_THEME_FRAME_OVERLAY" file= "notused.png" />
865 <structure type="chrome_scaled_image" name="IDR_THEME_FRAME_OVERLAY_INACTI VE" file="notused.png" /> 856 <structure type="chrome_scaled_image" name="IDR_THEME_FRAME_OVERLAY_INACTI VE" file="notused.png" />
866 <structure type="chrome_scaled_image" name="IDR_THEME_NTP_ATTRIBUTION" fil e="notused.png" /> 857 <structure type="chrome_scaled_image" name="IDR_THEME_NTP_ATTRIBUTION" fil e="notused.png" />
867 <structure type="chrome_scaled_image" name="IDR_THEME_NTP_BACKGROUND" file ="common/ntp_background.png" /> 858 <structure type="chrome_scaled_image" name="IDR_THEME_NTP_BACKGROUND" file ="common/ntp_background.png" />
868 <if expr="not use_ash and not is_macosx and not is_ios"> 859 <if expr="not use_ash and not is_macosx and not is_ios">
869 <structure type="chrome_scaled_image" name="IDR_THEME_TAB_BACKGROUND" fi le="theme_tab_background.png" /> 860 <structure type="chrome_scaled_image" name="IDR_THEME_TAB_BACKGROUND" fi le="theme_tab_background.png" />
870 <structure type="chrome_scaled_image" name="IDR_THEME_TAB_BACKGROUND_INC OGNITO" file="theme_tab_background_incognito.png" /> 861 <structure type="chrome_scaled_image" name="IDR_THEME_TAB_BACKGROUND_INC OGNITO" file="theme_tab_background_incognito.png" />
871 </if> 862 </if>
872 <if expr="use_ash"> 863 <if expr="use_ash">
873 <!-- Ash has gray tab backgrounds, Windows uses blue. --> 864 <!-- Ash has gray tab backgrounds, Windows uses blue. -->
874 <structure type="chrome_scaled_image" name="IDR_THEME_TAB_BACKGROUND" fi le="common/ash/theme_default_inactive.png" /> 865 <structure type="chrome_scaled_image" name="IDR_THEME_TAB_BACKGROUND" fi le="common/ash/theme_default_inactive.png" />
875 <structure type="chrome_scaled_image" name="IDR_THEME_TAB_BACKGROUND_INC OGNITO" file="common/ash/theme_default_inactive.png" /> 866 <structure type="chrome_scaled_image" name="IDR_THEME_TAB_BACKGROUND_INC OGNITO" file="common/ash/theme_default_inactive.png" />
876 <if expr="not chromeos">
877 <structure type="chrome_scaled_image" name="IDR_THEME_TAB_BACKGROUND_D ESKTOP" file="theme_tab_background.png" />
878 <structure type="chrome_scaled_image" name="IDR_THEME_TAB_BACKGROUND_I NCOGNITO_DESKTOP" file="theme_tab_background_incognito.png" />
879 </if>
880 </if> 867 </if>
881 <if expr="is_macosx or is_ios"> 868 <if expr="is_macosx or is_ios">
882 <structure type="chrome_scaled_image" name="IDR_THEME_TAB_BACKGROUND" fi le="mac/theme_default_inactive.png" /> 869 <structure type="chrome_scaled_image" name="IDR_THEME_TAB_BACKGROUND" fi le="mac/theme_default_inactive.png" />
883 <structure type="chrome_scaled_image" name="IDR_THEME_TAB_BACKGROUND_INA CTIVE" file="mac/theme_default_inactive_background.png" /> 870 <structure type="chrome_scaled_image" name="IDR_THEME_TAB_BACKGROUND_INA CTIVE" file="mac/theme_default_inactive_background.png" />
884 <if expr="mac_views_browser"> 871 <if expr="mac_views_browser">
885 <structure type="chrome_scaled_image" name="IDR_THEME_TAB_BACKGROUND_I NCOGNITO" file="mac/theme_default_inactive.png" /> 872 <structure type="chrome_scaled_image" name="IDR_THEME_TAB_BACKGROUND_I NCOGNITO" file="mac/theme_default_inactive.png" />
886 </if> 873 </if>
887 </if> 874 </if>
888 <structure type="chrome_scaled_image" name="IDR_THEME_TAB_BACKGROUND_V" fi le="theme_tab_background_glass.png" /> 875 <structure type="chrome_scaled_image" name="IDR_THEME_TAB_BACKGROUND_V" fi le="theme_tab_background_glass.png" />
889 <if expr="not use_ash and not is_macosx and not is_ios"> 876 <if expr="not use_ash and not is_macosx and not is_ios">
890 <structure type="chrome_scaled_image" name="IDR_THEME_TOOLBAR" file="the me_toolbar_default.png" /> 877 <structure type="chrome_scaled_image" name="IDR_THEME_TOOLBAR" file="the me_toolbar_default.png" />
891 </if> 878 </if>
892 <if expr="use_ash"> 879 <if expr="use_ash">
893 <!-- Ash has a dark gray toolbar background, Windows has light gray. --> 880 <!-- Ash has a dark gray toolbar background, Windows has light gray. -->
894 <structure type="chrome_scaled_image" name="IDR_THEME_TOOLBAR" file="com mon/ash/theme_default_active.png" /> 881 <structure type="chrome_scaled_image" name="IDR_THEME_TOOLBAR" file="com mon/ash/theme_default_active.png" />
895 <if expr="not chromeos">
896 <structure type="chrome_scaled_image" name="IDR_THEME_TOOLBAR_DESKTOP" file="theme_toolbar_default.png" />
897 </if>
898 </if> 882 </if>
899 <if expr="is_macosx or is_ios"> 883 <if expr="is_macosx or is_ios">
900 <structure type="chrome_scaled_image" name="IDR_THEME_TOOLBAR" file="mac /theme_default_active.png" /> 884 <structure type="chrome_scaled_image" name="IDR_THEME_TOOLBAR" file="mac /theme_default_active.png" />
901 <structure type="chrome_scaled_image" name="IDR_THEME_TOOLBAR_INACTIVE" file="mac/theme_default_active_background.png" /> 885 <structure type="chrome_scaled_image" name="IDR_THEME_TOOLBAR_INACTIVE" file="mac/theme_default_active_background.png" />
902 </if> 886 </if>
903 <!-- Instant Extended API toolbar background is common for all platforms. --> 887 <!-- Instant Extended API toolbar background is common for all platforms. -->
904 <structure type="chrome_scaled_image" name="IDR_THEME_WINDOW_CONTROL_BACKG ROUND" file="notused.png" /> 888 <structure type="chrome_scaled_image" name="IDR_THEME_WINDOW_CONTROL_BACKG ROUND" file="notused.png" />
905 <if expr="is_macosx"> 889 <if expr="is_macosx">
906 <structure type="chrome_scaled_image" name="IDR_THROBBER_WAITING" file=" legacy/throbber_waiting.png" /> 890 <structure type="chrome_scaled_image" name="IDR_THROBBER_WAITING" file=" legacy/throbber_waiting.png" />
907 </if> 891 </if>
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
983 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_EMA IL" file="common/mail.png" /> 967 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_EMA IL" file="common/mail.png" />
984 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_EMA IL_HOVER" file="common/mail_hover.png" /> 968 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_EMA IL_HOVER" file="common/mail_hover.png" />
985 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_EMA IL_PRESSED" file="common/mail_pressed.png" /> 969 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_EMA IL_PRESSED" file="common/mail_pressed.png" />
986 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_CHA T" file="common/chat.png" /> 970 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_CHA T" file="common/chat.png" />
987 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_CHA T_HOVER" file="common/chat_hover.png" /> 971 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_CHA T_HOVER" file="common/chat_hover.png" />
988 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_CHA T_PRESSED" file="common/chat_pressed.png" /> 972 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_CHA T_PRESSED" file="common/chat_pressed.png" />
989 </if> 973 </if>
990 </structures> 974 </structures>
991 </release> 975 </release>
992 </grit> 976 </grit>
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/themes/browser_theme_pack.cc » ('j') | chrome/browser/themes/browser_theme_pack.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698