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

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: rebase Created 5 years, 11 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
« chrome/app/generated_resources.grd ('K') | « chrome/app/theme/default_200_percent/mac/bookmark_bar_folder_supervised.png ('k') | chrome/browser/about_flags.cc » ('j') | chrome/browser/bookmarks/chrome_bookmark_client.h » ('J')
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 107 matching lines...) Expand 10 before | Expand all | Expand 10 after
118 <if expr="chromeos"> 118 <if expr="chromeos">
119 <structure type="chrome_scaled_image" name="IDR_BLUETOOTH_KEYBOARD" file ="cros/bluetooth_pairing_keyboard.png" /> 119 <structure type="chrome_scaled_image" name="IDR_BLUETOOTH_KEYBOARD" file ="cros/bluetooth_pairing_keyboard.png" />
120 <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_MOUSE" file="c ros/bluetooth_pairing_mouse.png" />
121 <structure type="chrome_scaled_image" name="IDR_BLUETOOTH_PAIRING_TICK" file="cros/bluetooth_pairing_tick.png" /> 121 <structure type="chrome_scaled_image" name="IDR_BLUETOOTH_PAIRING_TICK" file="cros/bluetooth_pairing_tick.png" />
122 </if> 122 </if>
123 <structure type="chrome_scaled_image" name="IDR_BOOKMARKS_FAVICON" file="c ommon/favicon_bookmarks.png" /> 123 <structure type="chrome_scaled_image" name="IDR_BOOKMARKS_FAVICON" file="c ommon/favicon_bookmarks.png" />
124 <structure type="chrome_scaled_image" name="IDR_BOOKMARK_BAR_CHEVRONS" fil e="common/chevron.png" /> 124 <structure type="chrome_scaled_image" name="IDR_BOOKMARK_BAR_CHEVRONS" fil e="common/chevron.png" />
125 <if expr="is_macosx or is_ios"> 125 <if expr="is_macosx or is_ios">
126 <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" fil e="mac/bookmark_bar_folder.png" />
127 <structure type="chrome_scaled_image" name="IDR_BOOKMARK_BAR_FOLDER_MANA GED" file="mac/bookmark_bar_folder_managed.png" /> 127 <structure type="chrome_scaled_image" name="IDR_BOOKMARK_BAR_FOLDER_MANA GED" file="mac/bookmark_bar_folder_managed.png" />
128 <structure type="chrome_scaled_image" name="IDR_BOOKMARK_BAR_FOLDER_SUPE RVISED" file="mac/bookmark_bar_folder_supervised.png" />
128 </if> 129 </if>
129 <if expr="not is_macosx and not is_ios"> 130 <if expr="not is_macosx and not is_ios">
130 <structure type="chrome_scaled_image" name="IDR_BOOKMARK_BAR_FOLDER" fil e="common/bookmark_bar_folder.png" /> 131 <structure type="chrome_scaled_image" name="IDR_BOOKMARK_BAR_FOLDER" fil e="common/bookmark_bar_folder.png" />
131 <structure type="chrome_scaled_image" name="IDR_BOOKMARK_BAR_FOLDER_MANA GED" file="common/bookmark_bar_folder_managed.png" /> 132 <structure type="chrome_scaled_image" name="IDR_BOOKMARK_BAR_FOLDER_MANA GED" file="common/bookmark_bar_folder_managed.png" />
133 <structure type="chrome_scaled_image" name="IDR_BOOKMARK_BAR_FOLDER_SUPE RVISED" file="common/bookmark_bar_folder_supervised.png" />
132 </if> 134 </if>
133 <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" />
134 <if expr="chromeos"> 136 <if expr="chromeos">
135 <structure type="chrome_scaled_image" name="IDR_BUTTON_USER_IMAGE_CHOOSE _FILE" file="cros/choose_file.png" /> 137 <structure type="chrome_scaled_image" name="IDR_BUTTON_USER_IMAGE_CHOOSE _FILE" file="cros/choose_file.png" />
136 <structure type="chrome_scaled_image" name="IDR_BUTTON_USER_IMAGE_TAKE_P HOTO" file="cros/take_photo.png" /> 138 <structure type="chrome_scaled_image" name="IDR_BUTTON_USER_IMAGE_TAKE_P HOTO" file="cros/take_photo.png" />
137 </if> 139 </if>
138 <if expr="toolkit_views or is_macosx or is_ios"> 140 <if expr="toolkit_views or is_macosx or is_ios">
139 <structure type="chrome_scaled_image" name="IDR_BROWSER_ACTION" file="co mmon/browser_action_normal.png" /> 141 <structure type="chrome_scaled_image" name="IDR_BROWSER_ACTION" file="co mmon/browser_action_normal.png" />
140 </if> 142 </if>
141 <if expr="is_macosx or is_ios"> 143 <if expr="is_macosx or is_ios">
(...skipping 1067 matching lines...) Expand 10 before | Expand all | Expand 10 after
1209 <!-- People search images --> 1211 <!-- People search images -->
1210 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_EMAIL " file="common/mail.png" /> 1212 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_EMAIL " file="common/mail.png" />
1211 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_EMAIL _HOVER" file="common/mail_hover.png" /> 1213 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_EMAIL _HOVER" file="common/mail_hover.png" />
1212 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_EMAIL _PRESSED" file="common/mail_pressed.png" /> 1214 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_EMAIL _PRESSED" file="common/mail_pressed.png" />
1213 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_CHAT" file="common/chat.png" /> 1215 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_CHAT" file="common/chat.png" />
1214 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_CHAT_ HOVER" file="common/chat_hover.png" /> 1216 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_CHAT_ HOVER" file="common/chat_hover.png" />
1215 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_CHAT_ PRESSED" file="common/chat_pressed.png" /> 1217 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_CHAT_ PRESSED" file="common/chat_pressed.png" />
1216 </structures> 1218 </structures>
1217 </release> 1219 </release>
1218 </grit> 1220 </grit>
OLDNEW
« chrome/app/generated_resources.grd ('K') | « chrome/app/theme/default_200_percent/mac/bookmark_bar_folder_supervised.png ('k') | chrome/browser/about_flags.cc » ('j') | chrome/browser/bookmarks/chrome_bookmark_client.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698