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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 10416002: Seculative resource prefetching for URLs CL. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Resolving conflicts. Created 8 years, 6 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 | « chrome/browser/about_flags.cc ('k') | chrome/browser/net/resource_prefetch_predictor_observer.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 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
78 <include name="IDR_INCOGNITO_TAB_HTML" file="resources\incognito_tab.html" flattenhtml="true" type="BINDATA" /> 78 <include name="IDR_INCOGNITO_TAB_HTML" file="resources\incognito_tab.html" flattenhtml="true" type="BINDATA" />
79 <include name="IDR_INSPECT_CSS" file="resources\inspect\inspect.css" flatt enhtml="true" type="BINDATA" /> 79 <include name="IDR_INSPECT_CSS" file="resources\inspect\inspect.css" flatt enhtml="true" type="BINDATA" />
80 <include name="IDR_INSPECT_HTML" file="resources\inspect\inspect.html" fla ttenhtml="true" allowexternalscript="true" type="BINDATA" /> 80 <include name="IDR_INSPECT_HTML" file="resources\inspect\inspect.html" fla ttenhtml="true" allowexternalscript="true" type="BINDATA" />
81 <include name="IDR_INSPECT_JS" file="resources\inspect\inspect.js" flatten html="true" type="BINDATA" /> 81 <include name="IDR_INSPECT_JS" file="resources\inspect\inspect.js" flatten html="true" type="BINDATA" />
82 <include name="IDR_INSTANT_CSS" file="resources\instant\instant.css" flatt enhtml="true" type="BINDATA" /> 82 <include name="IDR_INSTANT_CSS" file="resources\instant\instant.css" flatt enhtml="true" type="BINDATA" />
83 <include name="IDR_INSTANT_HTML" file="resources\instant\instant.html" fla ttenhtml="true" allowexternalscript="true" type="BINDATA" /> 83 <include name="IDR_INSTANT_HTML" file="resources\instant\instant.html" fla ttenhtml="true" allowexternalscript="true" type="BINDATA" />
84 <include name="IDR_INSTANT_JS" file="resources\instant\instant.js" flatten html="true" type="BINDATA" /> 84 <include name="IDR_INSTANT_JS" file="resources\instant\instant.js" flatten html="true" type="BINDATA" />
85 <include name="IDR_MEDIA_INTERNALS_HTML" file="resources\media_internals.h tml" flattenhtml="true" allowexternalscript="true" type="BINDATA" /> 85 <include name="IDR_MEDIA_INTERNALS_HTML" file="resources\media_internals.h tml" flattenhtml="true" allowexternalscript="true" type="BINDATA" />
86 <include name="IDR_MEDIA_INTERNALS_JS" file="resources\media_internals\med ia_internals.js" flattenhtml="true" type="BINDATA" /> 86 <include name="IDR_MEDIA_INTERNALS_JS" file="resources\media_internals\med ia_internals.js" flattenhtml="true" type="BINDATA" />
87 <include name="IDR_PREDICTORS_HTML" file="resources\predictors\predictors. html" flattenhtml="true" allowexternalscript="true" type="BINDATA" /> 87 <include name="IDR_PREDICTORS_HTML" file="resources\predictors\predictors. html" flattenhtml="true" allowexternalscript="true" type="BINDATA" />
88 <include name="IDR_PREDICTORS_JS" file="resources\predictors\predictors.js " type="BINDATA" /> 88 <include name="IDR_PREDICTORS_JS" file="resources\predictors\predictors.js " flattenhtml="true" type="BINDATA" />
89 <include name="IDR_NEW_INCOGNITO_TAB_THEME_CSS" file="resources\new_incogn ito_tab_theme.css" flattenhtml="true" type="BINDATA" /> 89 <include name="IDR_NEW_INCOGNITO_TAB_THEME_CSS" file="resources\new_incogn ito_tab_theme.css" flattenhtml="true" type="BINDATA" />
90 <include name="IDR_NEW_TAB_4_HTML" file="resources\ntp4\new_tab.html" flat tenhtml="true" type="BINDATA" /> 90 <include name="IDR_NEW_TAB_4_HTML" file="resources\ntp4\new_tab.html" flat tenhtml="true" type="BINDATA" />
91 <include name="IDR_NEW_TAB_4_THEME_CSS" file="resources\ntp4\new_tab_theme .css" flattenhtml="true" type="BINDATA" /> 91 <include name="IDR_NEW_TAB_4_THEME_CSS" file="resources\ntp4\new_tab_theme .css" flattenhtml="true" type="BINDATA" />
92 <include name="IDR_NOTIFICATION_1LINE_HTML" file="resources\notification_1 line.html" flattenhtml="true" type="BINDATA" /> 92 <include name="IDR_NOTIFICATION_1LINE_HTML" file="resources\notification_1 line.html" flattenhtml="true" type="BINDATA" />
93 <include name="IDR_NOTIFICATION_2LINE_HTML" file="resources\notification_2 line.html" flattenhtml="true" type="BINDATA" /> 93 <include name="IDR_NOTIFICATION_2LINE_HTML" file="resources\notification_2 line.html" flattenhtml="true" type="BINDATA" />
94 <include name="IDR_NOTIFICATION_ICON_HTML" file="resources\notification_ic on.html" type="BINDATA" /> 94 <include name="IDR_NOTIFICATION_ICON_HTML" file="resources\notification_ic on.html" type="BINDATA" />
95 <include name="IDR_OMNIBOX_HTML" file="resources\omnibox\omnibox.html" fla ttenhtml="true" allowexternalscript="true" type="BINDATA" /> 95 <include name="IDR_OMNIBOX_HTML" file="resources\omnibox\omnibox.html" fla ttenhtml="true" allowexternalscript="true" type="BINDATA" />
96 <include name="IDR_OMNIBOX_CSS" file="resources\omnibox\omnibox.css" type= "BINDATA" /> 96 <include name="IDR_OMNIBOX_CSS" file="resources\omnibox\omnibox.css" type= "BINDATA" />
97 <include name="IDR_OMNIBOX_JS" file="resources\omnibox\omnibox.js" type="B INDATA" /> 97 <include name="IDR_OMNIBOX_JS" file="resources\omnibox\omnibox.js" type="B INDATA" />
98 <include name="IDR_PLUGINS_HTML" file="resources\plugins.html" flattenhtml ="true" allowexternalscript="true" type="BINDATA" /> 98 <include name="IDR_PLUGINS_HTML" file="resources\plugins.html" flattenhtml ="true" allowexternalscript="true" type="BINDATA" />
(...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after
220 <include name="IDR_GESTURE_CONFIG_HTML" file="resources\gesture_config.h tml" type="BINDATA" /> 220 <include name="IDR_GESTURE_CONFIG_HTML" file="resources\gesture_config.h tml" type="BINDATA" />
221 <include name="IDR_GESTURE_CONFIG_JS" file="resources\gesture_config.js" type="BINDATA" /> 221 <include name="IDR_GESTURE_CONFIG_JS" file="resources\gesture_config.js" type="BINDATA" />
222 </if> 222 </if>
223 <if expr="is_win"> 223 <if expr="is_win">
224 <include name="IDR_SET_AS_DEFAULT_BROWSER_JS" file="resources\set_as_def ault_browser.js" flattenhtml="true" type="BINDATA" /> 224 <include name="IDR_SET_AS_DEFAULT_BROWSER_JS" file="resources\set_as_def ault_browser.js" flattenhtml="true" type="BINDATA" />
225 <include name="IDR_SET_AS_DEFAULT_BROWSER_HTML" file="resources\set_as_d efault_browser.html" flattenhtml="true" allowexternalscript="true" type="BINDATA " /> 225 <include name="IDR_SET_AS_DEFAULT_BROWSER_HTML" file="resources\set_as_d efault_browser.html" flattenhtml="true" allowexternalscript="true" type="BINDATA " />
226 </if> 226 </if>
227 </includes> 227 </includes>
228 </release> 228 </release>
229 </grit> 229 </grit>
OLDNEW
« no previous file with comments | « chrome/browser/about_flags.cc ('k') | chrome/browser/net/resource_prefetch_predictor_observer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698