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

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

Issue 1986963004: Revert of [Mac][Material Design] Update bookmarks bar to Material Design. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 7 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
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 106 matching lines...) Expand 10 before | Expand all | Expand 10 after
117 <structure type="chrome_scaled_image" name="IDR_BLUETOOTH_PAIRING_TICK" file="cros/bluetooth_pairing_tick.png" /> 117 <structure type="chrome_scaled_image" name="IDR_BLUETOOTH_PAIRING_TICK" file="cros/bluetooth_pairing_tick.png" />
118 </if> 118 </if>
119 <structure type="chrome_scaled_image" name="IDR_BOOKMARKS_FAVICON" file="c ommon/favicon_bookmarks.png" /> 119 <structure type="chrome_scaled_image" name="IDR_BOOKMARKS_FAVICON" file="c ommon/favicon_bookmarks.png" />
120 <if expr="is_macosx"> 120 <if expr="is_macosx">
121 <structure type="chrome_scaled_image" name="IDR_BOOKMARK_BAR_CHEVRONS" f ile="legacy/chevron.png" /> 121 <structure type="chrome_scaled_image" name="IDR_BOOKMARK_BAR_CHEVRONS" f ile="legacy/chevron.png" />
122 </if> 122 </if>
123 <if expr="is_macosx or is_ios"> 123 <if expr="is_macosx or is_ios">
124 <structure type="chrome_scaled_image" name="IDR_BOOKMARK_BAR_FOLDER" fil e="mac/bookmark_bar_folder.png" /> 124 <structure type="chrome_scaled_image" name="IDR_BOOKMARK_BAR_FOLDER" fil e="mac/bookmark_bar_folder.png" />
125 <structure type="chrome_scaled_image" name="IDR_BOOKMARK_BAR_FOLDER_MANA GED" file="mac/bookmark_bar_folder_managed.png" /> 125 <structure type="chrome_scaled_image" name="IDR_BOOKMARK_BAR_FOLDER_MANA GED" file="mac/bookmark_bar_folder_managed.png" />
126 <structure type="chrome_scaled_image" name="IDR_BOOKMARK_BAR_FOLDER_SUPE RVISED" file="mac/bookmark_bar_folder_supervised.png" /> 126 <structure type="chrome_scaled_image" name="IDR_BOOKMARK_BAR_FOLDER_SUPE RVISED" file="mac/bookmark_bar_folder_supervised.png" />
127 <if expr="enable_topchrome_md">
128 <structure type="chrome_scaled_image" name="IDR_BOOKMARK_BAR_FOLDER_WH ITE" file="mac/bookmark_bar_folder_white.png" />
129 <structure type="chrome_scaled_image" name="IDR_BOOKMARK_BAR_FOLDER_MA NAGED_WHITE" file="mac/bookmark_bar_folder_managed_white.png" />
130 <structure type="chrome_scaled_image" name="IDR_BOOKMARK_BAR_FOLDER_SU PERVISED_WHITE" file="mac/bookmark_bar_folder_supervised_white.png" />
131 </if>
132 </if> 127 </if>
133 <if expr="not is_macosx and not is_ios"> 128 <if expr="not is_macosx and not is_ios">
134 <structure type="chrome_scaled_image" name="IDR_BOOKMARK_BAR_FOLDER" fil e="common/bookmark_bar_folder.png" /> 129 <structure type="chrome_scaled_image" name="IDR_BOOKMARK_BAR_FOLDER" fil e="common/bookmark_bar_folder.png" />
135 </if> 130 </if>
136 <if expr="is_win"> 131 <if expr="is_win">
137 <structure type="chrome_scaled_image" name="IDR_BOOKMARK_BAR_FOLDER_MANA GED" file="win/bookmark_bar_folder_managed.png" /> 132 <structure type="chrome_scaled_image" name="IDR_BOOKMARK_BAR_FOLDER_MANA GED" file="win/bookmark_bar_folder_managed.png" />
138 <structure type="chrome_scaled_image" name="IDR_BOOKMARK_BAR_FOLDER_SUPE RVISED" file="win/bookmark_bar_folder_supervised.png" /> 133 <structure type="chrome_scaled_image" name="IDR_BOOKMARK_BAR_FOLDER_SUPE RVISED" file="win/bookmark_bar_folder_supervised.png" />
139 </if> 134 </if>
140 <structure type="chrome_scaled_image" name="IDR_BOOKMARK_BAR_APPS_SHORTCUT " file="common/apps_bookmark_bar_icon.png" /> 135 <structure type="chrome_scaled_image" name="IDR_BOOKMARK_BAR_APPS_SHORTCUT " file="common/apps_bookmark_bar_icon.png" />
141 <if expr="chromeos"> 136 <if expr="chromeos">
(...skipping 811 matching lines...) Expand 10 before | Expand all | Expand 10 after
953 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_EMA IL" file="common/mail.png" /> 948 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_EMA IL" file="common/mail.png" />
954 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_EMA IL_HOVER" file="common/mail_hover.png" /> 949 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_EMA IL_HOVER" file="common/mail_hover.png" />
955 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_EMA IL_PRESSED" file="common/mail_pressed.png" /> 950 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_EMA IL_PRESSED" file="common/mail_pressed.png" />
956 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_CHA T" file="common/chat.png" /> 951 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_CHA T" file="common/chat.png" />
957 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_CHA T_HOVER" file="common/chat_hover.png" /> 952 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_CHA T_HOVER" file="common/chat_hover.png" />
958 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_CHA T_PRESSED" file="common/chat_pressed.png" /> 953 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_CHA T_PRESSED" file="common/chat_pressed.png" />
959 </if> 954 </if>
960 </structures> 955 </structures>
961 </release> 956 </release>
962 </grit> 957 </grit>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698