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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 12218118: Add a passphrase dialog for managed user accounts. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase to ToT. Created 7 years, 10 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/app/generated_resources.grd ('k') | chrome/browser/managed_mode/managed_user_service.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 297 matching lines...) Expand 10 before | Expand all | Expand 10 after
308 <if expr="pp_ifdef('use_ash')"> 308 <if expr="pp_ifdef('use_ash')">
309 <include name="IDR_GESTURE_CONFIG_CSS" file="resources\gesture_config.cs s" type="BINDATA" /> 309 <include name="IDR_GESTURE_CONFIG_CSS" file="resources\gesture_config.cs s" type="BINDATA" />
310 <include name="IDR_GESTURE_CONFIG_HTML" file="resources\gesture_config.h tml" type="BINDATA" /> 310 <include name="IDR_GESTURE_CONFIG_HTML" file="resources\gesture_config.h tml" type="BINDATA" />
311 <include name="IDR_GESTURE_CONFIG_JS" file="resources\gesture_config.js" type="BINDATA" /> 311 <include name="IDR_GESTURE_CONFIG_JS" file="resources\gesture_config.js" type="BINDATA" />
312 </if> 312 </if>
313 <if expr="is_win"> 313 <if expr="is_win">
314 <include name="IDR_SET_AS_DEFAULT_BROWSER_JS" file="resources\set_as_def ault_browser.js" flattenhtml="true" type="BINDATA" /> 314 <include name="IDR_SET_AS_DEFAULT_BROWSER_JS" file="resources\set_as_def ault_browser.js" flattenhtml="true" type="BINDATA" />
315 <include name="IDR_SET_AS_DEFAULT_BROWSER_HTML" file="resources\set_as_d efault_browser.html" flattenhtml="true" allowexternalscript="true" type="BINDATA " /> 315 <include name="IDR_SET_AS_DEFAULT_BROWSER_HTML" file="resources\set_as_d efault_browser.html" flattenhtml="true" allowexternalscript="true" type="BINDATA " />
316 </if> 316 </if>
317 <include name="IDR_MANAGED_MODE_BLOCK_INTERSTITIAL_HTML" file="resources\m anaged_mode_block_interstitial.html" flattenhtml="true" type="BINDATA" /> 317 <include name="IDR_MANAGED_MODE_BLOCK_INTERSTITIAL_HTML" file="resources\m anaged_mode_block_interstitial.html" flattenhtml="true" type="BINDATA" />
318 <include name="IDR_MANAGED_USER_PASSPHRASE_DIALOG_HTML" file="resources\ma naged_user_passphrase_dialog.html" allowexternalscript="true" type="chrome_html" />
319 <include name="IDR_MANAGED_USER_PASSPHRASE_DIALOG_JS" file="resources\mana ged_user_passphrase_dialog.js" type="BINDATA" />
320 <include name="IDR_MANAGED_USER_PASSPHRASE_DIALOG_CSS" file="resources\man aged_user_passphrase_dialog.css" type="BINDATA" />
321 <include name="IDR_MANAGED_USER_PASSPHRASE_DIALOG_IMG" file="resources\opt ions\managed_user.png" type="BINDATA" />
318 <include name="IDR_PROFILE_SIGNIN_CONFIRMATION_HTML" file="resources\profi le_signin_confirmation.html" type="BINDATA" /> 322 <include name="IDR_PROFILE_SIGNIN_CONFIRMATION_HTML" file="resources\profi le_signin_confirmation.html" type="BINDATA" />
319 <include name="IDR_PROFILE_SIGNIN_CONFIRMATION_JS" file="resources\profile _signin_confirmation.js" type="BINDATA" /> 323 <include name="IDR_PROFILE_SIGNIN_CONFIRMATION_JS" file="resources\profile _signin_confirmation.js" type="BINDATA" />
320 </includes> 324 </includes>
321 </release> 325 </release>
322 </grit> 326 </grit>
OLDNEW
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/managed_mode/managed_user_service.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698