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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 10820031: Modifications to performance monitor UI to address real webui. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Revised build config to mollify Android tryserver Created 8 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
« no previous file with comments | « no previous file | chrome/browser/resources/performance_monitor/chart.css » ('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 106 matching lines...) Expand 10 before | Expand all | Expand 10 after
117 <include name="IDR_HISTORY_HTML" file="resources\history\history.html" fla ttenhtml="true" allowexternalscript="true" type="BINDATA" /> 117 <include name="IDR_HISTORY_HTML" file="resources\history\history.html" fla ttenhtml="true" allowexternalscript="true" type="BINDATA" />
118 <include name="IDR_HISTORY_JS" file="resources\history\history.js" flatten html="true" type="BINDATA" /> 118 <include name="IDR_HISTORY_JS" file="resources\history\history.js" flatten html="true" type="BINDATA" />
119 <include name="IDR_INSPECT_CSS" file="resources\inspect\inspect.css" flatt enhtml="true" type="BINDATA" /> 119 <include name="IDR_INSPECT_CSS" file="resources\inspect\inspect.css" flatt enhtml="true" type="BINDATA" />
120 <include name="IDR_INSPECT_HTML" file="resources\inspect\inspect.html" fla ttenhtml="true" allowexternalscript="true" type="BINDATA" /> 120 <include name="IDR_INSPECT_HTML" file="resources\inspect\inspect.html" fla ttenhtml="true" allowexternalscript="true" type="BINDATA" />
121 <include name="IDR_INSPECT_JS" file="resources\inspect\inspect.js" flatten html="true" type="BINDATA" /> 121 <include name="IDR_INSPECT_JS" file="resources\inspect\inspect.js" flatten html="true" type="BINDATA" />
122 <include name="IDR_INSTANT_CSS" file="resources\instant\instant.css" flatt enhtml="true" type="BINDATA" /> 122 <include name="IDR_INSTANT_CSS" file="resources\instant\instant.css" flatt enhtml="true" type="BINDATA" />
123 <include name="IDR_INSTANT_HTML" file="resources\instant\instant.html" fla ttenhtml="true" allowexternalscript="true" type="BINDATA" /> 123 <include name="IDR_INSTANT_HTML" file="resources\instant\instant.html" fla ttenhtml="true" allowexternalscript="true" type="BINDATA" />
124 <include name="IDR_INSTANT_JS" file="resources\instant\instant.js" flatten html="true" type="BINDATA" /> 124 <include name="IDR_INSTANT_JS" file="resources\instant\instant.js" flatten html="true" type="BINDATA" />
125 <include name="IDR_MEDIA_INTERNALS_HTML" file="resources\media_internals.h tml" flattenhtml="true" allowexternalscript="true" type="BINDATA" /> 125 <include name="IDR_MEDIA_INTERNALS_HTML" file="resources\media_internals.h tml" flattenhtml="true" allowexternalscript="true" type="BINDATA" />
126 <include name="IDR_MEDIA_INTERNALS_JS" file="resources\media_internals\med ia_internals.js" flattenhtml="true" type="BINDATA" /> 126 <include name="IDR_MEDIA_INTERNALS_JS" file="resources\media_internals\med ia_internals.js" flattenhtml="true" type="BINDATA" />
127 <if expr="not pp_ifdef('android')">
128 <include name="IDR_PERFORMANCE_MONITOR_CHART_CSS" file="resources\perfor mance_monitor\chart.css" flattenhtml="true" type="BINDATA" />
129 <include name="IDR_PERFORMANCE_MONITOR_CHART_JS" file="resources\perform ance_monitor\chart.js" type="BINDATA" />
130 <include name="IDR_PERFORMANCE_MONITOR_HTML" file="resources\performance _monitor\chart.html" flattenhtml="true" allowexternalscript="true" type="BINDATA " />
131 <include name="IDR_PERFORMANCE_MONITOR_JQUERY_FLOT_JS" file="..\..\third _party\flot\jquery.flot.min.js" type="BINDATA" />
132 <include name="IDR_PERFORMANCE_MONITOR_JQUERY_JS" file="..\..\third_part y\flot\jquery.min.js" type="BINDATA" />
133 </if>
127 <include name="IDR_PREDICTORS_HTML" file="resources\predictors\predictors. html" flattenhtml="true" allowexternalscript="true" type="BINDATA" /> 134 <include name="IDR_PREDICTORS_HTML" file="resources\predictors\predictors. html" flattenhtml="true" allowexternalscript="true" type="BINDATA" />
128 <include name="IDR_PREDICTORS_JS" file="resources\predictors\predictors.js " flattenhtml="true" type="BINDATA" /> 135 <include name="IDR_PREDICTORS_JS" file="resources\predictors\predictors.js " flattenhtml="true" type="BINDATA" />
129 <if expr="not pp_ifdef('android')"> 136 <if expr="not pp_ifdef('android')">
130 <include name="IDR_NOTIFICATION_1LINE_HTML" file="resources\notification _1line.html" flattenhtml="true" type="BINDATA" /> 137 <include name="IDR_NOTIFICATION_1LINE_HTML" file="resources\notification _1line.html" flattenhtml="true" type="BINDATA" />
131 <include name="IDR_NOTIFICATION_2LINE_HTML" file="resources\notification _2line.html" flattenhtml="true" type="BINDATA" /> 138 <include name="IDR_NOTIFICATION_2LINE_HTML" file="resources\notification _2line.html" flattenhtml="true" type="BINDATA" />
132 <include name="IDR_NOTIFICATION_ICON_HTML" file="resources\notification_ icon.html" type="BINDATA" /> 139 <include name="IDR_NOTIFICATION_ICON_HTML" file="resources\notification_ icon.html" type="BINDATA" />
133 </if> 140 </if>
134 <include name="IDR_OMNIBOX_HTML" file="resources\omnibox\omnibox.html" fla ttenhtml="true" allowexternalscript="true" type="BINDATA" /> 141 <include name="IDR_OMNIBOX_HTML" file="resources\omnibox\omnibox.html" fla ttenhtml="true" allowexternalscript="true" type="BINDATA" />
135 <include name="IDR_OMNIBOX_CSS" file="resources\omnibox\omnibox.css" type= "BINDATA" /> 142 <include name="IDR_OMNIBOX_CSS" file="resources\omnibox\omnibox.css" type= "BINDATA" />
136 <include name="IDR_OMNIBOX_JS" file="resources\omnibox\omnibox.js" type="B INDATA" /> 143 <include name="IDR_OMNIBOX_JS" file="resources\omnibox\omnibox.js" type="B INDATA" />
(...skipping 132 matching lines...) Expand 10 before | Expand all | Expand 10 after
269 <include name="IDR_GESTURE_CONFIG_HTML" file="resources\gesture_config.h tml" type="BINDATA" /> 276 <include name="IDR_GESTURE_CONFIG_HTML" file="resources\gesture_config.h tml" type="BINDATA" />
270 <include name="IDR_GESTURE_CONFIG_JS" file="resources\gesture_config.js" type="BINDATA" /> 277 <include name="IDR_GESTURE_CONFIG_JS" file="resources\gesture_config.js" type="BINDATA" />
271 </if> 278 </if>
272 <if expr="is_win"> 279 <if expr="is_win">
273 <include name="IDR_SET_AS_DEFAULT_BROWSER_JS" file="resources\set_as_def ault_browser.js" flattenhtml="true" type="BINDATA" /> 280 <include name="IDR_SET_AS_DEFAULT_BROWSER_JS" file="resources\set_as_def ault_browser.js" flattenhtml="true" type="BINDATA" />
274 <include name="IDR_SET_AS_DEFAULT_BROWSER_HTML" file="resources\set_as_d efault_browser.html" flattenhtml="true" allowexternalscript="true" type="BINDATA " /> 281 <include name="IDR_SET_AS_DEFAULT_BROWSER_HTML" file="resources\set_as_d efault_browser.html" flattenhtml="true" allowexternalscript="true" type="BINDATA " />
275 </if> 282 </if>
276 </includes> 283 </includes>
277 </release> 284 </release>
278 </grit> 285 </grit>
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/resources/performance_monitor/chart.css » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698