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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 11555033: Adding local html page used in Instant Extended mode when instant is disabled or unavailable. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Fix uninitialized variable. Created 8 years 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_controller.h » ('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 120 matching lines...) Expand 10 before | Expand all | Expand 10 after
131 <include name="IDR_PERFORMANCE_MONITOR_JQUERY_FLOT_JS" file="..\..\third _party\flot\jquery.flot.min.js" type="BINDATA" /> 131 <include name="IDR_PERFORMANCE_MONITOR_JQUERY_FLOT_JS" file="..\..\third _party\flot\jquery.flot.min.js" type="BINDATA" />
132 <include name="IDR_PERFORMANCE_MONITOR_JQUERY_JS" file="..\..\third_part y\flot\jquery.min.js" type="BINDATA" /> 132 <include name="IDR_PERFORMANCE_MONITOR_JQUERY_JS" file="..\..\third_part y\flot\jquery.min.js" type="BINDATA" />
133 </if> 133 </if>
134 <include name="IDR_PREDICTORS_HTML" file="resources\predictors\predictors. html" flattenhtml="true" allowexternalscript="true" type="BINDATA" /> 134 <include name="IDR_PREDICTORS_HTML" file="resources\predictors\predictors. html" flattenhtml="true" allowexternalscript="true" type="BINDATA" />
135 <include name="IDR_PREDICTORS_JS" file="resources\predictors\predictors.js " flattenhtml="true" type="BINDATA" /> 135 <include name="IDR_PREDICTORS_JS" file="resources\predictors\predictors.js " flattenhtml="true" type="BINDATA" />
136 <if expr="not pp_ifdef('android')"> 136 <if expr="not pp_ifdef('android')">
137 <include name="IDR_NOTIFICATION_1LINE_HTML" file="resources\notification _1line.html" flattenhtml="true" type="BINDATA" /> 137 <include name="IDR_NOTIFICATION_1LINE_HTML" file="resources\notification _1line.html" flattenhtml="true" type="BINDATA" />
138 <include name="IDR_NOTIFICATION_2LINE_HTML" file="resources\notification _2line.html" flattenhtml="true" type="BINDATA" /> 138 <include name="IDR_NOTIFICATION_2LINE_HTML" file="resources\notification _2line.html" flattenhtml="true" type="BINDATA" />
139 <include name="IDR_NOTIFICATION_ICON_HTML" file="resources\notification_ icon.html" type="BINDATA" /> 139 <include name="IDR_NOTIFICATION_ICON_HTML" file="resources\notification_ icon.html" type="BINDATA" />
140 </if> 140 </if>
141
142 <include name="IDR_LOCAL_OMNIBOX_POPUP_HTML" file="resources\local_omnibox _popup\local_omnibox_popup.html" flattenhtml="true" allowexternalscript="true" t ype="BINDATA" />
143 <include name="IDR_LOCAL_OMNIBOX_POPUP_CSS" file="resources\local_omnibox_ popup\local_omnibox_popup.css" type="BINDATA" />
144 <include name="IDR_LOCAL_OMNIBOX_POPUP_JS" file="resources\local_omnibox_p opup\local_omnibox_popup.js" type="BINDATA" />
145 <include name="IDR_LOCAL_OMNIBOX_POPUP_IMAGES_HISTORY_ICON_PNG" file="reso urces\local_omnibox_popup\images\history_icon.png" type="BINDATA" />
146 <include name="IDR_LOCAL_OMNIBOX_POPUP_IMAGES_PAGE_ICON_PNG" file="resourc es\local_omnibox_popup\images\page_icon.png" type="BINDATA" />
147 <include name="IDR_LOCAL_OMNIBOX_POPUP_IMAGES_SEARCH_ICON_PNG" file="resou rces\local_omnibox_popup\images\search_icon.png" type="BINDATA" />
148 <include name="IDR_LOCAL_OMNIBOX_POPUP_IMAGES_2X_HISTORY_ICON_PNG" file="r esources\local_omnibox_popup\images\2x\history_icon.png" type="BINDATA" />
149 <include name="IDR_LOCAL_OMNIBOX_POPUP_IMAGES_2X_PAGE_ICON_PNG" file="reso urces\local_omnibox_popup\images\2x\page_icon.png" type="BINDATA" />
150 <include name="IDR_LOCAL_OMNIBOX_POPUP_IMAGES_2X_SEARCH_ICON_PNG" file="re sources\local_omnibox_popup\images\2x\search_icon.png" type="BINDATA" />
151
141 <include name="IDR_OMNIBOX_HTML" file="resources\omnibox\omnibox.html" fla ttenhtml="true" allowexternalscript="true" type="BINDATA" /> 152 <include name="IDR_OMNIBOX_HTML" file="resources\omnibox\omnibox.html" fla ttenhtml="true" allowexternalscript="true" type="BINDATA" />
142 <include name="IDR_OMNIBOX_CSS" file="resources\omnibox\omnibox.css" type= "BINDATA" /> 153 <include name="IDR_OMNIBOX_CSS" file="resources\omnibox\omnibox.css" type= "BINDATA" />
143 <include name="IDR_OMNIBOX_JS" file="resources\omnibox\omnibox.js" type="B INDATA" /> 154 <include name="IDR_OMNIBOX_JS" file="resources\omnibox\omnibox.js" type="B INDATA" />
144 <if expr="not pp_ifdef('android')"> 155 <if expr="not pp_ifdef('android')">
145 <include name="IDR_PLUGINS_HTML" file="resources\plugins.html" flattenht ml="true" allowexternalscript="true" type="BINDATA" /> 156 <include name="IDR_PLUGINS_HTML" file="resources\plugins.html" flattenht ml="true" allowexternalscript="true" type="BINDATA" />
146 <include name="IDR_PLUGINS_JS" file="resources\plugins.js" type="BINDATA " /> 157 <include name="IDR_PLUGINS_JS" file="resources\plugins.js" type="BINDATA " />
147 </if> 158 </if>
148 <if expr="is_win"> 159 <if expr="is_win">
149 <include name="IDR_PLUGIN_DB_JSON" file="resources\plugin_metadata\plugi ns_win.json" type="BINDATA" /> 160 <include name="IDR_PLUGIN_DB_JSON" file="resources\plugin_metadata\plugi ns_win.json" type="BINDATA" />
150 </if> 161 </if>
(...skipping 142 matching lines...) Expand 10 before | Expand all | Expand 10 after
293 <include name="IDR_GESTURE_CONFIG_JS" file="resources\gesture_config.js" type="BINDATA" /> 304 <include name="IDR_GESTURE_CONFIG_JS" file="resources\gesture_config.js" type="BINDATA" />
294 </if> 305 </if>
295 <if expr="is_win"> 306 <if expr="is_win">
296 <include name="IDR_SET_AS_DEFAULT_BROWSER_JS" file="resources\set_as_def ault_browser.js" flattenhtml="true" type="BINDATA" /> 307 <include name="IDR_SET_AS_DEFAULT_BROWSER_JS" file="resources\set_as_def ault_browser.js" flattenhtml="true" type="BINDATA" />
297 <include name="IDR_SET_AS_DEFAULT_BROWSER_HTML" file="resources\set_as_d efault_browser.html" flattenhtml="true" allowexternalscript="true" type="BINDATA " /> 308 <include name="IDR_SET_AS_DEFAULT_BROWSER_HTML" file="resources\set_as_d efault_browser.html" flattenhtml="true" allowexternalscript="true" type="BINDATA " />
298 </if> 309 </if>
299 <include name="IDR_MANAGED_MODE_BLOCK_INTERSTITIAL_HTML" file="resources\m anaged_mode_block_interstitial.html" flattenhtml="true" type="BINDATA" /> 310 <include name="IDR_MANAGED_MODE_BLOCK_INTERSTITIAL_HTML" file="resources\m anaged_mode_block_interstitial.html" flattenhtml="true" type="BINDATA" />
300 </includes> 311 </includes>
301 </release> 312 </release>
302 </grit> 313 </grit>
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/instant/instant_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698