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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 9358073: First version of the time slicing on the urls. Not ready for review yet. Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: added relative time to time slicing Created 8 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 | « chrome/app/generated_resources.grd ('k') | chrome/browser/extensions/extension_function_dispatcher.cc » ('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 89 matching lines...) Expand 10 before | Expand all | Expand 10 after
100 <include name="IDR_PRINT_PREVIEW_DUMMY_HTML" file="resources\print_preview \print_preview_dummy.html" flattenhtml="true" allowexternalscript="true" type="B INDATA" /> 100 <include name="IDR_PRINT_PREVIEW_DUMMY_HTML" file="resources\print_preview \print_preview_dummy.html" flattenhtml="true" allowexternalscript="true" type="B INDATA" />
101 <include name="IDR_PRINT_PREVIEW_DUMMY_JS" file="resources\print_preview\p rint_preview_dummy.js" flattenhtml="true" type="BINDATA" /> 101 <include name="IDR_PRINT_PREVIEW_DUMMY_JS" file="resources\print_preview\p rint_preview_dummy.js" flattenhtml="true" type="BINDATA" />
102 <include name="IDR_PRINT_PREVIEW_HTML" file="resources\print_preview\print _preview.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" /> 102 <include name="IDR_PRINT_PREVIEW_HTML" file="resources\print_preview\print _preview.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" />
103 <include name="IDR_PRINT_PREVIEW_JS" file="resources\print_preview\print_p review.js" flattenhtml="true" type="BINDATA" /> 103 <include name="IDR_PRINT_PREVIEW_JS" file="resources\print_preview\print_p review.js" flattenhtml="true" type="BINDATA" />
104 <include name="IDR_PROFILER_HTML" file="resources\profiler\profiler.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" /> 104 <include name="IDR_PROFILER_HTML" file="resources\profiler\profiler.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" />
105 <include name="IDR_PROFILER_JS" file="resources\profiler\profiler.js" flat tenhtml="true" type="BINDATA" /> 105 <include name="IDR_PROFILER_JS" file="resources\profiler\profiler.js" flat tenhtml="true" type="BINDATA" />
106 <include name="IDR_READER_OUT_OF_DATE_HTML" file="resources\reader_out_of_ date.html" flattenhtml="true" type="BINDATA" /> 106 <include name="IDR_READER_OUT_OF_DATE_HTML" file="resources\reader_out_of_ date.html" flattenhtml="true" type="BINDATA" />
107 <include name="IDR_SAFE_BROWSING_MALWARE_BLOCK" file="resources\safe_brows ing_malware_block.html" flattenhtml="true" type="BINDATA" /> 107 <include name="IDR_SAFE_BROWSING_MALWARE_BLOCK" file="resources\safe_brows ing_malware_block.html" flattenhtml="true" type="BINDATA" />
108 <include name="IDR_SAFE_BROWSING_MULTIPLE_THREAT_BLOCK" file="resources\sa fe_browsing_multiple_threat_block.html" flattenhtml="true" type="BINDATA" /> 108 <include name="IDR_SAFE_BROWSING_MULTIPLE_THREAT_BLOCK" file="resources\sa fe_browsing_multiple_threat_block.html" flattenhtml="true" type="BINDATA" />
109 <include name="IDR_SAFE_BROWSING_PHISHING_BLOCK" file="resources\safe_brow sing_phishing_block.html" flattenhtml="true" type="BINDATA" /> 109 <include name="IDR_SAFE_BROWSING_PHISHING_BLOCK" file="resources\safe_brow sing_phishing_block.html" flattenhtml="true" type="BINDATA" />
110 <include name="IDR_SUGGESTIONS_PAGE_CSS" file="resources\ntp4\suggestions_ page.css" type="BINDATA" />
111 <include name="IDR_SUGGESTIONS_PAGE_JS" file="resources\ntp4\suggestions_p age.js" type="BINDATA" />
110 <include name="IDR_SESSIONS_HTML" file="resources\sessions.html" flattenht ml="true" allowexternalscript="true" type="BINDATA" /> 112 <include name="IDR_SESSIONS_HTML" file="resources\sessions.html" flattenht ml="true" allowexternalscript="true" type="BINDATA" />
111 <include name="IDR_SESSIONS_JS" file="resources\sessions.js" flattenhtml=" true" type="BINDATA" /> 113 <include name="IDR_SESSIONS_JS" file="resources\sessions.js" flattenhtml=" true" type="BINDATA" />
112 <include name="IDR_SSL_ERROR_HTML" file="resources\ssl_error.html" flatten html="true" type="BINDATA" /> 114 <include name="IDR_SSL_ERROR_HTML" file="resources\ssl_error.html" flatten html="true" type="BINDATA" />
113 <include name="IDR_SSL_ROAD_BLOCK_HTML" file="resources\ssl_roadblock.html " flattenhtml="true" type="BINDATA" /> 115 <include name="IDR_SSL_ROAD_BLOCK_HTML" file="resources\ssl_roadblock.html " flattenhtml="true" type="BINDATA" />
114 <include name="IDR_TASK_MANAGER_HTML" file="resources\task_manager\main.ht ml" flattenhtml="true" allowexternalscript="true" type="BINDATA" /> 116 <include name="IDR_TASK_MANAGER_HTML" file="resources\task_manager\main.ht ml" flattenhtml="true" allowexternalscript="true" type="BINDATA" />
115 <include name="IDR_TASK_MANAGER_COMMANDS_JS" file="resources\task_manager\ commands.js" type="BINDATA" /> 117 <include name="IDR_TASK_MANAGER_COMMANDS_JS" file="resources\task_manager\ commands.js" type="BINDATA" />
116 <!-- The following defines.js uses flattenhtml feature to remove the platf orm-dependent code at complie-time. --> 118 <!-- The following defines.js uses flattenhtml feature to remove the platf orm-dependent code at complie-time. -->
117 <include name="IDR_TASK_MANAGER_DEFINES_JS" file="resources\task_manager\d efines.js" flattenhtml="true" type="BINDATA" /> 119 <include name="IDR_TASK_MANAGER_DEFINES_JS" file="resources\task_manager\d efines.js" flattenhtml="true" type="BINDATA" />
118 <include name="IDR_TASK_MANAGER_INCLUDES_JS" file="resources\task_manager\ includes.js" type="BINDATA" /> 120 <include name="IDR_TASK_MANAGER_INCLUDES_JS" file="resources\task_manager\ includes.js" type="BINDATA" />
119 <include name="IDR_TASK_MANAGER_PRELOAD_JS" file="resources\task_manager\p reload.js" type="BINDATA" /> 121 <include name="IDR_TASK_MANAGER_PRELOAD_JS" file="resources\task_manager\p reload.js" type="BINDATA" />
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
177 <if expr="(is_linux and pp_ifdef('toolkit_views')) or pp_ifdef('use_aura') "> 179 <if expr="(is_linux and pp_ifdef('toolkit_views')) or pp_ifdef('use_aura') ">
178 <include name="IDR_HTTP_AUTH_HTML" file="resources\http_auth.html" flatt enhtml="true" type="BINDATA" /> 180 <include name="IDR_HTTP_AUTH_HTML" file="resources\http_auth.html" flatt enhtml="true" type="BINDATA" />
179 <include name="IDR_TAB_MODAL_CONFIRM_DIALOG_HTML" file="resources\tab_mo dal_confirm_dialog.html" flattenhtml="true" type="BINDATA" /> 181 <include name="IDR_TAB_MODAL_CONFIRM_DIALOG_HTML" file="resources\tab_mo dal_confirm_dialog.html" flattenhtml="true" type="BINDATA" />
180 </if> 182 </if>
181 <if expr="pp_ifdef('chromeos') and pp_ifdef('_google_chrome')"> 183 <if expr="pp_ifdef('chromeos') and pp_ifdef('_google_chrome')">
182 <include name="IDR_HELP_MANIFEST" file="resources\help_app\manifest.json " type="BINDATA" /> 184 <include name="IDR_HELP_MANIFEST" file="resources\help_app\manifest.json " type="BINDATA" />
183 </if> 185 </if>
184 </includes> 186 </includes>
185 </release> 187 </release>
186 </grit> 188 </grit>
OLDNEW
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/extensions/extension_function_dispatcher.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698