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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 339413002: Use the managed bookmarks icon for its folder on Mac. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 years, 6 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | chrome/browser/ui/cocoa/bookmarks/bookmark_bar_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 105 matching lines...) Expand 10 before | Expand all | Expand 10 after
116 <structure type="chrome_scaled_image" name="IDR_BLOCKED_PPAPI_BROKER" file ="common/blocked_pepper_broker.png" /> 116 <structure type="chrome_scaled_image" name="IDR_BLOCKED_PPAPI_BROKER" file ="common/blocked_pepper_broker.png" />
117 <if expr="chromeos"> 117 <if expr="chromeos">
118 <structure type="chrome_scaled_image" name="IDR_BLUETOOTH_KEYBOARD" file ="cros/bluetooth_pairing_keyboard.png" /> 118 <structure type="chrome_scaled_image" name="IDR_BLUETOOTH_KEYBOARD" file ="cros/bluetooth_pairing_keyboard.png" />
119 <structure type="chrome_scaled_image" name="IDR_BLUETOOTH_MOUSE" file="c ros/bluetooth_pairing_mouse.png" /> 119 <structure type="chrome_scaled_image" name="IDR_BLUETOOTH_MOUSE" file="c ros/bluetooth_pairing_mouse.png" />
120 <structure type="chrome_scaled_image" name="IDR_BLUETOOTH_PAIRING_TICK" file="cros/bluetooth_pairing_tick.png" /> 120 <structure type="chrome_scaled_image" name="IDR_BLUETOOTH_PAIRING_TICK" file="cros/bluetooth_pairing_tick.png" />
121 </if> 121 </if>
122 <structure type="chrome_scaled_image" name="IDR_BOOKMARKS_FAVICON" file="c ommon/favicon_bookmarks.png" /> 122 <structure type="chrome_scaled_image" name="IDR_BOOKMARKS_FAVICON" file="c ommon/favicon_bookmarks.png" />
123 <structure type="chrome_scaled_image" name="IDR_BOOKMARK_BAR_CHEVRONS" fil e="common/chevron.png" /> 123 <structure type="chrome_scaled_image" name="IDR_BOOKMARK_BAR_CHEVRONS" fil e="common/chevron.png" />
124 <if expr="is_macosx or is_ios"> 124 <if expr="is_macosx or is_ios">
125 <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" fil e="mac/bookmark_bar_folder.png" />
126 <structure type="chrome_scaled_image" name="IDR_BOOKMARK_BAR_FOLDER_MANA GED" file="mac/bookmark_bar_folder_managed.png" />
126 </if> 127 </if>
127 <if expr="not is_macosx and not is_ios"> 128 <if expr="not is_macosx and not is_ios">
128 <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" />
129 <structure type="chrome_scaled_image" name="IDR_BOOKMARK_BAR_FOLDER_MANA GED" file="common/bookmark_bar_folder_managed.png" /> 130 <structure type="chrome_scaled_image" name="IDR_BOOKMARK_BAR_FOLDER_MANA GED" file="common/bookmark_bar_folder_managed.png" />
130 </if> 131 </if>
131 <structure type="chrome_scaled_image" name="IDR_BOOKMARK_BAR_APPS_SHORTCUT " file="common/apps_bookmark_bar_icon.png" /> 132 <structure type="chrome_scaled_image" name="IDR_BOOKMARK_BAR_APPS_SHORTCUT " file="common/apps_bookmark_bar_icon.png" />
132 <if expr="chromeos"> 133 <if expr="chromeos">
133 <structure type="chrome_scaled_image" name="IDR_BUTTON_USER_IMAGE_CHOOSE _FILE" file="cros/choose_file.png" /> 134 <structure type="chrome_scaled_image" name="IDR_BUTTON_USER_IMAGE_CHOOSE _FILE" file="cros/choose_file.png" />
134 <structure type="chrome_scaled_image" name="IDR_BUTTON_USER_IMAGE_TAKE_P HOTO" file="cros/take_photo.png" /> 135 <structure type="chrome_scaled_image" name="IDR_BUTTON_USER_IMAGE_TAKE_P HOTO" file="cros/take_photo.png" />
135 </if> 136 </if>
(...skipping 1114 matching lines...) Expand 10 before | Expand all | Expand 10 after
1250 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_EMAIL " file="common/mail.png" /> 1251 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_EMAIL " file="common/mail.png" />
1251 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_EMAIL _HOVER" file="common/mail_hover.png" /> 1252 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_EMAIL _HOVER" file="common/mail_hover.png" />
1252 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_EMAIL _PRESSED" file="common/mail_pressed.png" /> 1253 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_EMAIL _PRESSED" file="common/mail_pressed.png" />
1253 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_CHAT" file="common/chat.png" /> 1254 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_CHAT" file="common/chat.png" />
1254 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_CHAT_ HOVER" file="common/chat_hover.png" /> 1255 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_CHAT_ HOVER" file="common/chat_hover.png" />
1255 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_CHAT_ PRESSED" file="common/chat_pressed.png" /> 1256 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_CHAT_ PRESSED" file="common/chat_pressed.png" />
1256 1257
1257 </structures> 1258 </structures>
1258 </release> 1259 </release>
1259 </grit> 1260 </grit>
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698