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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 12840003: Implement local NTP for fallback. (Closed) Base URL: https://git.chromium.org/chromium/src.git@master
Patch Set: Respond to Samarth's comments. Created 7 years, 9 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 | « no previous file | chrome/browser/instant/instant_service.cc » ('j') | chrome/browser/instant/local_ntp_source.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 <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 127 matching lines...) Expand 10 before | Expand all | Expand 10 after
138 <include name="IDR_PERFORMANCE_MONITOR_JQUERY_JS" file="..\..\third_part y\flot\jquery.min.js" type="BINDATA" /> 138 <include name="IDR_PERFORMANCE_MONITOR_JQUERY_JS" file="..\..\third_part y\flot\jquery.min.js" type="BINDATA" />
139 </if> 139 </if>
140 <include name="IDR_PREDICTORS_HTML" file="resources\predictors\predictors. html" flattenhtml="true" allowexternalscript="true" type="BINDATA" /> 140 <include name="IDR_PREDICTORS_HTML" file="resources\predictors\predictors. html" flattenhtml="true" allowexternalscript="true" type="BINDATA" />
141 <include name="IDR_PREDICTORS_JS" file="resources\predictors\predictors.js " flattenhtml="true" type="BINDATA" /> 141 <include name="IDR_PREDICTORS_JS" file="resources\predictors\predictors.js " flattenhtml="true" type="BINDATA" />
142 <if expr="not pp_ifdef('android')"> 142 <if expr="not pp_ifdef('android')">
143 <include name="IDR_NOTIFICATION_1LINE_HTML" file="resources\notification _1line.html" flattenhtml="true" type="BINDATA" /> 143 <include name="IDR_NOTIFICATION_1LINE_HTML" file="resources\notification _1line.html" flattenhtml="true" type="BINDATA" />
144 <include name="IDR_NOTIFICATION_2LINE_HTML" file="resources\notification _2line.html" flattenhtml="true" type="BINDATA" /> 144 <include name="IDR_NOTIFICATION_2LINE_HTML" file="resources\notification _2line.html" flattenhtml="true" type="BINDATA" />
145 <include name="IDR_NOTIFICATION_ICON_HTML" file="resources\notification_ icon.html" type="BINDATA" /> 145 <include name="IDR_NOTIFICATION_ICON_HTML" file="resources\notification_ icon.html" type="BINDATA" />
146 </if> 146 </if>
147 147
148 <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_CSS" file="resources\local_ntp\local_ntp.css" type="BINDATA" />
150 <include name="IDR_LOCAL_NTP_JS" file="resources\local_ntp\local_ntp.js" t ype="BINDATA" />
148 <include name="IDR_LOCAL_OMNIBOX_POPUP_HTML" file="resources\local_omnibox _popup\local_omnibox_popup.html" flattenhtml="true" allowexternalscript="true" t ype="BINDATA" /> 151 <include name="IDR_LOCAL_OMNIBOX_POPUP_HTML" file="resources\local_omnibox _popup\local_omnibox_popup.html" flattenhtml="true" allowexternalscript="true" t ype="BINDATA" />
149 <include name="IDR_LOCAL_OMNIBOX_POPUP_CSS" file="resources\local_omnibox_ popup\local_omnibox_popup.css" type="BINDATA" /> 152 <include name="IDR_LOCAL_OMNIBOX_POPUP_CSS" file="resources\local_omnibox_ popup\local_omnibox_popup.css" type="BINDATA" />
150 <include name="IDR_LOCAL_OMNIBOX_POPUP_JS" file="resources\local_omnibox_p opup\local_omnibox_popup.js" type="BINDATA" /> 153 <include name="IDR_LOCAL_OMNIBOX_POPUP_JS" file="resources\local_omnibox_p opup\local_omnibox_popup.js" type="BINDATA" />
151 <include name="IDR_LOCAL_OMNIBOX_POPUP_IMAGES_HISTORY_ICON_PNG" file="reso urces\local_omnibox_popup\images\history_icon.png" type="BINDATA" /> 154 <include name="IDR_LOCAL_OMNIBOX_POPUP_IMAGES_HISTORY_ICON_PNG" file="reso urces\local_omnibox_popup\images\history_icon.png" type="BINDATA" />
152 <include name="IDR_LOCAL_OMNIBOX_POPUP_IMAGES_PAGE_ICON_PNG" file="resourc es\local_omnibox_popup\images\page_icon.png" type="BINDATA" /> 155 <include name="IDR_LOCAL_OMNIBOX_POPUP_IMAGES_PAGE_ICON_PNG" file="resourc es\local_omnibox_popup\images\page_icon.png" type="BINDATA" />
153 <include name="IDR_LOCAL_OMNIBOX_POPUP_IMAGES_SEARCH_ICON_PNG" file="resou rces\local_omnibox_popup\images\search_icon.png" type="BINDATA" /> 156 <include name="IDR_LOCAL_OMNIBOX_POPUP_IMAGES_SEARCH_ICON_PNG" file="resou rces\local_omnibox_popup\images\search_icon.png" type="BINDATA" />
154 <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" />
155 <include name="IDR_LOCAL_OMNIBOX_POPUP_IMAGES_2X_PAGE_ICON_PNG" file="reso urces\local_omnibox_popup\images\2x\page_icon.png" type="BINDATA" /> 158 <include name="IDR_LOCAL_OMNIBOX_POPUP_IMAGES_2X_PAGE_ICON_PNG" file="reso urces\local_omnibox_popup\images\2x\page_icon.png" type="BINDATA" />
156 <include name="IDR_LOCAL_OMNIBOX_POPUP_IMAGES_2X_SEARCH_ICON_PNG" file="re sources\local_omnibox_popup\images\2x\search_icon.png" type="BINDATA" /> 159 <include name="IDR_LOCAL_OMNIBOX_POPUP_IMAGES_2X_SEARCH_ICON_PNG" file="re sources\local_omnibox_popup\images\2x\search_icon.png" type="BINDATA" />
157 160
(...skipping 166 matching lines...) Expand 10 before | Expand all | Expand 10 after
324 <include name="IDR_SET_AS_DEFAULT_BROWSER_HTML" file="resources\set_as_d efault_browser.html" flattenhtml="true" allowexternalscript="true" type="BINDATA " /> 327 <include name="IDR_SET_AS_DEFAULT_BROWSER_HTML" file="resources\set_as_d efault_browser.html" flattenhtml="true" allowexternalscript="true" type="BINDATA " />
325 </if> 328 </if>
326 <include name="IDR_MANAGED_MODE_BLOCK_INTERSTITIAL_HTML" file="resources\m anaged_mode_block_interstitial.html" flattenhtml="true" type="BINDATA" /> 329 <include name="IDR_MANAGED_MODE_BLOCK_INTERSTITIAL_HTML" file="resources\m anaged_mode_block_interstitial.html" flattenhtml="true" type="BINDATA" />
327 <include name="IDR_MANAGED_USER_PASSPHRASE_DIALOG_JS" file="resources\mana ged_user_passphrase_dialog.js" type="BINDATA" /> 330 <include name="IDR_MANAGED_USER_PASSPHRASE_DIALOG_JS" file="resources\mana ged_user_passphrase_dialog.js" type="BINDATA" />
328 <include name="IDR_PROFILE_SIGNIN_CONFIRMATION_HTML" file="resources\profi le_signin_confirmation.html" type="BINDATA" /> 331 <include name="IDR_PROFILE_SIGNIN_CONFIRMATION_HTML" file="resources\profi le_signin_confirmation.html" type="BINDATA" />
329 <include name="IDR_PROFILE_SIGNIN_CONFIRMATION_JS" file="resources\profile _signin_confirmation.js" type="BINDATA" /> 332 <include name="IDR_PROFILE_SIGNIN_CONFIRMATION_JS" file="resources\profile _signin_confirmation.js" type="BINDATA" />
330 <include name="IDR_PROFILE_SIGNIN_CONFIRMATION_CSS" file="resources\profil e_signin_confirmation.css" type="BINDATA" /> 333 <include name="IDR_PROFILE_SIGNIN_CONFIRMATION_CSS" file="resources\profil e_signin_confirmation.css" type="BINDATA" />
331 </includes> 334 </includes>
332 </release> 335 </release>
333 </grit> 336 </grit>
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/instant/instant_service.cc » ('j') | chrome/browser/instant/local_ntp_source.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698