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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 7555005: Moving the contents of chrome://gpu Profiling to chrome://tracing. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 9 years, 4 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/resources/gpu_internals.html » ('j') | chrome/browser/resources/tracing.html » ('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 <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 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
94 <include name="IDR_SSL_ROAD_BLOCK_HTML" file="resources\ssl_roadblock.html " flattenhtml="true" type="BINDATA" /> 94 <include name="IDR_SSL_ROAD_BLOCK_HTML" file="resources\ssl_roadblock.html " flattenhtml="true" type="BINDATA" />
95 <include name="IDR_SYNC_CONFIGURE_HTML" file="sync\resources\configure.htm l" flattenhtml="true" type="BINDATA" /> 95 <include name="IDR_SYNC_CONFIGURE_HTML" file="sync\resources\configure.htm l" flattenhtml="true" type="BINDATA" />
96 <include name="IDR_SYNC_PASSPHRASE_HTML" file="sync\resources\passphrase.h tml" flattenhtml="true" type="BINDATA" /> 96 <include name="IDR_SYNC_PASSPHRASE_HTML" file="sync\resources\passphrase.h tml" flattenhtml="true" type="BINDATA" />
97 <include name="IDR_SYNC_SETTING_UP_HTML" file="sync\resources\setting_up.h tml" flattenhtml="true" type="BINDATA" /> 97 <include name="IDR_SYNC_SETTING_UP_HTML" file="sync\resources\setting_up.h tml" flattenhtml="true" type="BINDATA" />
98 <include name="IDR_SYNC_SETUP_DONE_HTML" file="sync\resources\setup_done.h tml" flattenhtml="true" type="BINDATA" /> 98 <include name="IDR_SYNC_SETUP_DONE_HTML" file="sync\resources\setup_done.h tml" flattenhtml="true" type="BINDATA" />
99 <include name="IDR_SYNC_SETUP_FLOW_HTML" file="sync\resources\setup_flow.h tml" flattenhtml="true" type="BINDATA" /> 99 <include name="IDR_SYNC_SETUP_FLOW_HTML" file="sync\resources\setup_flow.h tml" flattenhtml="true" type="BINDATA" />
100 <include name="IDR_CLOUD_PRINT_SETUP_FLOW_HTML" file="printing\cloud_print \resources\cloud_print_setup_flow.html" flattenhtml="true" type="BINDATA" /> 100 <include name="IDR_CLOUD_PRINT_SETUP_FLOW_HTML" file="printing\cloud_print \resources\cloud_print_setup_flow.html" flattenhtml="true" type="BINDATA" />
101 <include name="IDR_CLOUD_PRINT_SETUP_LOGIN_HTML" file="printing\cloud_prin t\resources\cloud_print_setup_login.html" flattenhtml="true" type="BINDATA" /> 101 <include name="IDR_CLOUD_PRINT_SETUP_LOGIN_HTML" file="printing\cloud_prin t\resources\cloud_print_setup_login.html" flattenhtml="true" type="BINDATA" />
102 <include name="IDR_CLOUD_PRINT_SETUP_DONE_HTML" file="printing\cloud_print \resources\cloud_print_setup_done.html" flattenhtml="true" type="BINDATA" /> 102 <include name="IDR_CLOUD_PRINT_SETUP_DONE_HTML" file="printing\cloud_print \resources\cloud_print_setup_done.html" flattenhtml="true" type="BINDATA" />
103 <include name="IDR_TEXTFIELDS_HTML" file="resources\textfields.html" flatt enhtml="true" type="BINDATA" /> 103 <include name="IDR_TEXTFIELDS_HTML" file="resources\textfields.html" flatt enhtml="true" type="BINDATA" />
104 <include name="IDR_TRACING_HTML" file="resources\tracing.html" flattenhtml ="true" allowexternalscript="true" type="BINDATA" />
105 <include name="IDR_TRACING_JS" file="resources\tracing.js" flattenhtml="tr ue" type="BINDATA" />
104 <include name="IDR_TRANSLATE_JS" file="resources\translate.js" type="BINDA TA" /> 106 <include name="IDR_TRANSLATE_JS" file="resources\translate.js" type="BINDA TA" />
105 <include name="IDR_BUGREPORT_HTML" file="resources\bug_report.html" flatte nhtml="true" allowexternalscript="true" type="BINDATA" /> 107 <include name="IDR_BUGREPORT_HTML" file="resources\bug_report.html" flatte nhtml="true" allowexternalscript="true" type="BINDATA" />
106 <include name="IDR_BUGREPORT_HTML_INVALID" file="resources\bug_report_inva lid.html" allowexternalscript="true" flattenhtml="true" type="BINDATA" /> 108 <include name="IDR_BUGREPORT_HTML_INVALID" file="resources\bug_report_inva lid.html" allowexternalscript="true" flattenhtml="true" type="BINDATA" />
107 <include name="IDR_BUGREPORT_JS" file="resources\bug_report.js" flattenhtm l="true" type="BINDATA" /> 109 <include name="IDR_BUGREPORT_JS" file="resources\bug_report.js" flattenhtm l="true" type="BINDATA" />
108 <include name="IDR_WEBSTORE_MANIFEST" file="resources\webstore_app\manifes t.json" type="BINDATA" /> 110 <include name="IDR_WEBSTORE_MANIFEST" file="resources\webstore_app\manifes t.json" type="BINDATA" />
109 <include name="IDR_CLOUDPRINT_MANIFEST" file="resources\cloud_print_app\ma nifest.json" type="BINDATA" /> 111 <include name="IDR_CLOUDPRINT_MANIFEST" file="resources\cloud_print_app\ma nifest.json" type="BINDATA" />
110 <if expr="pp_ifdef('chromeos')"> 112 <if expr="pp_ifdef('chromeos')">
111 <include name="IDR_ABOUT_SYS_HTML" file="resources\about_sys.html" flatt enhtml="true" type="BINDATA" /> 113 <include name="IDR_ABOUT_SYS_HTML" file="resources\about_sys.html" flatt enhtml="true" type="BINDATA" />
112 <include name="IDR_CHOOSE_MOBILE_NETWORK_HTML" file="resources\chromeos\ choose_mobile_network.html" flattenhtml="true" type="BINDATA" /> 114 <include name="IDR_CHOOSE_MOBILE_NETWORK_HTML" file="resources\chromeos\ choose_mobile_network.html" flattenhtml="true" type="BINDATA" />
113 <include name="IDR_COLLECTED_COOKIES_HTML" file="resources\collected_coo kies.html" flattenhtml="true" type="BINDATA" /> 115 <include name="IDR_COLLECTED_COOKIES_HTML" file="resources\collected_coo kies.html" flattenhtml="true" type="BINDATA" />
(...skipping 27 matching lines...) Expand all
141 <include name="IDR_FILEMANAGER_MANIFEST" file="resources\file_manager\ma nifest.json" type="BINDATA" /> 143 <include name="IDR_FILEMANAGER_MANIFEST" file="resources\file_manager\ma nifest.json" type="BINDATA" />
142 <include name="IDR_GAIA_AUTH_MANIFEST" file="resources\gaia_auth\manifes t.json" type="BINDATA" /> 144 <include name="IDR_GAIA_AUTH_MANIFEST" file="resources\gaia_auth\manifes t.json" type="BINDATA" />
143 <include name="IDR_GAIA_TEST_AUTH_MANIFEST" file="resources\gaia_auth\ma nifest_test.json" type="BINDATA" /> 145 <include name="IDR_GAIA_TEST_AUTH_MANIFEST" file="resources\gaia_auth\ma nifest_test.json" type="BINDATA" />
144 </if> 146 </if>
145 <if expr="pp_ifdef('chromeos') and pp_ifdef('_google_chrome')"> 147 <if expr="pp_ifdef('chromeos') and pp_ifdef('_google_chrome')">
146 <include name="IDR_HELP_MANIFEST" file="resources\help_app\manifest.json " type="BINDATA" /> 148 <include name="IDR_HELP_MANIFEST" file="resources\help_app\manifest.json " type="BINDATA" />
147 </if> 149 </if>
148 </includes> 150 </includes>
149 </release> 151 </release>
150 </grit> 152 </grit>
OLDNEW
« no previous file with comments | « chrome/browser/browser_about_handler.cc ('k') | chrome/browser/resources/gpu_internals.html » ('j') | chrome/browser/resources/tracing.html » ('J')

Powered by Google App Engine
This is Rietveld 408576698