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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 8520016: Complete the rename from about:tracking2 --> about:profiler by changing the implementation code t... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: try synching again... Created 9 years, 1 month 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/metrics/tracking_synchronizer.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 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
86 <include name="IDR_NOTIFICATION_1LINE_HTML" file="resources\notification_1 line.html" flattenhtml="true" type="BINDATA" /> 86 <include name="IDR_NOTIFICATION_1LINE_HTML" file="resources\notification_1 line.html" flattenhtml="true" type="BINDATA" />
87 <include name="IDR_NOTIFICATION_2LINE_HTML" file="resources\notification_2 line.html" flattenhtml="true" type="BINDATA" /> 87 <include name="IDR_NOTIFICATION_2LINE_HTML" file="resources\notification_2 line.html" flattenhtml="true" type="BINDATA" />
88 <include name="IDR_NOTIFICATION_ICON_HTML" file="resources\notification_ic on.html" type="BINDATA" /> 88 <include name="IDR_NOTIFICATION_ICON_HTML" file="resources\notification_ic on.html" type="BINDATA" />
89 <include name="IDR_PLUGINS_HTML" file="resources\plugins.html" flattenhtml ="true" allowexternalscript="true" type="BINDATA" /> 89 <include name="IDR_PLUGINS_HTML" file="resources\plugins.html" flattenhtml ="true" allowexternalscript="true" type="BINDATA" />
90 <include name="IDR_PLUGINS_JS" file="resources\plugins.js" type="BINDATA" /> 90 <include name="IDR_PLUGINS_JS" file="resources\plugins.js" type="BINDATA" />
91 <include name="IDR_POLICY_CSS" file="resources\policy.css" type="BINDATA"/ > 91 <include name="IDR_POLICY_CSS" file="resources\policy.css" type="BINDATA"/ >
92 <include name="IDR_POLICY_HTML" file="resources\policy.html" flattenhtml=" true" allowexternalscript="true" type="BINDATA"/> 92 <include name="IDR_POLICY_HTML" file="resources\policy.html" flattenhtml=" true" allowexternalscript="true" type="BINDATA"/>
93 <include name="IDR_POLICY_JS" file="resources\policy.js" type="BINDATA"/> 93 <include name="IDR_POLICY_JS" file="resources\policy.js" type="BINDATA"/>
94 <include name="IDR_PRINT_PREVIEW_HTML" file="resources\print_preview\print _preview.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" /> 94 <include name="IDR_PRINT_PREVIEW_HTML" file="resources\print_preview\print _preview.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" />
95 <include name="IDR_PRINT_PREVIEW_JS" file="resources\print_preview\print_p review.js" flattenhtml="true" type="BINDATA" /> 95 <include name="IDR_PRINT_PREVIEW_JS" file="resources\print_preview\print_p review.js" flattenhtml="true" type="BINDATA" />
96 <include name="IDR_PROFILER_HTML" file="resources\profiler.html" flattenht ml="true" allowexternalscript="true" type="BINDATA" />
97 <include name="IDR_PROFILER_JS" file="resources\profiler.js" flattenhtml=" true" type="BINDATA" />
96 <include name="IDR_READER_OUT_OF_DATE_HTML" file="resources\reader_out_of_ date.html" flattenhtml="true" type="BINDATA" /> 98 <include name="IDR_READER_OUT_OF_DATE_HTML" file="resources\reader_out_of_ date.html" flattenhtml="true" type="BINDATA" />
97 <include name="IDR_SAFE_BROWSING_MALWARE_BLOCK" file="resources\safe_brows ing_malware_block.html" flattenhtml="true" type="BINDATA" /> 99 <include name="IDR_SAFE_BROWSING_MALWARE_BLOCK" file="resources\safe_brows ing_malware_block.html" flattenhtml="true" type="BINDATA" />
98 <include name="IDR_SAFE_BROWSING_MULTIPLE_THREAT_BLOCK" file="resources\sa fe_browsing_multiple_threat_block.html" flattenhtml="true" type="BINDATA" /> 100 <include name="IDR_SAFE_BROWSING_MULTIPLE_THREAT_BLOCK" file="resources\sa fe_browsing_multiple_threat_block.html" flattenhtml="true" type="BINDATA" />
99 <include name="IDR_SAFE_BROWSING_PHISHING_BLOCK" file="resources\safe_brow sing_phishing_block.html" flattenhtml="true" type="BINDATA" /> 101 <include name="IDR_SAFE_BROWSING_PHISHING_BLOCK" file="resources\safe_brow sing_phishing_block.html" flattenhtml="true" type="BINDATA" />
100 <include name="IDR_SESSIONS_HTML" file="resources\sessions.html" flattenht ml="true" allowexternalscript="true" type="BINDATA" /> 102 <include name="IDR_SESSIONS_HTML" file="resources\sessions.html" flattenht ml="true" allowexternalscript="true" type="BINDATA" />
101 <include name="IDR_SESSIONS_JS" file="resources\sessions.js" flattenhtml=" true" type="BINDATA" /> 103 <include name="IDR_SESSIONS_JS" file="resources\sessions.js" flattenhtml=" true" type="BINDATA" />
102 <include name="IDR_SSL_CLIENT_CERTIFICATE_SELECTOR_CSS" file="resources\ss l_client_certificate_selector.css" type="BINDATA" /> 104 <include name="IDR_SSL_CLIENT_CERTIFICATE_SELECTOR_CSS" file="resources\ss l_client_certificate_selector.css" type="BINDATA" />
103 <include name="IDR_SSL_CLIENT_CERTIFICATE_SELECTOR_HTML" file="resources\s sl_client_certificate_selector.html" flattenhtml="true" allowexternalscript="tru e" type="BINDATA" /> 105 <include name="IDR_SSL_CLIENT_CERTIFICATE_SELECTOR_HTML" file="resources\s sl_client_certificate_selector.html" flattenhtml="true" allowexternalscript="tru e" type="BINDATA" />
104 <include name="IDR_SSL_CLIENT_CERTIFICATE_SELECTOR_JS" file="resources\ssl _client_certificate_selector.js" type="BINDATA" /> 106 <include name="IDR_SSL_CLIENT_CERTIFICATE_SELECTOR_JS" file="resources\ssl _client_certificate_selector.js" type="BINDATA" />
105 <include name="IDR_SSL_ERROR_HTML" file="resources\ssl_error.html" flatten html="true" type="BINDATA" /> 107 <include name="IDR_SSL_ERROR_HTML" file="resources\ssl_error.html" flatten html="true" type="BINDATA" />
106 <include name="IDR_SSL_ROAD_BLOCK_HTML" file="resources\ssl_roadblock.html " flattenhtml="true" type="BINDATA" /> 108 <include name="IDR_SSL_ROAD_BLOCK_HTML" file="resources\ssl_roadblock.html " flattenhtml="true" type="BINDATA" />
107 <include name="IDR_SYNC_CONFIGURE_HTML" file="sync\resources\configure.htm l" flattenhtml="true" type="BINDATA" /> 109 <include name="IDR_SYNC_CONFIGURE_HTML" file="sync\resources\configure.htm l" flattenhtml="true" type="BINDATA" />
108 <include name="IDR_SYNC_PASSPHRASE_HTML" file="sync\resources\passphrase.h tml" flattenhtml="true" type="BINDATA" /> 110 <include name="IDR_SYNC_PASSPHRASE_HTML" file="sync\resources\passphrase.h tml" flattenhtml="true" type="BINDATA" />
109 <include name="IDR_SYNC_SETTING_UP_HTML" file="sync\resources\setting_up.h tml" flattenhtml="true" type="BINDATA" /> 111 <include name="IDR_SYNC_SETTING_UP_HTML" file="sync\resources\setting_up.h tml" flattenhtml="true" type="BINDATA" />
110 <include name="IDR_SYNC_SETUP_DONE_HTML" file="sync\resources\setup_done.h tml" flattenhtml="true" type="BINDATA" /> 112 <include name="IDR_SYNC_SETUP_DONE_HTML" file="sync\resources\setup_done.h tml" flattenhtml="true" type="BINDATA" />
111 <include name="IDR_SYNC_SETUP_FLOW_HTML" file="sync\resources\setup_flow.h tml" flattenhtml="true" type="BINDATA" /> 113 <include name="IDR_SYNC_SETUP_FLOW_HTML" file="sync\resources\setup_flow.h tml" flattenhtml="true" type="BINDATA" />
112 <include name="IDR_TASK_MANAGER_HTML" file="resources\task_manager\main.ht ml" flattenhtml="true" allowexternalscript="true" type="BINDATA" /> 114 <include name="IDR_TASK_MANAGER_HTML" file="resources\task_manager\main.ht ml" flattenhtml="true" allowexternalscript="true" type="BINDATA" />
113 <include name="IDR_TASK_MANAGER_INCLUDES_JS" file="resources\task_manager\ includes.js" type="BINDATA" /> 115 <include name="IDR_TASK_MANAGER_INCLUDES_JS" file="resources\task_manager\ includes.js" type="BINDATA" />
114 <include name="IDR_TASK_MANAGER_JS" file="resources\task_manager\main.js" type="BINDATA" /> 116 <include name="IDR_TASK_MANAGER_JS" file="resources\task_manager\main.js" type="BINDATA" />
115 <include name="IDR_TRACING_HTML" file="resources\tracing.html" flattenhtml ="true" allowexternalscript="true" type="BINDATA" /> 117 <include name="IDR_TRACING_HTML" file="resources\tracing.html" flattenhtml ="true" allowexternalscript="true" type="BINDATA" />
116 <include name="IDR_TRACING_JS" file="resources\tracing.js" flattenhtml="tr ue" type="BINDATA" /> 118 <include name="IDR_TRACING_JS" file="resources\tracing.js" flattenhtml="tr ue" type="BINDATA" />
117 <include name="IDR_TRACKING_HTML" file="resources\tracking.html" flattenht ml="true" allowexternalscript="true" type="BINDATA" />
118 <include name="IDR_TRACKING_JS" file="resources\tracking.js" flattenhtml=" true" type="BINDATA" />
119 <include name="IDR_TRANSLATE_JS" file="resources\translate.js" type="BINDA TA" /> 119 <include name="IDR_TRANSLATE_JS" file="resources\translate.js" type="BINDA TA" />
120 <include name="IDR_WEBSTORE_MANIFEST" file="resources\webstore_app\manifes t.json" type="BINDATA" /> 120 <include name="IDR_WEBSTORE_MANIFEST" file="resources\webstore_app\manifes t.json" type="BINDATA" />
121 <if expr="not pp_ifdef('chromeos')"> 121 <if expr="not pp_ifdef('chromeos')">
122 <include name="IDR_SYNC_PROMO_JS" file="resources\sync_promo.js" flatten html="true" type="BINDATA" /> 122 <include name="IDR_SYNC_PROMO_JS" file="resources\sync_promo.js" flatten html="true" type="BINDATA" />
123 <include name="IDR_SYNC_PROMO_HTML" file="resources\sync_promo.html" fla ttenhtml="true" allowexternalscript="true" type="BINDATA" /> 123 <include name="IDR_SYNC_PROMO_HTML" file="resources\sync_promo.html" fla ttenhtml="true" allowexternalscript="true" type="BINDATA" />
124 </if> 124 </if>
125 <if expr="pp_ifdef('chromeos')"> 125 <if expr="pp_ifdef('chromeos')">
126 <include name="IDR_ABOUT_SYS_HTML" file="resources\about_sys.html" flatt enhtml="true" type="BINDATA" /> 126 <include name="IDR_ABOUT_SYS_HTML" file="resources\about_sys.html" flatt enhtml="true" type="BINDATA" />
127 <include name="IDR_ACTIVE_DOWNLOADS_HTML" file="resources\active_downloa ds.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" /> 127 <include name="IDR_ACTIVE_DOWNLOADS_HTML" file="resources\active_downloa ds.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" />
128 <include name="IDR_ACTIVE_DOWNLOADS_JS" file="resources\active_downloads .js" type="BINDATA" /> 128 <include name="IDR_ACTIVE_DOWNLOADS_JS" file="resources\active_downloads .js" type="BINDATA" />
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
167 </if> 167 </if>
168 <if expr="pp_ifdef('chromeos') and pp_ifdef('_google_chrome')"> 168 <if expr="pp_ifdef('chromeos') and pp_ifdef('_google_chrome')">
169 <include name="IDR_HELP_MANIFEST" file="resources\help_app\manifest.json " type="BINDATA" /> 169 <include name="IDR_HELP_MANIFEST" file="resources\help_app\manifest.json " type="BINDATA" />
170 </if> 170 </if>
171 <if expr="pp_ifdef('is_macosx')"> 171 <if expr="pp_ifdef('is_macosx')">
172 <include name="IDR_NACL_SANDBOX_DEFINITION" file="nacl_loader.sb" type=" BINDATA" /> 172 <include name="IDR_NACL_SANDBOX_DEFINITION" file="nacl_loader.sb" type=" BINDATA" />
173 </if> 173 </if>
174 </includes> 174 </includes>
175 </release> 175 </release>
176 </grit> 176 </grit>
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/metrics/tracking_synchronizer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698