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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 533183002: Revert "Eliminate all code related to the AutomaticProfileResetter." (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase. Created 6 years, 3 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
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/prefs/browser_prefs.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 </outputs> 8 </outputs>
9 <release seq="1"> 9 <release seq="1">
10 <structures> 10 <structures>
(...skipping 372 matching lines...) Expand 10 before | Expand all | Expand 10 after
383 <include name="IDR_IDENTITY_INTERNALS_CSS" file="resources\identity_inte rnals.css" type="BINDATA" /> 383 <include name="IDR_IDENTITY_INTERNALS_CSS" file="resources\identity_inte rnals.css" type="BINDATA" />
384 <include name="IDR_IDENTITY_INTERNALS_JS" file="resources\identity_inter nals.js" type="BINDATA" /> 384 <include name="IDR_IDENTITY_INTERNALS_JS" file="resources\identity_inter nals.js" type="BINDATA" />
385 </if> 385 </if>
386 <if expr="chromeos"> 386 <if expr="chromeos">
387 <include name="IDR_NETWORK_UI_HTML" file="resources\chromeos\network_ui\ network_ui.html" type="BINDATA" /> 387 <include name="IDR_NETWORK_UI_HTML" file="resources\chromeos\network_ui\ network_ui.html" type="BINDATA" />
388 <include name="IDR_NETWORK_UI_JS" file="resources\chromeos\network_ui\ne twork_ui.js" type="BINDATA" /> 388 <include name="IDR_NETWORK_UI_JS" file="resources\chromeos\network_ui\ne twork_ui.js" type="BINDATA" />
389 <include name="IDR_NETWORK_UI_CSS" file="resources\chromeos\network_ui\n etwork_ui.css" type="BINDATA" /> 389 <include name="IDR_NETWORK_UI_CSS" file="resources\chromeos\network_ui\n etwork_ui.css" type="BINDATA" />
390 </if> 390 </if>
391 <if expr="_google_chrome"> 391 <if expr="_google_chrome">
392 <include name="IDR_PREF_HASH_SEED_BIN" file="resources\settings_internal \pref_hash_seed.bin" type="BINDATA" /> 392 <include name="IDR_PREF_HASH_SEED_BIN" file="resources\settings_internal \pref_hash_seed.bin" type="BINDATA" />
393 <include name="IDR_AUTOMATIC_PROFILE_RESET_RULES" file="internal\resourc es\profile_reset\automatic_profile_reset_rules.dat" type="BINDATA" />
394 <include name="IDR_AUTOMATIC_PROFILE_RESET_RULES_DRY" file="internal\res ources\profile_reset\automatic_profile_reset_rules_dry.dat" type="BINDATA" />
395 <include name="IDR_AUTOMATIC_PROFILE_RESET_HASH_SEED" file="internal\res ources\profile_reset\automatic_profile_reset_rules.seed" type="BINDATA" />
396 <include name="IDR_AUTOMATIC_PROFILE_RESET_HASH_SEED_DRY" file="internal \resources\profile_reset\automatic_profile_reset_rules_dry.seed" type="BINDATA" />
393 <include name="IDR_ADDITIONAL_MODULE_IDS" file="${additional_modules_lis t_file}" use_base_dir="false" type="BINDATA" /> 397 <include name="IDR_ADDITIONAL_MODULE_IDS" file="${additional_modules_lis t_file}" use_base_dir="false" type="BINDATA" />
394 </if> 398 </if>
395 <if expr="chromeos"> 399 <if expr="chromeos">
396 <include name="IDR_SOUND_STARTUP_WAV" file="resources\chromeos\sounds\st artup.wav" type="BINDATA" /> 400 <include name="IDR_SOUND_STARTUP_WAV" file="resources\chromeos\sounds\st artup.wav" type="BINDATA" />
397 <include name="IDR_SOUND_STARTUP2_WAV" file="resources\chromeos\sounds\s tartup2.wav" type="BINDATA" /> 401 <include name="IDR_SOUND_STARTUP2_WAV" file="resources\chromeos\sounds\s tartup2.wav" type="BINDATA" />
398 <include name="IDR_SOUND_LOCK_WAV" file="resources\chromeos\sounds\lock. wav" type="BINDATA" /> 402 <include name="IDR_SOUND_LOCK_WAV" file="resources\chromeos\sounds\lock. wav" type="BINDATA" />
399 <include name="IDR_SOUND_UNLOCK_WAV" file="resources\chromeos\sounds\unl ock.wav" type="BINDATA" /> 403 <include name="IDR_SOUND_UNLOCK_WAV" file="resources\chromeos\sounds\unl ock.wav" type="BINDATA" />
400 <include name="IDR_SOUND_SHUTDOWN_WAV" file="resources\chromeos\sounds\s hutdown.wav" type="BINDATA" /> 404 <include name="IDR_SOUND_SHUTDOWN_WAV" file="resources\chromeos\sounds\s hutdown.wav" type="BINDATA" />
401 <include name="IDR_SOUND_SPOKEN_FEEDBACK_ENABLED_WAV" file="resources\ch romeos\sounds\spoken_feedback_enabled.wav" type="BINDATA" /> 405 <include name="IDR_SOUND_SPOKEN_FEEDBACK_ENABLED_WAV" file="resources\ch romeos\sounds\spoken_feedback_enabled.wav" type="BINDATA" />
402 <include name="IDR_SOUND_SPOKEN_FEEDBACK_DISABLED_WAV" file="resources\c hromeos\sounds\spoken_feedback_disabled.wav" type="BINDATA" /> 406 <include name="IDR_SOUND_SPOKEN_FEEDBACK_DISABLED_WAV" file="resources\c hromeos\sounds\spoken_feedback_disabled.wav" type="BINDATA" />
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
434 <include name="IDR_CANGJIE_MANIFEST" file="resources\chromeos\input_me thod\cangjie_manifest.json" type="BINDATA" /> 438 <include name="IDR_CANGJIE_MANIFEST" file="resources\chromeos\input_me thod\cangjie_manifest.json" type="BINDATA" />
435 <include name="IDR_MOZC_MANIFEST" file="resources\chromeos\input_metho d\mozc_manifest.json" type="BINDATA" /> 439 <include name="IDR_MOZC_MANIFEST" file="resources\chromeos\input_metho d\mozc_manifest.json" type="BINDATA" />
436 </if> 440 </if>
437 <include name="IDR_HANGUL_MANIFEST" file="resources\chromeos\input_metho d\hangul_manifest.json" type="BINDATA" /> 441 <include name="IDR_HANGUL_MANIFEST" file="resources\chromeos\input_metho d\hangul_manifest.json" type="BINDATA" />
438 <include name="IDR_BRAILLE_MANIFEST" file="resources\chromeos\braille_im e\manifest.json" type="BINDATA" /> 442 <include name="IDR_BRAILLE_MANIFEST" file="resources\chromeos\braille_im e\manifest.json" type="BINDATA" />
439 </if> 443 </if>
440 <include name="IDR_WHISPERNET_PROXY_MANIFEST" file="resources\whispernet_p roxy\manifest.json" type="BINDATA" /> 444 <include name="IDR_WHISPERNET_PROXY_MANIFEST" file="resources\whispernet_p roxy\manifest.json" type="BINDATA" />
441 </includes> 445 </includes>
442 </release> 446 </release>
443 </grit> 447 </grit>
OLDNEW
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/prefs/browser_prefs.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698