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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 2110713002: [Mac][Material Design] Add temporary spinner for Incognito mode. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@2743
Patch Set: Created 4 years, 5 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/theme/default_200_percent/mac/throbber_waiting_incognito.png ('k') | chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm » ('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 871 matching lines...) Expand 10 before | Expand all | Expand 10 after
882 <structure type="chrome_scaled_image" name="IDR_THEME_TOOLBAR" file="com mon/ash/theme_default_active.png" /> 882 <structure type="chrome_scaled_image" name="IDR_THEME_TOOLBAR" file="com mon/ash/theme_default_active.png" />
883 </if> 883 </if>
884 <if expr="is_macosx or is_ios"> 884 <if expr="is_macosx or is_ios">
885 <structure type="chrome_scaled_image" name="IDR_THEME_TOOLBAR" file="mac /theme_default_active.png" /> 885 <structure type="chrome_scaled_image" name="IDR_THEME_TOOLBAR" file="mac /theme_default_active.png" />
886 <structure type="chrome_scaled_image" name="IDR_THEME_TOOLBAR_INACTIVE" file="mac/theme_default_active_background.png" /> 886 <structure type="chrome_scaled_image" name="IDR_THEME_TOOLBAR_INACTIVE" file="mac/theme_default_active_background.png" />
887 </if> 887 </if>
888 <!-- Instant Extended API toolbar background is common for all platforms. --> 888 <!-- Instant Extended API toolbar background is common for all platforms. -->
889 <structure type="chrome_scaled_image" name="IDR_THEME_WINDOW_CONTROL_BACKG ROUND" file="notused.png" /> 889 <structure type="chrome_scaled_image" name="IDR_THEME_WINDOW_CONTROL_BACKG ROUND" file="notused.png" />
890 <if expr="is_macosx"> 890 <if expr="is_macosx">
891 <structure type="chrome_scaled_image" name="IDR_THROBBER_WAITING" file=" legacy/throbber_waiting.png" /> 891 <structure type="chrome_scaled_image" name="IDR_THROBBER_WAITING" file=" legacy/throbber_waiting.png" />
892 <structure type="chrome_scaled_image" name="IDR_THROBBER_WAITING_INCOGNI TO" file="mac/throbber_waiting_incognito.png" />
893 <structure type="chrome_scaled_image" name="IDR_THROBBER_INCOGNITO" file ="mac/throbber_incognito.png" />
892 </if> 894 </if>
893 <if expr="use_ash"> 895 <if expr="use_ash">
894 <structure type="chrome_scaled_image" name="IDR_TOOLBAR_SHADE_LEFT" file ="common/toolbar_shade_left.png" /> 896 <structure type="chrome_scaled_image" name="IDR_TOOLBAR_SHADE_LEFT" file ="common/toolbar_shade_left.png" />
895 <structure type="chrome_scaled_image" name="IDR_TOOLBAR_SHADE_RIGHT" fil e="common/toolbar_shade_right.png" /> 897 <structure type="chrome_scaled_image" name="IDR_TOOLBAR_SHADE_RIGHT" fil e="common/toolbar_shade_right.png" />
896 <structure type="chrome_scaled_image" name="IDR_TOOLBAR_SHADE_TOP" file= "common/toolbar_shade_top.png" /> 898 <structure type="chrome_scaled_image" name="IDR_TOOLBAR_SHADE_TOP" file= "common/toolbar_shade_top.png" />
897 </if> 899 </if>
898 <if expr="is_macosx or is_ios"> 900 <if expr="is_macosx or is_ios">
899 <structure type="chrome_scaled_image" name="IDR_TOOLBAR_SHADE_TOP" file= "mac/toolbar_shade_top.png" /> 901 <structure type="chrome_scaled_image" name="IDR_TOOLBAR_SHADE_TOP" file= "mac/toolbar_shade_top.png" />
900 </if> 902 </if>
901 <if expr="toolkit_views or is_macosx or is_ios"> 903 <if expr="toolkit_views or is_macosx or is_ios">
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
946 <structure type="chrome_scaled_image" name="IDR_WEBSTORE_ICON_32" file=" google_chrome/webstore_icon_32.png" /> 948 <structure type="chrome_scaled_image" name="IDR_WEBSTORE_ICON_32" file=" google_chrome/webstore_icon_32.png" />
947 </if> 949 </if>
948 <if expr="is_macosx"> 950 <if expr="is_macosx">
949 <structure type="chrome_scaled_image" name="IDR_ZOOM_MINUS" file="legacy /zoom_minus.png" /> 951 <structure type="chrome_scaled_image" name="IDR_ZOOM_MINUS" file="legacy /zoom_minus.png" />
950 <structure type="chrome_scaled_image" name="IDR_ZOOM_PLUS" file="legacy/ zoom_plus.png" /> 952 <structure type="chrome_scaled_image" name="IDR_ZOOM_PLUS" file="legacy/ zoom_plus.png" />
951 <structure type="chrome_scaled_image" name="IDR_ZOOM_NORMAL" file="legac y/zoom_reset.png" /> 953 <structure type="chrome_scaled_image" name="IDR_ZOOM_NORMAL" file="legac y/zoom_reset.png" />
952 </if> 954 </if>
953 </structures> 955 </structures>
954 </release> 956 </release>
955 </grit> 957 </grit>
OLDNEW
« no previous file with comments | « chrome/app/theme/default_200_percent/mac/throbber_waiting_incognito.png ('k') | chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698