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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 10703162: chromeos: Remove CryptohomeLibrary::TpmGetPassword and TpmIsReady (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: More localized variables Created 8 years, 5 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 | « no previous file | chrome/browser/chromeos/cros/cryptohome_library.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 161 matching lines...) Expand 10 before | Expand all | Expand 10 after
172 </if> 172 </if>
173 <if expr="not pp_ifdef('chromeos')"> 173 <if expr="not pp_ifdef('chromeos')">
174 <include name="IDR_SYNC_PROMO_JS" file="resources\sync_promo\sync_promo. js" flattenhtml="true" type="BINDATA" /> 174 <include name="IDR_SYNC_PROMO_JS" file="resources\sync_promo\sync_promo. js" flattenhtml="true" type="BINDATA" />
175 <include name="IDR_SYNC_PROMO_HTML" file="resources\sync_promo\sync_prom o.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" /> 175 <include name="IDR_SYNC_PROMO_HTML" file="resources\sync_promo\sync_prom o.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" />
176 </if> 176 </if>
177 <if expr="pp_ifdef('chromeos')"> 177 <if expr="pp_ifdef('chromeos')">
178 <include name="IDR_ABOUT_SYS_HTML" file="resources\chromeos\about_sys.ht ml" flattenhtml="true" type="BINDATA" /> 178 <include name="IDR_ABOUT_SYS_HTML" file="resources\chromeos\about_sys.ht ml" flattenhtml="true" type="BINDATA" />
179 <include name="IDR_CHOOSE_MOBILE_NETWORK_HTML" file="resources\chromeos\ choose_mobile_network.html" flattenhtml="true" allowexternalscript="true" type=" BINDATA" /> 179 <include name="IDR_CHOOSE_MOBILE_NETWORK_HTML" file="resources\chromeos\ choose_mobile_network.html" flattenhtml="true" allowexternalscript="true" type=" BINDATA" />
180 <include name="IDR_CHOOSE_MOBILE_NETWORK_JS" file="resources\chromeos\ch oose_mobile_network.js" type="BINDATA" /> 180 <include name="IDR_CHOOSE_MOBILE_NETWORK_JS" file="resources\chromeos\ch oose_mobile_network.js" type="BINDATA" />
181 <include name="IDR_CROSH_BUILTIN_MANIFEST" file="resources\chromeos\cros h_builtin\manifest.json" type="BINDATA" /> 181 <include name="IDR_CROSH_BUILTIN_MANIFEST" file="resources\chromeos\cros h_builtin\manifest.json" type="BINDATA" />
182 <include name="IDR_CRYPTOHOME_HTML" file="resources\chromeos\cryptohome. html" flattenhtml="true" type="BINDATA" />
183 <include name="IDR_CRYPTOHOME_JS" file="resources\chromeos\cryptohome.js " type="BINDATA" />
182 <!-- manifest file of ChromeVox accessibility extension --> 184 <!-- manifest file of ChromeVox accessibility extension -->
183 <include name="IDR_CHROMEVOX_MANIFEST" file="resources\chromeos\access_c hromevox\manifest.json" type="BINDATA" /> 185 <include name="IDR_CHROMEVOX_MANIFEST" file="resources\chromeos\access_c hromevox\manifest.json" type="BINDATA" />
184 <include name="IDR_GAIA_AUTH_MANIFEST" file="resources\gaia_auth\manifes t.json" type="BINDATA" /> 186 <include name="IDR_GAIA_AUTH_MANIFEST" file="resources\gaia_auth\manifes t.json" type="BINDATA" />
185 <include name="IDR_GAIA_TEST_AUTH_MANIFEST" file="resources\gaia_auth\ma nifest_test.json" type="BINDATA" /> 187 <include name="IDR_GAIA_TEST_AUTH_MANIFEST" file="resources\gaia_auth\ma nifest_test.json" type="BINDATA" />
186 <include name="IDR_GUEST_SESSION_TAB_HTML" file="resources\chromeos\gues t_session_tab.html" flattenhtml="true" type="BINDATA" /> 188 <include name="IDR_GUEST_SESSION_TAB_HTML" file="resources\chromeos\gues t_session_tab.html" flattenhtml="true" type="BINDATA" />
187 <include name="IDR_HOST_REGISTRATION_PAGE_HTML" file="resources\chromeos \host_registration_page.html" flattenhtml="true" type="BINDATA" /> 189 <include name="IDR_HOST_REGISTRATION_PAGE_HTML" file="resources\chromeos \host_registration_page.html" flattenhtml="true" type="BINDATA" />
188 <include name="IDR_IMAGEBURNER_HTML" file="resources\chromeos\image_burn er.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" /> 190 <include name="IDR_IMAGEBURNER_HTML" file="resources\chromeos\image_burn er.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" />
189 <include name="IDR_IMAGEBURNER_JS" file="resources\chromeos\image_burner .js" type="BINDATA" /> 191 <include name="IDR_IMAGEBURNER_JS" file="resources\chromeos\image_burner .js" type="BINDATA" />
190 <include name="IDR_KEYBOARD_OVERLAY_CSS" file="resources\chromeos\keyboa rd_overlay.css" flattenhtml="true" type="BINDATA" /> 192 <include name="IDR_KEYBOARD_OVERLAY_CSS" file="resources\chromeos\keyboa rd_overlay.css" flattenhtml="true" type="BINDATA" />
191 <include name="IDR_KEYBOARD_OVERLAY_HTML" file="resources\chromeos\keybo ard_overlay.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" / > 193 <include name="IDR_KEYBOARD_OVERLAY_HTML" file="resources\chromeos\keybo ard_overlay.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" / >
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
225 <include name="IDR_GESTURE_CONFIG_HTML" file="resources\gesture_config.h tml" type="BINDATA" /> 227 <include name="IDR_GESTURE_CONFIG_HTML" file="resources\gesture_config.h tml" type="BINDATA" />
226 <include name="IDR_GESTURE_CONFIG_JS" file="resources\gesture_config.js" type="BINDATA" /> 228 <include name="IDR_GESTURE_CONFIG_JS" file="resources\gesture_config.js" type="BINDATA" />
227 </if> 229 </if>
228 <if expr="is_win"> 230 <if expr="is_win">
229 <include name="IDR_SET_AS_DEFAULT_BROWSER_JS" file="resources\set_as_def ault_browser.js" flattenhtml="true" type="BINDATA" /> 231 <include name="IDR_SET_AS_DEFAULT_BROWSER_JS" file="resources\set_as_def ault_browser.js" flattenhtml="true" type="BINDATA" />
230 <include name="IDR_SET_AS_DEFAULT_BROWSER_HTML" file="resources\set_as_d efault_browser.html" flattenhtml="true" allowexternalscript="true" type="BINDATA " /> 232 <include name="IDR_SET_AS_DEFAULT_BROWSER_HTML" file="resources\set_as_d efault_browser.html" flattenhtml="true" allowexternalscript="true" type="BINDATA " />
231 </if> 233 </if>
232 </includes> 234 </includes>
233 </release> 235 </release>
234 </grit> 236 </grit>
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/chromeos/cros/cryptohome_library.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698