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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 1319283004: Restore old bookmark bar folders on win non-MD. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 3 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/win/bookmark_bar_folder_supervised.png ('k') | chrome/browser/ui/bookmarks/bookmark_utils.cc » ('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 118 matching lines...) Expand 10 before | Expand all | Expand 10 after
129 <structure type="chrome_scaled_image" name="IDR_BOOKMARKS_FAVICON" file="c ommon/favicon_bookmarks.png" /> 129 <structure type="chrome_scaled_image" name="IDR_BOOKMARKS_FAVICON" file="c ommon/favicon_bookmarks.png" />
130 <structure type="chrome_scaled_image" name="IDR_BOOKMARK_BAR_CHEVRONS" fil e="common/chevron.png" /> 130 <structure type="chrome_scaled_image" name="IDR_BOOKMARK_BAR_CHEVRONS" fil e="common/chevron.png" />
131 <if expr="is_macosx or is_ios"> 131 <if expr="is_macosx or is_ios">
132 <structure type="chrome_scaled_image" name="IDR_BOOKMARK_BAR_FOLDER" fil e="mac/bookmark_bar_folder.png" /> 132 <structure type="chrome_scaled_image" name="IDR_BOOKMARK_BAR_FOLDER" fil e="mac/bookmark_bar_folder.png" />
133 <structure type="chrome_scaled_image" name="IDR_BOOKMARK_BAR_FOLDER_MANA GED" file="mac/bookmark_bar_folder_managed.png" /> 133 <structure type="chrome_scaled_image" name="IDR_BOOKMARK_BAR_FOLDER_MANA GED" file="mac/bookmark_bar_folder_managed.png" />
134 <structure type="chrome_scaled_image" name="IDR_BOOKMARK_BAR_FOLDER_SUPE RVISED" file="mac/bookmark_bar_folder_supervised.png" /> 134 <structure type="chrome_scaled_image" name="IDR_BOOKMARK_BAR_FOLDER_SUPE RVISED" file="mac/bookmark_bar_folder_supervised.png" />
135 </if> 135 </if>
136 <if expr="not is_macosx and not is_ios"> 136 <if expr="not is_macosx and not is_ios">
137 <structure type="chrome_scaled_image" name="IDR_BOOKMARK_BAR_FOLDER" fil e="common/bookmark_bar_folder.png" /> 137 <structure type="chrome_scaled_image" name="IDR_BOOKMARK_BAR_FOLDER" fil e="common/bookmark_bar_folder.png" />
138 </if> 138 </if>
139 <if expr="is_win">
140 <structure type="chrome_scaled_image" name="IDR_BOOKMARK_BAR_FOLDER_MANA GED" file="win/bookmark_bar_folder_managed.png" />
141 <structure type="chrome_scaled_image" name="IDR_BOOKMARK_BAR_FOLDER_SUPE RVISED" file="win/bookmark_bar_folder_supervised.png" />
142 </if>
139 <structure type="chrome_scaled_image" name="IDR_BOOKMARK_BAR_APPS_SHORTCUT " file="common/apps_bookmark_bar_icon.png" /> 143 <structure type="chrome_scaled_image" name="IDR_BOOKMARK_BAR_APPS_SHORTCUT " file="common/apps_bookmark_bar_icon.png" />
140 <if expr="chromeos"> 144 <if expr="chromeos">
141 <structure type="chrome_scaled_image" name="IDR_BUTTON_USER_IMAGE_CHOOSE _FILE" file="cros/choose_file.png" /> 145 <structure type="chrome_scaled_image" name="IDR_BUTTON_USER_IMAGE_CHOOSE _FILE" file="cros/choose_file.png" />
142 <structure type="chrome_scaled_image" name="IDR_BUTTON_USER_IMAGE_TAKE_P HOTO" file="cros/take_photo.png" /> 146 <structure type="chrome_scaled_image" name="IDR_BUTTON_USER_IMAGE_TAKE_P HOTO" file="cros/take_photo.png" />
143 </if> 147 </if>
144 <if expr="toolkit_views or is_macosx or is_ios"> 148 <if expr="toolkit_views or is_macosx or is_ios">
145 <structure type="chrome_scaled_image" name="IDR_BROWSER_ACTION" file="co mmon/browser_action_normal.png" /> 149 <structure type="chrome_scaled_image" name="IDR_BROWSER_ACTION" file="co mmon/browser_action_normal.png" />
146 </if> 150 </if>
147 <if expr="is_macosx or is_ios"> 151 <if expr="is_macosx or is_ios">
148 <structure type="chrome_scaled_image" name="IDR_BROWSER_ACTION_H" file=" common/browser_action_hover.png" /> 152 <structure type="chrome_scaled_image" name="IDR_BROWSER_ACTION_H" file=" common/browser_action_hover.png" />
(...skipping 882 matching lines...) Expand 10 before | Expand all | Expand 10 after
1031 <!-- People search images --> 1035 <!-- People search images -->
1032 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_EMAIL " file="common/mail.png" /> 1036 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_EMAIL " file="common/mail.png" />
1033 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_EMAIL _HOVER" file="common/mail_hover.png" /> 1037 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_EMAIL _HOVER" file="common/mail_hover.png" />
1034 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_EMAIL _PRESSED" file="common/mail_pressed.png" /> 1038 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_EMAIL _PRESSED" file="common/mail_pressed.png" />
1035 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_CHAT" file="common/chat.png" /> 1039 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_CHAT" file="common/chat.png" />
1036 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_CHAT_ HOVER" file="common/chat_hover.png" /> 1040 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_CHAT_ HOVER" file="common/chat_hover.png" />
1037 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_CHAT_ PRESSED" file="common/chat_pressed.png" /> 1041 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_CHAT_ PRESSED" file="common/chat_pressed.png" />
1038 </structures> 1042 </structures>
1039 </release> 1043 </release>
1040 </grit> 1044 </grit>
OLDNEW
« no previous file with comments | « chrome/app/theme/default_200_percent/win/bookmark_bar_folder_supervised.png ('k') | chrome/browser/ui/bookmarks/bookmark_utils.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698