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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 12330137: Allow normal users to change per session flags. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix include for a moved file. Created 7 years, 9 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/chromeos/login/login_utils.cc » ('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 97 matching lines...) Expand 10 before | Expand all | Expand 10 after
108 <if expr="not pp_ifdef('android')"> 108 <if expr="not pp_ifdef('android')">
109 <include name="IDR_EXTENSION_LIST_JS" file="resources\extensions\extensi on_list.js" flattenhtml="true" type="BINDATA" /> 109 <include name="IDR_EXTENSION_LIST_JS" file="resources\extensions\extensi on_list.js" flattenhtml="true" type="BINDATA" />
110 <include name="IDR_EXTENSION_ACTIVITY_HTML" file="resources\extensions\e xtension_activity.html" flattenhtml="true" type="BINDATA" /> 110 <include name="IDR_EXTENSION_ACTIVITY_HTML" file="resources\extensions\e xtension_activity.html" flattenhtml="true" type="BINDATA" />
111 <include name="IDR_EXTENSION_ACTIVITY_JS" file="resources\extensions\ext ension_activity.js" flattenhtml="true" type="BINDATA" /> 111 <include name="IDR_EXTENSION_ACTIVITY_JS" file="resources\extensions\ext ension_activity.js" flattenhtml="true" type="BINDATA" />
112 <include name="IDR_EXTENSION_INFO_CSS" file="resources\extensions\extens ion_info.css" flattenhtml="true" type="BINDATA" /> 112 <include name="IDR_EXTENSION_INFO_CSS" file="resources\extensions\extens ion_info.css" flattenhtml="true" type="BINDATA" />
113 <include name="IDR_EXTENSION_INFO_HTML" file="resources\extensions\exten sion_info.html" flattenhtml="true" type="BINDATA" /> 113 <include name="IDR_EXTENSION_INFO_HTML" file="resources\extensions\exten sion_info.html" flattenhtml="true" type="BINDATA" />
114 <include name="IDR_EXTENSION_INFO_JS" file="resources\extensions\extensi on_info.js" flattenhtml="true" type="BINDATA" /> 114 <include name="IDR_EXTENSION_INFO_JS" file="resources\extensions\extensi on_info.js" flattenhtml="true" type="BINDATA" />
115 <include name="IDR_EXTENSIONS_JS" file="resources\extensions\extensions. js" flattenhtml="true" type="BINDATA" /> 115 <include name="IDR_EXTENSIONS_JS" file="resources\extensions\extensions. js" flattenhtml="true" type="BINDATA" />
116 </if> 116 </if>
117 <include name="IDR_FLAGS_HTML" file="resources\flags.html" flattenhtml="tr ue" type="BINDATA" /> 117 <include name="IDR_FLAGS_HTML" file="resources\flags.html" flattenhtml="tr ue" type="BINDATA" />
118 <include name="IDR_FLAGS_HTML_WARNING" file="resources\flags_warning.html" flattenhtml="true" type="BINDATA" />
119 <include name="IDR_FLAGS_JS" file="resources\flags.js" type="BINDATA" /> 118 <include name="IDR_FLAGS_JS" file="resources\flags.js" type="BINDATA" />
120 <if expr="not pp_ifdef('android')"> 119 <if expr="not pp_ifdef('android')">
121 <include name="IDR_GAIA_LOGIN_HTML" file="sync\resources\gaia_login.html " flattenhtml="true" type="BINDATA" /> 120 <include name="IDR_GAIA_LOGIN_HTML" file="sync\resources\gaia_login.html " flattenhtml="true" type="BINDATA" />
122 </if> 121 </if>
123 <include name="IDR_HELP_JS" file="resources\help\help.js" flattenhtml="tru e" type="BINDATA" /> 122 <include name="IDR_HELP_JS" file="resources\help\help.js" flattenhtml="tru e" type="BINDATA" />
124 <include name="IDR_HISTORY_HTML" file="resources\history\history.html" fla ttenhtml="true" allowexternalscript="true" type="BINDATA" /> 123 <include name="IDR_HISTORY_HTML" file="resources\history\history.html" fla ttenhtml="true" allowexternalscript="true" type="BINDATA" />
125 <include name="IDR_HISTORY_JS" file="resources\history\history.js" flatten html="true" type="BINDATA" /> 124 <include name="IDR_HISTORY_JS" file="resources\history\history.js" flatten html="true" type="BINDATA" />
126 <include name="IDR_INSPECT_CSS" file="resources\inspect\inspect.css" flatt enhtml="true" type="BINDATA" /> 125 <include name="IDR_INSPECT_CSS" file="resources\inspect\inspect.css" flatt enhtml="true" type="BINDATA" />
127 <include name="IDR_INSPECT_HTML" file="resources\inspect\inspect.html" fla ttenhtml="true" allowexternalscript="true" type="BINDATA" /> 126 <include name="IDR_INSPECT_HTML" file="resources\inspect\inspect.html" fla ttenhtml="true" allowexternalscript="true" type="BINDATA" />
128 <include name="IDR_INSPECT_JS" file="resources\inspect\inspect.js" flatten html="true" type="BINDATA" /> 127 <include name="IDR_INSPECT_JS" file="resources\inspect\inspect.js" flatten html="true" type="BINDATA" />
(...skipping 192 matching lines...) Expand 10 before | Expand all | Expand 10 after
321 <include name="IDR_SET_AS_DEFAULT_BROWSER_JS" file="resources\set_as_def ault_browser.js" flattenhtml="true" type="BINDATA" /> 320 <include name="IDR_SET_AS_DEFAULT_BROWSER_JS" file="resources\set_as_def ault_browser.js" flattenhtml="true" type="BINDATA" />
322 <include name="IDR_SET_AS_DEFAULT_BROWSER_HTML" file="resources\set_as_d efault_browser.html" flattenhtml="true" allowexternalscript="true" type="BINDATA " /> 321 <include name="IDR_SET_AS_DEFAULT_BROWSER_HTML" file="resources\set_as_d efault_browser.html" flattenhtml="true" allowexternalscript="true" type="BINDATA " />
323 </if> 322 </if>
324 <include name="IDR_MANAGED_MODE_BLOCK_INTERSTITIAL_HTML" file="resources\m anaged_mode_block_interstitial.html" flattenhtml="true" type="BINDATA" /> 323 <include name="IDR_MANAGED_MODE_BLOCK_INTERSTITIAL_HTML" file="resources\m anaged_mode_block_interstitial.html" flattenhtml="true" type="BINDATA" />
325 <include name="IDR_MANAGED_USER_PASSPHRASE_DIALOG_JS" file="resources\mana ged_user_passphrase_dialog.js" type="BINDATA" /> 324 <include name="IDR_MANAGED_USER_PASSPHRASE_DIALOG_JS" file="resources\mana ged_user_passphrase_dialog.js" type="BINDATA" />
326 <include name="IDR_PROFILE_SIGNIN_CONFIRMATION_HTML" file="resources\profi le_signin_confirmation.html" type="BINDATA" /> 325 <include name="IDR_PROFILE_SIGNIN_CONFIRMATION_HTML" file="resources\profi le_signin_confirmation.html" type="BINDATA" />
327 <include name="IDR_PROFILE_SIGNIN_CONFIRMATION_JS" file="resources\profile _signin_confirmation.js" type="BINDATA" /> 326 <include name="IDR_PROFILE_SIGNIN_CONFIRMATION_JS" file="resources\profile _signin_confirmation.js" type="BINDATA" />
328 </includes> 327 </includes>
329 </release> 328 </release>
330 </grit> 329 </grit>
OLDNEW
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/chromeos/login/login_utils.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698