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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 769153007: Managed bookmarks for supervised users (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix build (Android & unit_tests) Created 5 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 | « chrome/app/theme/default_200_percent/mac/bookmark_bar_folder_supervised.png ('k') | chrome/browser/about_flags.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 109 matching lines...) Expand 10 before | Expand all | Expand 10 after
120 <if expr="chromeos"> 120 <if expr="chromeos">
121 <structure type="chrome_scaled_image" name="IDR_BLUETOOTH_KEYBOARD" file ="cros/bluetooth_pairing_keyboard.png" /> 121 <structure type="chrome_scaled_image" name="IDR_BLUETOOTH_KEYBOARD" file ="cros/bluetooth_pairing_keyboard.png" />
122 <structure type="chrome_scaled_image" name="IDR_BLUETOOTH_MOUSE" file="c ros/bluetooth_pairing_mouse.png" /> 122 <structure type="chrome_scaled_image" name="IDR_BLUETOOTH_MOUSE" file="c ros/bluetooth_pairing_mouse.png" />
123 <structure type="chrome_scaled_image" name="IDR_BLUETOOTH_PAIRING_TICK" file="cros/bluetooth_pairing_tick.png" /> 123 <structure type="chrome_scaled_image" name="IDR_BLUETOOTH_PAIRING_TICK" file="cros/bluetooth_pairing_tick.png" />
124 </if> 124 </if>
125 <structure type="chrome_scaled_image" name="IDR_BOOKMARKS_FAVICON" file="c ommon/favicon_bookmarks.png" /> 125 <structure type="chrome_scaled_image" name="IDR_BOOKMARKS_FAVICON" file="c ommon/favicon_bookmarks.png" />
126 <structure type="chrome_scaled_image" name="IDR_BOOKMARK_BAR_CHEVRONS" fil e="common/chevron.png" /> 126 <structure type="chrome_scaled_image" name="IDR_BOOKMARK_BAR_CHEVRONS" fil e="common/chevron.png" />
127 <if expr="is_macosx or is_ios"> 127 <if expr="is_macosx or is_ios">
128 <structure type="chrome_scaled_image" name="IDR_BOOKMARK_BAR_FOLDER" fil e="mac/bookmark_bar_folder.png" /> 128 <structure type="chrome_scaled_image" name="IDR_BOOKMARK_BAR_FOLDER" fil e="mac/bookmark_bar_folder.png" />
129 <structure type="chrome_scaled_image" name="IDR_BOOKMARK_BAR_FOLDER_MANA GED" file="mac/bookmark_bar_folder_managed.png" /> 129 <structure type="chrome_scaled_image" name="IDR_BOOKMARK_BAR_FOLDER_MANA GED" file="mac/bookmark_bar_folder_managed.png" />
130 <structure type="chrome_scaled_image" name="IDR_BOOKMARK_BAR_FOLDER_SUPE RVISED" file="mac/bookmark_bar_folder_supervised.png" />
130 </if> 131 </if>
131 <if expr="not is_macosx and not is_ios"> 132 <if expr="not is_macosx and not is_ios">
132 <structure type="chrome_scaled_image" name="IDR_BOOKMARK_BAR_FOLDER" fil e="common/bookmark_bar_folder.png" /> 133 <structure type="chrome_scaled_image" name="IDR_BOOKMARK_BAR_FOLDER" fil e="common/bookmark_bar_folder.png" />
133 <structure type="chrome_scaled_image" name="IDR_BOOKMARK_BAR_FOLDER_MANA GED" file="common/bookmark_bar_folder_managed.png" /> 134 <structure type="chrome_scaled_image" name="IDR_BOOKMARK_BAR_FOLDER_MANA GED" file="common/bookmark_bar_folder_managed.png" />
135 <structure type="chrome_scaled_image" name="IDR_BOOKMARK_BAR_FOLDER_SUPE RVISED" file="common/bookmark_bar_folder_supervised.png" />
134 </if> 136 </if>
135 <structure type="chrome_scaled_image" name="IDR_BOOKMARK_BAR_APPS_SHORTCUT " file="common/apps_bookmark_bar_icon.png" /> 137 <structure type="chrome_scaled_image" name="IDR_BOOKMARK_BAR_APPS_SHORTCUT " file="common/apps_bookmark_bar_icon.png" />
136 <if expr="chromeos"> 138 <if expr="chromeos">
137 <structure type="chrome_scaled_image" name="IDR_BUTTON_USER_IMAGE_CHOOSE _FILE" file="cros/choose_file.png" /> 139 <structure type="chrome_scaled_image" name="IDR_BUTTON_USER_IMAGE_CHOOSE _FILE" file="cros/choose_file.png" />
138 <structure type="chrome_scaled_image" name="IDR_BUTTON_USER_IMAGE_TAKE_P HOTO" file="cros/take_photo.png" /> 140 <structure type="chrome_scaled_image" name="IDR_BUTTON_USER_IMAGE_TAKE_P HOTO" file="cros/take_photo.png" />
139 </if> 141 </if>
140 <if expr="toolkit_views or is_macosx or is_ios"> 142 <if expr="toolkit_views or is_macosx or is_ios">
141 <structure type="chrome_scaled_image" name="IDR_BROWSER_ACTION" file="co mmon/browser_action_normal.png" /> 143 <structure type="chrome_scaled_image" name="IDR_BROWSER_ACTION" file="co mmon/browser_action_normal.png" />
142 </if> 144 </if>
143 <if expr="is_macosx or is_ios"> 145 <if expr="is_macosx or is_ios">
(...skipping 1070 matching lines...) Expand 10 before | Expand all | Expand 10 after
1214 <!-- People search images --> 1216 <!-- People search images -->
1215 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_EMAIL " file="common/mail.png" /> 1217 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_EMAIL " file="common/mail.png" />
1216 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_EMAIL _HOVER" file="common/mail_hover.png" /> 1218 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_EMAIL _HOVER" file="common/mail_hover.png" />
1217 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_EMAIL _PRESSED" file="common/mail_pressed.png" /> 1219 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_EMAIL _PRESSED" file="common/mail_pressed.png" />
1218 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_CHAT" file="common/chat.png" /> 1220 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_CHAT" file="common/chat.png" />
1219 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_CHAT_ HOVER" file="common/chat_hover.png" /> 1221 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_CHAT_ HOVER" file="common/chat_hover.png" />
1220 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_CHAT_ PRESSED" file="common/chat_pressed.png" /> 1222 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_CHAT_ PRESSED" file="common/chat_pressed.png" />
1221 </structures> 1223 </structures>
1222 </release> 1224 </release>
1223 </grit> 1225 </grit>
OLDNEW
« no previous file with comments | « chrome/app/theme/default_200_percent/mac/bookmark_bar_folder_supervised.png ('k') | chrome/browser/about_flags.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698