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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 1412523003: Adding <keygen> Content Setting (UI) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixing keygen location in settings and wildcard. Created 5 years, 1 month 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/generated_resources.grd ('k') | chrome/browser/resources/options/content_settings.html » ('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 15 matching lines...) Expand all
26 <structures fallback_to_low_resolution="true"> 26 <structures fallback_to_low_resolution="true">
27 <!-- KEEP THESE IN ALPHABETICAL ORDER! DO NOT ADD TO RANDOM PLACES JUST 27 <!-- KEEP THESE IN ALPHABETICAL ORDER! DO NOT ADD TO RANDOM PLACES JUST
28 BECAUSE YOUR RESOURCES ARE FUNCTIONALLY RELATED OR FALL UNDER THE 28 BECAUSE YOUR RESOURCES ARE FUNCTIONALLY RELATED OR FALL UNDER THE
29 SAME CONDITIONALS. --> 29 SAME CONDITIONALS. -->
30 <structure type="chrome_scaled_image" name="IDR_ACCESSED_COOKIES" file="co mmon/accessed_cookies.png" /> 30 <structure type="chrome_scaled_image" name="IDR_ACCESSED_COOKIES" file="co mmon/accessed_cookies.png" />
31 <structure type="chrome_scaled_image" name="IDR_ALLOWED_CAMERA" file="comm on/allowed_camera.png" /> 31 <structure type="chrome_scaled_image" name="IDR_ALLOWED_CAMERA" file="comm on/allowed_camera.png" />
32 <structure type="chrome_scaled_image" name="IDR_ALLOWED_DOWNLOADS" file="c ommon/allowed_downloads.png" /> 32 <structure type="chrome_scaled_image" name="IDR_ALLOWED_DOWNLOADS" file="c ommon/allowed_downloads.png" />
33 <structure type="chrome_scaled_image" name="IDR_ALLOWED_FULLSCREEN" file=" common/allowed_fullscreen.png" /> 33 <structure type="chrome_scaled_image" name="IDR_ALLOWED_FULLSCREEN" file=" common/allowed_fullscreen.png" />
34 <structure type="chrome_scaled_image" name="IDR_ALLOWED_IMAGES" file="comm on/allowed_images.png" /> 34 <structure type="chrome_scaled_image" name="IDR_ALLOWED_IMAGES" file="comm on/allowed_images.png" />
35 <structure type="chrome_scaled_image" name="IDR_ALLOWED_JAVASCRIPT" file=" common/allowed_script.png" /> 35 <structure type="chrome_scaled_image" name="IDR_ALLOWED_JAVASCRIPT" file=" common/allowed_script.png" />
36 <structure type="chrome_scaled_image" name="IDR_ALLOWED_KEYGEN" file="comm on/allowed_script.png" />
36 <structure type="chrome_scaled_image" name="IDR_ALLOWED_LOCATION" file="co mmon/allowed_location.png" /> 37 <structure type="chrome_scaled_image" name="IDR_ALLOWED_LOCATION" file="co mmon/allowed_location.png" />
37 <structure type="chrome_scaled_image" name="IDR_ALLOWED_MIC" file="common/ allowed_mic.png" /> 38 <structure type="chrome_scaled_image" name="IDR_ALLOWED_MIC" file="common/ allowed_mic.png" />
38 <structure type="chrome_scaled_image" name="IDR_ALLOWED_MIDI_SYSEX" file=" common/allowed_midi.png" /> 39 <structure type="chrome_scaled_image" name="IDR_ALLOWED_MIDI_SYSEX" file=" common/allowed_midi.png" />
39 <structure type="chrome_scaled_image" name="IDR_ALLOWED_MOUSE_CURSOR" file ="common/allowed_mouse_cursor.png" /> 40 <structure type="chrome_scaled_image" name="IDR_ALLOWED_MOUSE_CURSOR" file ="common/allowed_mouse_cursor.png" />
40 <structure type="chrome_scaled_image" name="IDR_ALLOWED_NOTIFICATION" file ="common/allowed_notifications.png" /> 41 <structure type="chrome_scaled_image" name="IDR_ALLOWED_NOTIFICATION" file ="common/allowed_notifications.png" />
41 <if expr="enable_plugins"> 42 <if expr="enable_plugins">
42 <structure type="chrome_scaled_image" name="IDR_ALLOWED_PLUGINS" file="c ommon/allowed_plugins.png" /> 43 <structure type="chrome_scaled_image" name="IDR_ALLOWED_PLUGINS" file="c ommon/allowed_plugins.png" />
43 </if> 44 </if>
44 <structure type="chrome_scaled_image" name="IDR_ALLOWED_POPUPS" file="comm on/allowed_popups.png" /> 45 <structure type="chrome_scaled_image" name="IDR_ALLOWED_POPUPS" file="comm on/allowed_popups.png" />
45 <if expr="enable_app_list and is_win and not _google_chrome"> 46 <if expr="enable_app_list and is_win and not _google_chrome">
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
107 <structure type="chrome_scaled_image" name="IDR_BACK" file="common/brows er_back_normal.png" /> 108 <structure type="chrome_scaled_image" name="IDR_BACK" file="common/brows er_back_normal.png" />
108 <structure type="chrome_scaled_image" name="IDR_BACK_D" file="common/bro wser_back_disabled.png" /> 109 <structure type="chrome_scaled_image" name="IDR_BACK_D" file="common/bro wser_back_disabled.png" />
109 <structure type="chrome_scaled_image" name="IDR_BACK_H" file="common/bro wser_back_hover.png" /> 110 <structure type="chrome_scaled_image" name="IDR_BACK_H" file="common/bro wser_back_hover.png" />
110 <structure type="chrome_scaled_image" name="IDR_BACK_P" file="common/bro wser_back_pressed.png" /> 111 <structure type="chrome_scaled_image" name="IDR_BACK_P" file="common/bro wser_back_pressed.png" />
111 </if> 112 </if>
112 <structure type="chrome_scaled_image" name="IDR_BLOCKED_CAMERA" file="comm on/blocked_camera.png" /> 113 <structure type="chrome_scaled_image" name="IDR_BLOCKED_CAMERA" file="comm on/blocked_camera.png" />
113 <structure type="chrome_scaled_image" name="IDR_BLOCKED_COOKIES" file="com mon/blocked_cookies.png" /> 114 <structure type="chrome_scaled_image" name="IDR_BLOCKED_COOKIES" file="com mon/blocked_cookies.png" />
114 <structure type="chrome_scaled_image" name="IDR_BLOCKED_DOWNLOADS" file="c ommon/blocked_downloads.png" /> 115 <structure type="chrome_scaled_image" name="IDR_BLOCKED_DOWNLOADS" file="c ommon/blocked_downloads.png" />
115 <structure type="chrome_scaled_image" name="IDR_BLOCKED_IMAGES" file="comm on/blocked_images.png" /> 116 <structure type="chrome_scaled_image" name="IDR_BLOCKED_IMAGES" file="comm on/blocked_images.png" />
116 <structure type="chrome_scaled_image" name="IDR_BLOCKED_JAVASCRIPT" file=" common/blocked_script.png" /> 117 <structure type="chrome_scaled_image" name="IDR_BLOCKED_JAVASCRIPT" file=" common/blocked_script.png" />
118 <structure type="chrome_scaled_image" name="IDR_BLOCKED_KEYGEN" file="comm on/blocked_script.png" />
117 <structure type="chrome_scaled_image" name="IDR_BLOCKED_LOCATION" file="co mmon/blocked_location.png" /> 119 <structure type="chrome_scaled_image" name="IDR_BLOCKED_LOCATION" file="co mmon/blocked_location.png" />
118 <structure type="chrome_scaled_image" name="IDR_BLOCKED_MIC" file="common/ blocked_mic.png" /> 120 <structure type="chrome_scaled_image" name="IDR_BLOCKED_MIC" file="common/ blocked_mic.png" />
119 <structure type="chrome_scaled_image" name="IDR_BLOCKED_MIDI_SYSEX" file=" common/blocked_midi.png" /> 121 <structure type="chrome_scaled_image" name="IDR_BLOCKED_MIDI_SYSEX" file=" common/blocked_midi.png" />
120 <structure type="chrome_scaled_image" name="IDR_BLOCKED_MIXED_CONTENT" fil e="common/blocked_mixed_content.png" /> 122 <structure type="chrome_scaled_image" name="IDR_BLOCKED_MIXED_CONTENT" fil e="common/blocked_mixed_content.png" />
121 <structure type="chrome_scaled_image" name="IDR_BLOCKED_MOUSE_CURSOR" file ="common/blocked_mouse_cursor.png" /> 123 <structure type="chrome_scaled_image" name="IDR_BLOCKED_MOUSE_CURSOR" file ="common/blocked_mouse_cursor.png" />
122 <structure type="chrome_scaled_image" name="IDR_BLOCKED_NOTIFICATION" file ="common/blocked_notifications.png" /> 124 <structure type="chrome_scaled_image" name="IDR_BLOCKED_NOTIFICATION" file ="common/blocked_notifications.png" />
123 <if expr="enable_plugins"> 125 <if expr="enable_plugins">
124 <structure type="chrome_scaled_image" name="IDR_BLOCKED_PLUGINS" file="c ommon/blocked_plugins.png" /> 126 <structure type="chrome_scaled_image" name="IDR_BLOCKED_PLUGINS" file="c ommon/blocked_plugins.png" />
125 </if> 127 </if>
126 <structure type="chrome_scaled_image" name="IDR_BLOCKED_POPUPS" file="comm on/blocked_popups.png" /> 128 <structure type="chrome_scaled_image" name="IDR_BLOCKED_POPUPS" file="comm on/blocked_popups.png" />
(...skipping 895 matching lines...) Expand 10 before | Expand all | Expand 10 after
1022 <!-- People search images --> 1024 <!-- People search images -->
1023 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_EMAIL " file="common/mail.png" /> 1025 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_EMAIL " file="common/mail.png" />
1024 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_EMAIL _HOVER" file="common/mail_hover.png" /> 1026 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_EMAIL _HOVER" file="common/mail_hover.png" />
1025 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_EMAIL _PRESSED" file="common/mail_pressed.png" /> 1027 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_EMAIL _PRESSED" file="common/mail_pressed.png" />
1026 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_CHAT" file="common/chat.png" /> 1028 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_CHAT" file="common/chat.png" />
1027 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_CHAT_ HOVER" file="common/chat_hover.png" /> 1029 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_CHAT_ HOVER" file="common/chat_hover.png" />
1028 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_CHAT_ PRESSED" file="common/chat_pressed.png" /> 1030 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_CHAT_ PRESSED" file="common/chat_pressed.png" />
1029 </structures> 1031 </structures>
1030 </release> 1032 </release>
1031 </grit> 1033 </grit>
OLDNEW
« chrome/app/generated_resources.grd ('K') | « chrome/app/generated_resources.grd ('k') | chrome/browser/resources/options/content_settings.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698