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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 178253008: Redoing Issue 36073011: Allowing file:/// in Instant Extended's Most Visited links. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Adding and using logNavigation(); updating tests; removing ping and the log.html page. Created 6 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | chrome/browser/resources/local_ntp/local_ntp.js » ('j') | chrome/browser/ui/search/search_ipc_router.cc » ('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 </outputs> 8 </outputs>
9 <release seq="1"> 9 <release seq="1">
10 <structures> 10 <structures>
(...skipping 188 matching lines...) Expand 10 before | Expand all | Expand 10 after
199 <include name="IDR_LOCAL_NTP_IMAGES_2X_LOGO_PNG" file="resources\local_ntp \images\2x\ntp_google_logo.png" type="BINDATA" /> 199 <include name="IDR_LOCAL_NTP_IMAGES_2X_LOGO_PNG" file="resources\local_ntp \images\2x\ntp_google_logo.png" type="BINDATA" />
200 <include name="IDR_LOCAL_NTP_IMAGES_2X_WHITE_LOGO_PNG" file="resources\loc al_ntp\images\2x\ntp_white_google_logo.png" type="BINDATA" /> 200 <include name="IDR_LOCAL_NTP_IMAGES_2X_WHITE_LOGO_PNG" file="resources\loc al_ntp\images\2x\ntp_white_google_logo.png" type="BINDATA" />
201 <include name="IDR_MOST_VISITED_IFRAME_CSS" file="resources\local_ntp\most _visited_iframe.css" type="BINDATA" /> 201 <include name="IDR_MOST_VISITED_IFRAME_CSS" file="resources\local_ntp\most _visited_iframe.css" type="BINDATA" />
202 <include name="IDR_MOST_VISITED_TITLE_HTML" file="resources\local_ntp\most _visited_title.html" type="BINDATA" /> 202 <include name="IDR_MOST_VISITED_TITLE_HTML" file="resources\local_ntp\most _visited_title.html" type="BINDATA" />
203 <include name="IDR_MOST_VISITED_TITLE_CSS" file="resources\local_ntp\most_ visited_title.css" type="BINDATA" /> 203 <include name="IDR_MOST_VISITED_TITLE_CSS" file="resources\local_ntp\most_ visited_title.css" type="BINDATA" />
204 <include name="IDR_MOST_VISITED_TITLE_JS" file="resources\local_ntp\most_v isited_title.js" type="BINDATA" /> 204 <include name="IDR_MOST_VISITED_TITLE_JS" file="resources\local_ntp\most_v isited_title.js" type="BINDATA" />
205 <include name="IDR_MOST_VISITED_THUMBNAIL_HTML" file="resources\local_ntp\ most_visited_thumbnail.html" type="BINDATA" /> 205 <include name="IDR_MOST_VISITED_THUMBNAIL_HTML" file="resources\local_ntp\ most_visited_thumbnail.html" type="BINDATA" />
206 <include name="IDR_MOST_VISITED_THUMBNAIL_CSS" file="resources\local_ntp\m ost_visited_thumbnail.css" type="BINDATA" /> 206 <include name="IDR_MOST_VISITED_THUMBNAIL_CSS" file="resources\local_ntp\m ost_visited_thumbnail.css" type="BINDATA" />
207 <include name="IDR_MOST_VISITED_THUMBNAIL_JS" file="resources\local_ntp\mo st_visited_thumbnail.js" type="BINDATA" /> 207 <include name="IDR_MOST_VISITED_THUMBNAIL_JS" file="resources\local_ntp\mo st_visited_thumbnail.js" type="BINDATA" />
208 <include name="IDR_MOST_VISITED_UTIL_JS" file="resources\local_ntp\most_vi sited_util.js" type="BINDATA" flattenhtml="true" /> 208 <include name="IDR_MOST_VISITED_UTIL_JS" file="resources\local_ntp\most_vi sited_util.js" type="BINDATA" flattenhtml="true" />
209 <include name="IDR_MOST_VISITED_WINDOW_DISPOSITION_UTIL_JS" file="resource s\local_ntp\window_disposition_util.js" type="BINDATA" />
209 210
210 <include name="IDR_OMNIBOX_HTML" file="resources\omnibox\omnibox.html" fla ttenhtml="true" allowexternalscript="true" type="BINDATA" /> 211 <include name="IDR_OMNIBOX_HTML" file="resources\omnibox\omnibox.html" fla ttenhtml="true" allowexternalscript="true" type="BINDATA" />
211 <include name="IDR_OMNIBOX_CSS" file="resources\omnibox\omnibox.css" type= "BINDATA" /> 212 <include name="IDR_OMNIBOX_CSS" file="resources\omnibox\omnibox.css" type= "BINDATA" />
212 <include name="IDR_OMNIBOX_JS" file="resources\omnibox\omnibox.js" type="B INDATA" /> 213 <include name="IDR_OMNIBOX_JS" file="resources\omnibox\omnibox.js" type="B INDATA" />
213 <if expr="not is_android"> 214 <if expr="not is_android">
214 <include name="IDR_PLUGINS_HTML" file="resources\plugins.html" flattenht ml="true" allowexternalscript="true" type="BINDATA" /> 215 <include name="IDR_PLUGINS_HTML" file="resources\plugins.html" flattenht ml="true" allowexternalscript="true" type="BINDATA" />
215 <include name="IDR_PLUGINS_JS" file="resources\plugins.js" type="BINDATA " /> 216 <include name="IDR_PLUGINS_JS" file="resources\plugins.js" type="BINDATA " />
216 </if> 217 </if>
217 <include name="IDR_COMPONENTS_HTML" file="resources\components.html" flatt enhtml="true" allowexternalscript="true" type="BINDATA" /> 218 <include name="IDR_COMPONENTS_HTML" file="resources\components.html" flatt enhtml="true" allowexternalscript="true" type="BINDATA" />
218 <include name="IDR_COMPONENTS_JS" file="resources\components.js" type="BIN DATA" /> 219 <include name="IDR_COMPONENTS_JS" file="resources\components.js" type="BIN DATA" />
(...skipping 203 matching lines...) Expand 10 before | Expand all | Expand 10 after
422 <include name="IDR_ABOUT_POWER_HTML" file="resources\chromeos\power.html " type="BINDATA" /> 423 <include name="IDR_ABOUT_POWER_HTML" file="resources\chromeos\power.html " type="BINDATA" />
423 <include name="IDR_ABOUT_POWER_JS" file="resources\chromeos\power.js" ty pe="BINDATA" /> 424 <include name="IDR_ABOUT_POWER_JS" file="resources\chromeos\power.js" ty pe="BINDATA" />
424 <include name="IDR_ABOUT_POWER_CSS" file="resources\chromeos\power.css" type="BINDATA" /> 425 <include name="IDR_ABOUT_POWER_CSS" file="resources\chromeos\power.css" type="BINDATA" />
425 </if> 426 </if>
426 <include name="IDR_GCM_INTERNALS_HTML" file="resources\gcm_internals.html" type="BINDATA" /> 427 <include name="IDR_GCM_INTERNALS_HTML" file="resources\gcm_internals.html" type="BINDATA" />
427 <include name="IDR_GCM_INTERNALS_CSS" file="resources\gcm_internals.css" t ype="BINDATA" /> 428 <include name="IDR_GCM_INTERNALS_CSS" file="resources\gcm_internals.css" t ype="BINDATA" />
428 <include name="IDR_GCM_INTERNALS_JS" file="resources\gcm_internals.js" typ e="BINDATA" /> 429 <include name="IDR_GCM_INTERNALS_JS" file="resources\gcm_internals.js" typ e="BINDATA" />
429 </includes> 430 </includes>
430 </release> 431 </release>
431 </grit> 432 </grit>
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/resources/local_ntp/local_ntp.js » ('j') | chrome/browser/ui/search/search_ipc_router.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698