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

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

Issue 9265026: Implement restart on Idle for Kiosk Mode. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 11 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 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
65 <include name="IDR_GPU_INTERNALS_HTML" file="resources\gpu_internals\gpu_i nternals.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" /> 65 <include name="IDR_GPU_INTERNALS_HTML" file="resources\gpu_internals\gpu_i nternals.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" />
66 <include name="IDR_GPU_INTERNALS_JS" file="resources\gpu_internals\gpu_int ernals.js" flattenhtml="true" type="BINDATA" /> 66 <include name="IDR_GPU_INTERNALS_JS" file="resources\gpu_internals\gpu_int ernals.js" flattenhtml="true" type="BINDATA" />
67 <include name="IDR_HISTORY_HTML" file="resources\history.html" flattenhtml ="true" allowexternalscript="true" type="BINDATA" /> 67 <include name="IDR_HISTORY_HTML" file="resources\history.html" flattenhtml ="true" allowexternalscript="true" type="BINDATA" />
68 <include name="IDR_HISTORY_JS" file="resources\history.js" type="BINDATA" /> 68 <include name="IDR_HISTORY_JS" file="resources\history.js" type="BINDATA" />
69 <include name="IDR_HUNG_RENDERER_DIALOG_CSS" file="resources\hung_renderer _dialog.css" type="BINDATA" /> 69 <include name="IDR_HUNG_RENDERER_DIALOG_CSS" file="resources\hung_renderer _dialog.css" type="BINDATA" />
70 <include name="IDR_HUNG_RENDERER_DIALOG_HTML" file="resources\hung_rendere r_dialog.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" /> 70 <include name="IDR_HUNG_RENDERER_DIALOG_HTML" file="resources\hung_rendere r_dialog.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" />
71 <include name="IDR_HUNG_RENDERER_DIALOG_JS" file="resources\hung_renderer_ dialog.js" type="BINDATA" /> 71 <include name="IDR_HUNG_RENDERER_DIALOG_JS" file="resources\hung_renderer_ dialog.js" type="BINDATA" />
72 <include name="IDR_INCOGNITO_TAB_HTML" file="resources\incognito_tab.html" flattenhtml="true" type="BINDATA" /> 72 <include name="IDR_INCOGNITO_TAB_HTML" file="resources\incognito_tab.html" flattenhtml="true" type="BINDATA" />
73 <include name="IDR_INPUT_WINDOW_DIALOG_HTML" file="resources\input_window_ dialog.html" flattenhtml="true" type="BINDATA" /> 73 <include name="IDR_INPUT_WINDOW_DIALOG_HTML" file="resources\input_window_ dialog.html" flattenhtml="true" type="BINDATA" />
74 <include name="IDR_KEYBOARD_MANIFEST" file="resources\keyboard\manifest.js on" type="BINDATA" /> 74 <include name="IDR_KEYBOARD_MANIFEST" file="resources\keyboard\manifest.js on" type="BINDATA" />
75 <include name="IDR_KIOSK_MODE_LOGOUT_DIALOG_CSS" file="resources\kiosk_mod e_logout_dialog.css" type="BINDATA" />
76 <include name="IDR_KIOSK_MODE_LOGOUT_DIALOG_HTML" file="resources\kiosk_mo de_logout_dialog.html" flattenhtml="true" allowexternalscript="true" type="BINDA TA" />
xiyuan 2012/01/20 18:23:44 Prefer to let grit to flatten and inline the css a
rkc 2012/01/26 03:37:23 I've changed the way the JS is included to make su
xiyuan 2012/01/26 19:34:18 Think it's because you have allowexternalscript="t
77 <include name="IDR_KIOSK_MODE_LOGOUT_DIALOG_JS" file="resources\kiosk_mode _logout_dialog.js" type="BINDATA" />
75 <include name="IDR_MEDIA_INTERNALS_HTML" file="resources\media_internals.h tml" flattenhtml="true" allowexternalscript="true" type="BINDATA" /> 78 <include name="IDR_MEDIA_INTERNALS_HTML" file="resources\media_internals.h tml" flattenhtml="true" allowexternalscript="true" type="BINDATA" />
76 <include name="IDR_MEDIA_INTERNALS_JS" file="resources\media_internals\med ia_internals.js" flattenhtml="true" type="BINDATA" /> 79 <include name="IDR_MEDIA_INTERNALS_JS" file="resources\media_internals\med ia_internals.js" flattenhtml="true" type="BINDATA" />
77 <include name="IDR_NETWORK_ACTION_PREDICTOR_HTML" file="resources\network_ action_predictor\network_action_predictor.html" flattenhtml="true" allowexternal script="true" type="BINDATA" /> 80 <include name="IDR_NETWORK_ACTION_PREDICTOR_HTML" file="resources\network_ action_predictor\network_action_predictor.html" flattenhtml="true" allowexternal script="true" type="BINDATA" />
78 <include name="IDR_NETWORK_ACTION_PREDICTOR_JS" file="resources\network_ac tion_predictor\network_action_predictor.js" type="BINDATA" /> 81 <include name="IDR_NETWORK_ACTION_PREDICTOR_JS" file="resources\network_ac tion_predictor\network_action_predictor.js" type="BINDATA" />
79 <include name="IDR_NEW_INCOGNITO_TAB_THEME_CSS" file="resources\new_incogn ito_tab_theme.css" flattenhtml="true" type="BINDATA" /> 82 <include name="IDR_NEW_INCOGNITO_TAB_THEME_CSS" file="resources\new_incogn ito_tab_theme.css" flattenhtml="true" type="BINDATA" />
80 <include name="IDR_NEW_TAB_4_HTML" file="resources\ntp4\new_tab.html" flat tenhtml="true" type="BINDATA" /> 83 <include name="IDR_NEW_TAB_4_HTML" file="resources\ntp4\new_tab.html" flat tenhtml="true" type="BINDATA" />
81 <include name="IDR_NEW_TAB_4_THEME_CSS" file="resources\ntp4\new_tab_theme .css" flattenhtml="true" type="BINDATA" /> 84 <include name="IDR_NEW_TAB_4_THEME_CSS" file="resources\ntp4\new_tab_theme .css" flattenhtml="true" type="BINDATA" />
82 <include name="IDR_NOTIFICATION_1LINE_HTML" file="resources\notification_1 line.html" flattenhtml="true" type="BINDATA" /> 85 <include name="IDR_NOTIFICATION_1LINE_HTML" file="resources\notification_1 line.html" flattenhtml="true" type="BINDATA" />
83 <include name="IDR_NOTIFICATION_2LINE_HTML" file="resources\notification_2 line.html" flattenhtml="true" type="BINDATA" /> 86 <include name="IDR_NOTIFICATION_2LINE_HTML" file="resources\notification_2 line.html" flattenhtml="true" type="BINDATA" />
84 <include name="IDR_NOTIFICATION_ICON_HTML" file="resources\notification_ic on.html" type="BINDATA" /> 87 <include name="IDR_NOTIFICATION_ICON_HTML" file="resources\notification_ic on.html" type="BINDATA" />
(...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after
173 <include name="IDR_COLLECTED_COOKIES_HTML" file="resources\collected_coo kies.html" flattenhtml="true" type="BINDATA" /> 176 <include name="IDR_COLLECTED_COOKIES_HTML" file="resources\collected_coo kies.html" flattenhtml="true" type="BINDATA" />
174 <include name="IDR_HTTP_AUTH_HTML" file="resources\http_auth.html" flatt enhtml="true" type="BINDATA" /> 177 <include name="IDR_HTTP_AUTH_HTML" file="resources\http_auth.html" flatt enhtml="true" type="BINDATA" />
175 <include name="IDR_TAB_MODAL_CONFIRM_DIALOG_HTML" file="resources\tab_mo dal_confirm_dialog.html" flattenhtml="true" type="BINDATA" /> 178 <include name="IDR_TAB_MODAL_CONFIRM_DIALOG_HTML" file="resources\tab_mo dal_confirm_dialog.html" flattenhtml="true" type="BINDATA" />
176 </if> 179 </if>
177 <if expr="pp_ifdef('chromeos') and pp_ifdef('_google_chrome')"> 180 <if expr="pp_ifdef('chromeos') and pp_ifdef('_google_chrome')">
178 <include name="IDR_HELP_MANIFEST" file="resources\help_app\manifest.json " type="BINDATA" /> 181 <include name="IDR_HELP_MANIFEST" file="resources\help_app\manifest.json " type="BINDATA" />
179 </if> 182 </if>
180 </includes> 183 </includes>
181 </release> 184 </release>
182 </grit> 185 </grit>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698