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

Issues Search
    My Issues | Starred     Open | Closed | All

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: Renamed kiosk->retail and incorporated review comments. 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
« no previous file with comments | « chrome/browser/about_flags.cc ('k') | chrome/browser/chromeos/chrome_browser_main_chromeos.cc » ('j') | chrome/browser/chromeos/retail_mode/retail_mode_screen_locker.h » ('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 144 matching lines...) Expand 10 before | Expand all | Expand 10 after
155 <include name="IDR_MENU_HTML" file="resources\chromeos\menu.html" flatte nhtml="true" type="BINDATA" /> 155 <include name="IDR_MENU_HTML" file="resources\chromeos\menu.html" flatte nhtml="true" type="BINDATA" />
156 <include name="IDR_MOBILE_MANIFEST" file="resources\chromeos\mobile_app\ manifest.json" type="BINDATA" /> 156 <include name="IDR_MOBILE_MANIFEST" file="resources\chromeos\mobile_app\ manifest.json" type="BINDATA" />
157 <include name="IDR_MOBILE_SETUP_PAGE_HTML" file="resources\chromeos\mobi le_setup.html" flattenhtml="true" type="BINDATA" /> 157 <include name="IDR_MOBILE_SETUP_PAGE_HTML" file="resources\chromeos\mobi le_setup.html" flattenhtml="true" type="BINDATA" />
158 <include name="IDR_NETWORK_MENU_CSS" file="resources\chromeos\network_me nu.css" flattenhtml="true" type="BINDATA" /> 158 <include name="IDR_NETWORK_MENU_CSS" file="resources\chromeos\network_me nu.css" flattenhtml="true" type="BINDATA" />
159 <include name="IDR_NETWORK_MENU_JS" file="resources\chromeos\network_men u.js" flattenhtml="true" type="BINDATA" /> 159 <include name="IDR_NETWORK_MENU_JS" file="resources\chromeos\network_men u.js" flattenhtml="true" type="BINDATA" />
160 <include name="IDR_NOTIFICATION_ICON_LINK_HTML" file="resources\chromeos \notification_icon_link.html" type="BINDATA" /> 160 <include name="IDR_NOTIFICATION_ICON_LINK_HTML" file="resources\chromeos \notification_icon_link.html" type="BINDATA" />
161 <include name="IDR_OFFLINE_LOAD_HTML" file="resources\chromeos\offline_l oad.html" flattenhtml="true" type="BINDATA" /> 161 <include name="IDR_OFFLINE_LOAD_HTML" file="resources\chromeos\offline_l oad.html" flattenhtml="true" type="BINDATA" />
162 <include name="IDR_OOBE_HTML" file="resources\chromeos\login\oobe.html" flattenhtml="true" type="BINDATA" /> 162 <include name="IDR_OOBE_HTML" file="resources\chromeos\login\oobe.html" flattenhtml="true" type="BINDATA" />
163 <include name="IDR_OS_CREDITS_HTML" file="resources\chromeos\about_os_cr edits.html" flattenhtml="true" type="BINDATA" /> 163 <include name="IDR_OS_CREDITS_HTML" file="resources\chromeos\about_os_cr edits.html" flattenhtml="true" type="BINDATA" />
164 <include name="IDR_PROXY_SETTINGS_HTML" file="resources\chromeos\proxy_s ettings.html" flattenhtml="true" type="BINDATA" /> 164 <include name="IDR_PROXY_SETTINGS_HTML" file="resources\chromeos\proxy_s ettings.html" flattenhtml="true" type="BINDATA" />
165 <include name="IDR_RETAIL_MODE_LOGOUT_DIALOG_CSS" file="resources\chrome os\retail_mode_logout_dialog.css" type="BINDATA" />
166 <include name="IDR_RETAIL_MODE_LOGOUT_DIALOG_HTML" file="resources\chrom eos\retail_mode_logout_dialog.html" flattenhtml="true" allowexternalscript="true " type="BINDATA" />
167 <include name="IDR_RETAIL_MODE_LOGOUT_DIALOG_JS" file="resources\chromeo s\retail_mode_logout_dialog.js" type="BINDATA" />
165 <include name="IDR_SIM_UNLOCK_HTML" file="resources\chromeos\sim_unlock. html" flattenhtml="true" type="BINDATA" /> 168 <include name="IDR_SIM_UNLOCK_HTML" file="resources\chromeos\sim_unlock. html" flattenhtml="true" type="BINDATA" />
166 <include name="IDR_WRENCH_MENU_CSS" file="resources\chromeos\wrench_menu .css" flattenhtml="true" type="BINDATA" /> 169 <include name="IDR_WRENCH_MENU_CSS" file="resources\chromeos\wrench_menu .css" flattenhtml="true" type="BINDATA" />
167 <include name="IDR_WRENCH_MENU_JS" file="resources\chromeos\wrench_menu. js" flattenhtml="true" type="BINDATA" /> 170 <include name="IDR_WRENCH_MENU_JS" file="resources\chromeos\wrench_menu. js" flattenhtml="true" type="BINDATA" />
168 </if> 171 </if>
169 <if expr="pp_ifdef('file_manager_extension')"> 172 <if expr="pp_ifdef('file_manager_extension')">
170 <include name="IDR_FILEMANAGER_MANIFEST" file="resources\file_manager\ma nifest.json" type="BINDATA" /> 173 <include name="IDR_FILEMANAGER_MANIFEST" file="resources\file_manager\ma nifest.json" type="BINDATA" />
171 </if> 174 </if>
172 <if expr="(is_linux and pp_ifdef('toolkit_views')) or pp_ifdef('use_aura') "> 175 <if expr="(is_linux and pp_ifdef('toolkit_views')) or pp_ifdef('use_aura') ">
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
« no previous file with comments | « chrome/browser/about_flags.cc ('k') | chrome/browser/chromeos/chrome_browser_main_chromeos.cc » ('j') | chrome/browser/chromeos/retail_mode/retail_mode_screen_locker.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698