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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: chrome/browser/browser_resources.grd

Issue 13375003: Fixing iframe jank in the local omnibox popup. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: virtual Created 7 years, 8 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/resources/local_ntp/local_ntp.css » ('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 <grit latest_public_release="0" current_release="1"> 2 <grit latest_public_release="0" current_release="1">
3 <outputs> 3 <outputs>
4 <output filename="grit/browser_resources.h" type="rc_header"> 4 <output filename="grit/browser_resources.h" type="rc_header">
5 <emit emit_type='prepend'></emit> 5 <emit emit_type='prepend'></emit>
6 </output> 6 </output>
7 <output filename="browser_resources.pak" type="data_package" /> 7 <output filename="browser_resources.pak" type="data_package" />
8 <output filename="browser_resources.rc" type="rc_all" /> 8 <output filename="browser_resources.rc" type="rc_all" />
9 </outputs> 9 </outputs>
10 <release seq="1"> 10 <release seq="1">
(...skipping 130 matching lines...) Expand 10 before | Expand all | Expand 10 after
141 <include name="IDR_PREDICTORS_HTML" file="resources\predictors\predictors. html" flattenhtml="true" allowexternalscript="true" type="BINDATA" /> 141 <include name="IDR_PREDICTORS_HTML" file="resources\predictors\predictors. html" flattenhtml="true" allowexternalscript="true" type="BINDATA" />
142 <include name="IDR_PREDICTORS_JS" file="resources\predictors\predictors.js " flattenhtml="true" type="BINDATA" /> 142 <include name="IDR_PREDICTORS_JS" file="resources\predictors\predictors.js " flattenhtml="true" type="BINDATA" />
143 <if expr="not pp_ifdef('android')"> 143 <if expr="not pp_ifdef('android')">
144 <include name="IDR_NOTIFICATION_1LINE_HTML" file="resources\notification _1line.html" flattenhtml="true" type="BINDATA" /> 144 <include name="IDR_NOTIFICATION_1LINE_HTML" file="resources\notification _1line.html" flattenhtml="true" type="BINDATA" />
145 <include name="IDR_NOTIFICATION_2LINE_HTML" file="resources\notification _2line.html" flattenhtml="true" type="BINDATA" /> 145 <include name="IDR_NOTIFICATION_2LINE_HTML" file="resources\notification _2line.html" flattenhtml="true" type="BINDATA" />
146 <include name="IDR_NOTIFICATION_ICON_HTML" file="resources\notification_ icon.html" type="BINDATA" /> 146 <include name="IDR_NOTIFICATION_ICON_HTML" file="resources\notification_ icon.html" type="BINDATA" />
147 </if> 147 </if>
148 148
149 <include name="IDR_LOCAL_NTP_HTML" file="resources\local_ntp\local_ntp.htm l" flattenhtml="true" allowexternalscript="true" type="BINDATA" /> 149 <include name="IDR_LOCAL_NTP_HTML" file="resources\local_ntp\local_ntp.htm l" flattenhtml="true" allowexternalscript="true" type="BINDATA" />
150 <include name="IDR_LOCAL_NTP_CSS" file="resources\local_ntp\local_ntp.css" type="BINDATA" /> 150 <include name="IDR_LOCAL_NTP_CSS" file="resources\local_ntp\local_ntp.css" type="BINDATA" />
151 <include name="IDR_LOCAL_NTP_JS" file="resources\local_ntp\local_ntp.js" t ype="BINDATA" /> 151 <include name="IDR_LOCAL_NTP_JS" file="resources\local_ntp\local_ntp.js" f lattenhtml="true" type="BINDATA" />
152 <include name="IDR_LOCAL_NTP_IMAGES_LOGO_PNG" file="resources\local_ntp\im ages\ntp_google_logo.png" type="BINDATA" /> 152 <include name="IDR_LOCAL_NTP_IMAGES_LOGO_PNG" file="resources\local_ntp\im ages\ntp_google_logo.png" type="BINDATA" />
153 <include name="IDR_LOCAL_NTP_IMAGES_2X_LOGO_PNG" file="resources\local_ntp \images\2x\ntp_google_logo.png" type="BINDATA" /> 153 <include name="IDR_LOCAL_NTP_IMAGES_2X_LOGO_PNG" file="resources\local_ntp \images\2x\ntp_google_logo.png" type="BINDATA" />
154 <include name="IDR_LOCAL_NTP_IMAGES_WHITE_LOGO_PNG" file="resources\local_ ntp\images\ntp_white_google_logo.png" type="BINDATA" /> 154 <include name="IDR_LOCAL_NTP_IMAGES_WHITE_LOGO_PNG" file="resources\local_ ntp\images\ntp_white_google_logo.png" type="BINDATA" />
155 <include name="IDR_LOCAL_NTP_IMAGES_2X_WHITE_LOGO_PNG" file="resources\loc al_ntp\images\2x\ntp_white_google_logo.png" type="BINDATA" /> 155 <include name="IDR_LOCAL_NTP_IMAGES_2X_WHITE_LOGO_PNG" file="resources\loc al_ntp\images\2x\ntp_white_google_logo.png" type="BINDATA" />
156 <include name="IDR_LOCAL_OMNIBOX_POPUP_IMAGES_HISTORY_ICON_PNG" file="reso urces\local_omnibox_popup\images\history_icon.png" type="BINDATA" /> 156 <include name="IDR_LOCAL_OMNIBOX_POPUP_IMAGES_HISTORY_ICON_PNG" file="reso urces\local_omnibox_popup\images\history_icon.png" type="BINDATA" />
157 <include name="IDR_LOCAL_OMNIBOX_POPUP_IMAGES_2X_HISTORY_ICON_PNG" file="r esources\local_omnibox_popup\images\2x\history_icon.png" type="BINDATA" /> 157 <include name="IDR_LOCAL_OMNIBOX_POPUP_IMAGES_2X_HISTORY_ICON_PNG" file="r esources\local_omnibox_popup\images\2x\history_icon.png" type="BINDATA" />
158 <include name="IDR_LOCAL_OMNIBOX_POPUP_IMAGES_PAGE_ICON_PNG" file="resourc es\local_omnibox_popup\images\page_icon.png" type="BINDATA" /> 158 <include name="IDR_LOCAL_OMNIBOX_POPUP_IMAGES_PAGE_ICON_PNG" file="resourc es\local_omnibox_popup\images\page_icon.png" type="BINDATA" />
159 <include name="IDR_LOCAL_OMNIBOX_POPUP_IMAGES_2X_PAGE_ICON_PNG" file="reso urces\local_omnibox_popup\images\2x\page_icon.png" type="BINDATA" /> 159 <include name="IDR_LOCAL_OMNIBOX_POPUP_IMAGES_2X_PAGE_ICON_PNG" file="reso urces\local_omnibox_popup\images\2x\page_icon.png" type="BINDATA" />
160 <include name="IDR_LOCAL_OMNIBOX_POPUP_IMAGES_SEARCH_ICON_PNG" file="resou rces\local_omnibox_popup\images\search_icon.png" type="BINDATA" /> 160 <include name="IDR_LOCAL_OMNIBOX_POPUP_IMAGES_SEARCH_ICON_PNG" file="resou rces\local_omnibox_popup\images\search_icon.png" type="BINDATA" />
161 <include name="IDR_LOCAL_OMNIBOX_POPUP_IMAGES_2X_SEARCH_ICON_PNG" file="re sources\local_omnibox_popup\images\2x\search_icon.png" type="BINDATA" /> 161 <include name="IDR_LOCAL_OMNIBOX_POPUP_IMAGES_2X_SEARCH_ICON_PNG" file="re sources\local_omnibox_popup\images\2x\search_icon.png" type="BINDATA" />
162 <include name="IDR_OMNIBOX_RESULT_LOADER_HTML" file="resources\omnibox_res ult_loader.html" type="BINDATA" />
163 <include name="IDR_OMNIBOX_RESULT_LOADER_JS" file="resources\omnibox_resul t_loader.js" type="BINDATA" />
164 <include name="IDR_OMNIBOX_RESULT_HTML" file="resources\omnibox_result.htm l" type="BINDATA" />
165 <include name="IDR_OMNIBOX_RESULT_JS" file="resources\omnibox_result.js" t ype="BINDATA" />
162 166
163 <include name="IDR_OMNIBOX_HTML" file="resources\omnibox\omnibox.html" fla ttenhtml="true" allowexternalscript="true" type="BINDATA" /> 167 <include name="IDR_OMNIBOX_HTML" file="resources\omnibox\omnibox.html" fla ttenhtml="true" allowexternalscript="true" type="BINDATA" />
164 <include name="IDR_OMNIBOX_CSS" file="resources\omnibox\omnibox.css" type= "BINDATA" /> 168 <include name="IDR_OMNIBOX_CSS" file="resources\omnibox\omnibox.css" type= "BINDATA" />
165 <include name="IDR_OMNIBOX_JS" file="resources\omnibox\omnibox.js" type="B INDATA" /> 169 <include name="IDR_OMNIBOX_JS" file="resources\omnibox\omnibox.js" type="B INDATA" />
166 <if expr="not pp_ifdef('android')"> 170 <if expr="not pp_ifdef('android')">
167 <include name="IDR_PLUGINS_HTML" file="resources\plugins.html" flattenht ml="true" allowexternalscript="true" type="BINDATA" /> 171 <include name="IDR_PLUGINS_HTML" file="resources\plugins.html" flattenht ml="true" allowexternalscript="true" type="BINDATA" />
168 <include name="IDR_PLUGINS_JS" file="resources\plugins.js" type="BINDATA " /> 172 <include name="IDR_PLUGINS_JS" file="resources\plugins.js" type="BINDATA " />
169 </if> 173 </if>
170 <if expr="is_win"> 174 <if expr="is_win">
171 <include name="IDR_PLUGIN_DB_JSON" file="resources\plugin_metadata\plugi ns_win.json" type="BINDATA" /> 175 <include name="IDR_PLUGIN_DB_JSON" file="resources\plugin_metadata\plugi ns_win.json" type="BINDATA" />
(...skipping 159 matching lines...) Expand 10 before | Expand all | Expand 10 after
331 <include name="IDR_SET_AS_DEFAULT_BROWSER_HTML" file="resources\set_as_d efault_browser.html" flattenhtml="true" allowexternalscript="true" type="BINDATA " /> 335 <include name="IDR_SET_AS_DEFAULT_BROWSER_HTML" file="resources\set_as_d efault_browser.html" flattenhtml="true" allowexternalscript="true" type="BINDATA " />
332 </if> 336 </if>
333 <include name="IDR_MANAGED_MODE_BLOCK_INTERSTITIAL_HTML" file="resources\m anaged_mode_block_interstitial.html" flattenhtml="true" type="BINDATA" /> 337 <include name="IDR_MANAGED_MODE_BLOCK_INTERSTITIAL_HTML" file="resources\m anaged_mode_block_interstitial.html" flattenhtml="true" type="BINDATA" />
334 <include name="IDR_MANAGED_USER_PASSPHRASE_DIALOG_JS" file="resources\mana ged_user_passphrase_dialog.js" type="BINDATA" /> 338 <include name="IDR_MANAGED_USER_PASSPHRASE_DIALOG_JS" file="resources\mana ged_user_passphrase_dialog.js" type="BINDATA" />
335 <include name="IDR_PROFILE_SIGNIN_CONFIRMATION_HTML" file="resources\profi le_signin_confirmation.html" type="BINDATA" /> 339 <include name="IDR_PROFILE_SIGNIN_CONFIRMATION_HTML" file="resources\profi le_signin_confirmation.html" type="BINDATA" />
336 <include name="IDR_PROFILE_SIGNIN_CONFIRMATION_JS" file="resources\profile _signin_confirmation.js" type="BINDATA" /> 340 <include name="IDR_PROFILE_SIGNIN_CONFIRMATION_JS" file="resources\profile _signin_confirmation.js" type="BINDATA" />
337 <include name="IDR_PROFILE_SIGNIN_CONFIRMATION_CSS" file="resources\profil e_signin_confirmation.css" type="BINDATA" /> 341 <include name="IDR_PROFILE_SIGNIN_CONFIRMATION_CSS" file="resources\profil e_signin_confirmation.css" type="BINDATA" />
338 </includes> 342 </includes>
339 </release> 343 </release>
340 </grit> 344 </grit>
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/resources/local_ntp/local_ntp.css » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698