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

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

Issue 10532005: Initial check-in of gesture config WebUI. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Removed debugging code and added comments. Created 8 years, 6 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
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 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
55 </if> 55 </if>
56 <include name="IDR_EXTENSION_LIST_JS" file="resources\extensions\extension _list.js" flattenhtml="true" type="BINDATA" /> 56 <include name="IDR_EXTENSION_LIST_JS" file="resources\extensions\extension _list.js" flattenhtml="true" type="BINDATA" />
57 <include name="IDR_EXTENSION_ACTIVITY_HTML" file="resources\extensions\ext ension_activity.html" flattenhtml="true" type="BINDATA" /> 57 <include name="IDR_EXTENSION_ACTIVITY_HTML" file="resources\extensions\ext ension_activity.html" flattenhtml="true" type="BINDATA" />
58 <include name="IDR_EXTENSION_ACTIVITY_JS" file="resources\extensions\exten sion_activity.js" flattenhtml="true" type="BINDATA" /> 58 <include name="IDR_EXTENSION_ACTIVITY_JS" file="resources\extensions\exten sion_activity.js" flattenhtml="true" type="BINDATA" />
59 <include name="IDR_EXTENSIONS_HTML" file="resources\extensions\extensions. html" flattenhtml="true" type="BINDATA" /> 59 <include name="IDR_EXTENSIONS_HTML" file="resources\extensions\extensions. html" flattenhtml="true" type="BINDATA" />
60 <include name="IDR_EXTENSIONS_JS" file="resources\extensions\extensions.js " flattenhtml="true" type="BINDATA" /> 60 <include name="IDR_EXTENSIONS_JS" file="resources\extensions\extensions.js " flattenhtml="true" type="BINDATA" />
61 <include name="IDR_FLAGS_HTML" file="resources\flags.html" flattenhtml="tr ue" type="BINDATA" /> 61 <include name="IDR_FLAGS_HTML" file="resources\flags.html" flattenhtml="tr ue" type="BINDATA" />
62 <include name="IDR_FLAGS_HTML_WARNING" file="resources\flags_warning.html" flattenhtml="true" type="BINDATA" /> 62 <include name="IDR_FLAGS_HTML_WARNING" file="resources\flags_warning.html" flattenhtml="true" type="BINDATA" />
63 <include name="IDR_FLAGS_JS" file="resources\flags.js" type="BINDATA" /> 63 <include name="IDR_FLAGS_JS" file="resources\flags.js" type="BINDATA" />
64 <include name="IDR_GAIA_LOGIN_HTML" file="sync\resources\gaia_login.html" flattenhtml="true" type="BINDATA" /> 64 <include name="IDR_GAIA_LOGIN_HTML" file="sync\resources\gaia_login.html" flattenhtml="true" type="BINDATA" />
65 <if expr="pp_ifdef('chromeos')">
66 <include name="IDR_GESTURE_CONFIG_HTML" file="resources\gesture_config.h tml" type="BINDATA" />
67 <include name="IDR_GESTURE_CONFIG_CSS" file="resources\gesture_config.cs s" type="BINDATA" />
68 <include name="IDR_GESTURE_CONFIG_JS" file="resources\gesture_config.js" type="BINDATA" />
flackr 2012/06/06 14:50:54 Can we put these in chrome/browser/resources/chrom
Kevin Greer 2012/06/07 19:07:00 This is not chromeos specific. I mistakenly put s
69 </if>
65 <include name="IDR_HELP_CSS" file="resources\help\help.css" flattenhtml="t rue" type="BINDATA" /> 70 <include name="IDR_HELP_CSS" file="resources\help\help.css" flattenhtml="t rue" type="BINDATA" />
66 <include name="IDR_HELP_HTML" file="resources\help\help.html" flattenhtml= "true" type="BINDATA" /> 71 <include name="IDR_HELP_HTML" file="resources\help\help.html" flattenhtml= "true" type="BINDATA" />
67 <include name="IDR_HELP_JS" file="resources\help\help.js" flattenhtml="tru e" type="BINDATA" /> 72 <include name="IDR_HELP_JS" file="resources\help\help.js" flattenhtml="tru e" type="BINDATA" />
68 <include name="IDR_GPU_BLACKLIST" file="resources\software_rendering_list\ software_rendering_list.json" type="BINDATA" /> 73 <include name="IDR_GPU_BLACKLIST" file="resources\software_rendering_list\ software_rendering_list.json" type="BINDATA" />
69 <include name="IDR_GPU_INTERNALS_HTML" file="resources\gpu_internals\gpu_i nternals.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" /> 74 <include name="IDR_GPU_INTERNALS_HTML" file="resources\gpu_internals\gpu_i nternals.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" />
70 <include name="IDR_GPU_INTERNALS_JS" file="resources\gpu_internals\gpu_int ernals.js" flattenhtml="true" type="BINDATA" /> 75 <include name="IDR_GPU_INTERNALS_JS" file="resources\gpu_internals\gpu_int ernals.js" flattenhtml="true" type="BINDATA" />
71 <include name="IDR_HISTORY_HTML" file="resources\history\history.html" fla ttenhtml="true" allowexternalscript="true" type="BINDATA" /> 76 <include name="IDR_HISTORY_HTML" file="resources\history\history.html" fla ttenhtml="true" allowexternalscript="true" type="BINDATA" />
72 <include name="IDR_HISTORY_JS" file="resources\history\history.js" flatten html="true" type="BINDATA" /> 77 <include name="IDR_HISTORY_JS" file="resources\history\history.js" flatten html="true" type="BINDATA" />
73 <include name="IDR_INCOGNITO_TAB_HTML" file="resources\incognito_tab.html" flattenhtml="true" type="BINDATA" /> 78 <include name="IDR_INCOGNITO_TAB_HTML" file="resources\incognito_tab.html" flattenhtml="true" type="BINDATA" />
74 <include name="IDR_INSPECT_CSS" file="resources\inspect\inspect.css" flatt enhtml="true" type="BINDATA" /> 79 <include name="IDR_INSPECT_CSS" file="resources\inspect\inspect.css" flatt enhtml="true" type="BINDATA" />
(...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after
187 <if expr="(is_linux and pp_ifdef('toolkit_views')) or pp_ifdef('use_aura') "> 192 <if expr="(is_linux and pp_ifdef('toolkit_views')) or pp_ifdef('use_aura') ">
188 <include name="IDR_HTTP_AUTH_HTML" file="resources\http_auth.html" flatt enhtml="true" type="BINDATA" /> 193 <include name="IDR_HTTP_AUTH_HTML" file="resources\http_auth.html" flatt enhtml="true" type="BINDATA" />
189 <include name="IDR_TAB_MODAL_CONFIRM_DIALOG_HTML" file="resources\tab_mo dal_confirm_dialog.html" flattenhtml="true" type="BINDATA" /> 194 <include name="IDR_TAB_MODAL_CONFIRM_DIALOG_HTML" file="resources\tab_mo dal_confirm_dialog.html" flattenhtml="true" type="BINDATA" />
190 </if> 195 </if>
191 <if expr="pp_ifdef('chromeos') and pp_ifdef('_google_chrome')"> 196 <if expr="pp_ifdef('chromeos') and pp_ifdef('_google_chrome')">
192 <include name="IDR_HELP_MANIFEST" file="resources\help_app\manifest.json " type="BINDATA" /> 197 <include name="IDR_HELP_MANIFEST" file="resources\help_app\manifest.json " type="BINDATA" />
193 </if> 198 </if>
194 </includes> 199 </includes>
195 </release> 200 </release>
196 </grit> 201 </grit>
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/resources/gesture_config.css » ('j') | chrome/browser/resources/gesture_config.css » ('J')

Powered by Google App Engine
This is Rietveld 408576698