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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 17063004: Adding WebRTC log upload list under chrome://webrtc-logs (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 7 years, 5 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/browser/browser_about_handler.cc ('k') | chrome/browser/media/webrtc_log_upload_list.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 238 matching lines...) Expand 10 before | Expand all | Expand 10 after
249 <include name="IDR_FEEDBACK_HTML_INVALID" file="resources\feedback_invalid .html" allowexternalscript="true" flattenhtml="true" type="BINDATA" /> 249 <include name="IDR_FEEDBACK_HTML_INVALID" file="resources\feedback_invalid .html" allowexternalscript="true" flattenhtml="true" type="BINDATA" />
250 <include name="IDR_FEEDBACK_JS" file="resources\feedback.js" flattenhtml=" true" type="BINDATA" /> 250 <include name="IDR_FEEDBACK_JS" file="resources\feedback.js" flattenhtml=" true" type="BINDATA" />
251 <include name="IDR_UBER_HTML" file="resources\uber\uber.html" flattenhtml= "true" type="BINDATA" /> 251 <include name="IDR_UBER_HTML" file="resources\uber\uber.html" flattenhtml= "true" type="BINDATA" />
252 <include name="IDR_UBER_JS" file="resources\uber\uber.js" type="BINDATA" / > 252 <include name="IDR_UBER_JS" file="resources\uber\uber.js" type="BINDATA" / >
253 <include name="IDR_UBER_FRAME_HTML" file="resources\uber\uber_frame.html" flattenhtml="true" type="BINDATA" /> 253 <include name="IDR_UBER_FRAME_HTML" file="resources\uber\uber_frame.html" flattenhtml="true" type="BINDATA" />
254 <include name="IDR_UBER_FRAME_JS" file="resources\uber\uber_frame.js" flat tenhtml="true" type="BINDATA" /> 254 <include name="IDR_UBER_FRAME_JS" file="resources\uber\uber_frame.js" flat tenhtml="true" type="BINDATA" />
255 <include name="IDR_UBER_UTILS_JS" file="resources\uber\uber_utils.js" type ="BINDATA" /> 255 <include name="IDR_UBER_UTILS_JS" file="resources\uber\uber_utils.js" type ="BINDATA" />
256 <include name="IDR_USER_ACTIONS_HTML" file="resources\user_actions\user_ac tions.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" /> 256 <include name="IDR_USER_ACTIONS_HTML" file="resources\user_actions\user_ac tions.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" />
257 <include name="IDR_USER_ACTIONS_CSS" file="resources\user_actions\user_act ions.css" type="BINDATA" /> 257 <include name="IDR_USER_ACTIONS_CSS" file="resources\user_actions\user_act ions.css" type="BINDATA" />
258 <include name="IDR_USER_ACTIONS_JS" file="resources\user_actions\user_acti ons.js" type="BINDATA" /> 258 <include name="IDR_USER_ACTIONS_JS" file="resources\user_actions\user_acti ons.js" type="BINDATA" />
259 <if expr="pp_ifdef('enable_webrtc')">
260 <include name="IDR_WEBRTC_LOGS_HTML" file="resources\media\webrtc_logs.h tml" flattenhtml="true" allowexternalscript="true" type="BINDATA" />
261 <include name="IDR_WEBRTC_LOGS_JS" file="resources\media\webrtc_logs.js" type="BINDATA" />
262 </if>
259 <include name="IDR_WEBSTORE_MANIFEST" file="resources\webstore_app\manifes t.json" type="BINDATA" /> 263 <include name="IDR_WEBSTORE_MANIFEST" file="resources\webstore_app\manifes t.json" type="BINDATA" />
260 <if expr="pp_ifdef('use_ash')"> 264 <if expr="pp_ifdef('use_ash')">
261 <include name="IDR_TASK_MANAGER_HTML" file="resources\task_manager\main. html" flattenhtml="true" allowexternalscript="true" type="BINDATA" /> 265 <include name="IDR_TASK_MANAGER_HTML" file="resources\task_manager\main. html" flattenhtml="true" allowexternalscript="true" type="BINDATA" />
262 <include name="IDR_TASK_MANAGER_COMMANDS_JS" file="resources\task_manage r\commands.js" type="BINDATA" /> 266 <include name="IDR_TASK_MANAGER_COMMANDS_JS" file="resources\task_manage r\commands.js" type="BINDATA" />
263 <!-- The following defines.js uses flattenhtml feature to remove the pla tform-dependent code at compile-time. --> 267 <!-- The following defines.js uses flattenhtml feature to remove the pla tform-dependent code at compile-time. -->
264 <include name="IDR_TASK_MANAGER_DEFINES_JS" file="resources\task_manager \defines.js" flattenhtml="true" type="BINDATA" /> 268 <include name="IDR_TASK_MANAGER_DEFINES_JS" file="resources\task_manager \defines.js" flattenhtml="true" type="BINDATA" />
265 <include name="IDR_TASK_MANAGER_INCLUDES_JS" file="resources\task_manage r\includes.js" type="BINDATA" /> 269 <include name="IDR_TASK_MANAGER_INCLUDES_JS" file="resources\task_manage r\includes.js" type="BINDATA" />
266 <include name="IDR_TASK_MANAGER_PRELOAD_JS" file="resources\task_manager \preload.js" type="BINDATA" /> 270 <include name="IDR_TASK_MANAGER_PRELOAD_JS" file="resources\task_manager \preload.js" type="BINDATA" />
267 <!-- The following main.js uses flattenhtml feature to remove the platfo rm-dependent code at complie-time. --> 271 <!-- The following main.js uses flattenhtml feature to remove the platfo rm-dependent code at complie-time. -->
268 <include name="IDR_TASK_MANAGER_JS" file="resources\task_manager\main.js " flattenhtml="true" type="BINDATA" /> 272 <include name="IDR_TASK_MANAGER_JS" file="resources\task_manager\main.js " flattenhtml="true" type="BINDATA" />
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
354 358
355 <include name="IDR_RECENTLY_CLOSED_WINDOW" file="resources\ntp4\images\clo sed_window.png" type="BINDATA" /> 359 <include name="IDR_RECENTLY_CLOSED_WINDOW" file="resources\ntp4\images\clo sed_window.png" type="BINDATA" />
356 <if expr="not is_android"> 360 <if expr="not is_android">
357 <include name="IDR_IDENTITY_INTERNALS_HTML" file="resources\identity_int ernals.html" type="BINDATA" /> 361 <include name="IDR_IDENTITY_INTERNALS_HTML" file="resources\identity_int ernals.html" type="BINDATA" />
358 <include name="IDR_IDENTITY_INTERNALS_CSS" file="resources\identity_inte rnals.css" type="BINDATA" /> 362 <include name="IDR_IDENTITY_INTERNALS_CSS" file="resources\identity_inte rnals.css" type="BINDATA" />
359 <include name="IDR_IDENTITY_INTERNALS_JS" file="resources\identity_inter nals.js" type="BINDATA" /> 363 <include name="IDR_IDENTITY_INTERNALS_JS" file="resources\identity_inter nals.js" type="BINDATA" />
360 </if> 364 </if>
361 </includes> 365 </includes>
362 </release> 366 </release>
363 </grit> 367 </grit>
OLDNEW
« no previous file with comments | « chrome/browser/browser_about_handler.cc ('k') | chrome/browser/media/webrtc_log_upload_list.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698