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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 919183002: Move chromeos::device_event_log into components. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Shut down in PostDestroyThreads. Created 5 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
« no previous file with comments | « chrome/browser/DEPS ('k') | chrome/browser/chrome_browser_main.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 364 matching lines...) Expand 10 before | Expand all | Expand 10 after
375 <include name="IDR_SUPERVISED_USER_BLOCK_INTERSTITIAL_HTML" file="resource s\supervised_user_block_interstitial.html" flattenhtml="true" type="BINDATA" /> 375 <include name="IDR_SUPERVISED_USER_BLOCK_INTERSTITIAL_HTML" file="resource s\supervised_user_block_interstitial.html" flattenhtml="true" type="BINDATA" />
376 <include name="IDR_PROFILE_SIGNIN_CONFIRMATION_HTML" file="resources\profi le_signin_confirmation.html" type="BINDATA" /> 376 <include name="IDR_PROFILE_SIGNIN_CONFIRMATION_HTML" file="resources\profi le_signin_confirmation.html" type="BINDATA" />
377 <include name="IDR_PROFILE_SIGNIN_CONFIRMATION_JS" file="resources\profile _signin_confirmation.js" type="BINDATA" /> 377 <include name="IDR_PROFILE_SIGNIN_CONFIRMATION_JS" file="resources\profile _signin_confirmation.js" type="BINDATA" />
378 <include name="IDR_PROFILE_SIGNIN_CONFIRMATION_CSS" file="resources\profil e_signin_confirmation.css" type="BINDATA" /> 378 <include name="IDR_PROFILE_SIGNIN_CONFIRMATION_CSS" file="resources\profil e_signin_confirmation.css" type="BINDATA" />
379 <include name="IDR_RECENTLY_CLOSED_WINDOW" file="resources\ntp4\images\clo sed_window.png" type="BINDATA" /> 379 <include name="IDR_RECENTLY_CLOSED_WINDOW" file="resources\ntp4\images\clo sed_window.png" type="BINDATA" />
380 <if expr="not is_android"> 380 <if expr="not is_android">
381 <include name="IDR_IDENTITY_INTERNALS_HTML" file="resources\identity_int ernals.html" type="BINDATA" /> 381 <include name="IDR_IDENTITY_INTERNALS_HTML" file="resources\identity_int ernals.html" type="BINDATA" />
382 <include name="IDR_IDENTITY_INTERNALS_CSS" file="resources\identity_inte rnals.css" type="BINDATA" /> 382 <include name="IDR_IDENTITY_INTERNALS_CSS" file="resources\identity_inte rnals.css" type="BINDATA" />
383 <include name="IDR_IDENTITY_INTERNALS_JS" file="resources\identity_inter nals.js" type="BINDATA" /> 383 <include name="IDR_IDENTITY_INTERNALS_JS" file="resources\identity_inter nals.js" type="BINDATA" />
384 </if> 384 </if>
385 <include name="IDR_DEVICE_LOG_UI_HTML" file="resources\device_log_ui\devic e_log_ui.html" type="BINDATA" />
386 <include name="IDR_DEVICE_LOG_UI_JS" file="resources\device_log_ui\device_ log_ui.js" type="BINDATA" />
387 <include name="IDR_DEVICE_LOG_UI_CSS" file="resources\device_log_ui\device _log_ui.css" type="BINDATA" />
385 <if expr="chromeos"> 388 <if expr="chromeos">
386 <include name="IDR_DEVICE_LOG_UI_HTML" file="resources\chromeos\device_l og_ui\device_log_ui.html" type="BINDATA" />
387 <include name="IDR_DEVICE_LOG_UI_JS" file="resources\chromeos\device_log _ui\device_log_ui.js" type="BINDATA" />
388 <include name="IDR_DEVICE_LOG_UI_CSS" file="resources\chromeos\device_lo g_ui\device_log_ui.css" type="BINDATA" />
389 <include name="IDR_NETWORK_UI_HTML" file="resources\chromeos\network_ui\ network_ui.html" type="BINDATA" /> 389 <include name="IDR_NETWORK_UI_HTML" file="resources\chromeos\network_ui\ network_ui.html" type="BINDATA" />
390 <include name="IDR_NETWORK_UI_JS" file="resources\chromeos\network_ui\ne twork_ui.js" type="BINDATA" /> 390 <include name="IDR_NETWORK_UI_JS" file="resources\chromeos\network_ui\ne twork_ui.js" type="BINDATA" />
391 <include name="IDR_NETWORK_UI_CSS" file="resources\chromeos\network_ui\n etwork_ui.css" type="BINDATA" /> 391 <include name="IDR_NETWORK_UI_CSS" file="resources\chromeos\network_ui\n etwork_ui.css" type="BINDATA" />
392 </if> 392 </if>
393 <if expr="_google_chrome"> 393 <if expr="_google_chrome">
394 <include name="IDR_PREF_HASH_SEED_BIN" file="resources\settings_internal \pref_hash_seed.bin" type="BINDATA" /> 394 <include name="IDR_PREF_HASH_SEED_BIN" file="resources\settings_internal \pref_hash_seed.bin" type="BINDATA" />
395 <include name="IDR_AUTOMATIC_PROFILE_RESET_RULES" file="internal\resourc es\profile_reset\automatic_profile_reset_rules.dat" type="BINDATA" /> 395 <include name="IDR_AUTOMATIC_PROFILE_RESET_RULES" file="internal\resourc es\profile_reset\automatic_profile_reset_rules.dat" type="BINDATA" />
396 <include name="IDR_AUTOMATIC_PROFILE_RESET_RULES_DRY" file="internal\res ources\profile_reset\automatic_profile_reset_rules_dry.dat" type="BINDATA" /> 396 <include name="IDR_AUTOMATIC_PROFILE_RESET_RULES_DRY" file="internal\res ources\profile_reset\automatic_profile_reset_rules_dry.dat" type="BINDATA" />
397 <include name="IDR_AUTOMATIC_PROFILE_RESET_HASH_SEED" file="internal\res ources\profile_reset\automatic_profile_reset_rules.seed" type="BINDATA" /> 397 <include name="IDR_AUTOMATIC_PROFILE_RESET_HASH_SEED" file="internal\res ources\profile_reset\automatic_profile_reset_rules.seed" type="BINDATA" />
398 <include name="IDR_AUTOMATIC_PROFILE_RESET_HASH_SEED_DRY" file="internal \resources\profile_reset\automatic_profile_reset_rules_dry.seed" type="BINDATA" /> 398 <include name="IDR_AUTOMATIC_PROFILE_RESET_HASH_SEED_DRY" file="internal \resources\profile_reset\automatic_profile_reset_rules_dry.seed" type="BINDATA" />
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
442 <include name="IDR_MOZC_MANIFEST" file="resources\chromeos\input_metho d\mozc_manifest.json" type="BINDATA" /> 442 <include name="IDR_MOZC_MANIFEST" file="resources\chromeos\input_metho d\mozc_manifest.json" type="BINDATA" />
443 </if> 443 </if>
444 <include name="IDR_HANGUL_MANIFEST" file="resources\chromeos\input_metho d\hangul_manifest.json" type="BINDATA" /> 444 <include name="IDR_HANGUL_MANIFEST" file="resources\chromeos\input_metho d\hangul_manifest.json" type="BINDATA" />
445 <include name="IDR_BRAILLE_MANIFEST" file="resources\chromeos\braille_im e\manifest.json" type="BINDATA" /> 445 <include name="IDR_BRAILLE_MANIFEST" file="resources\chromeos\braille_im e\manifest.json" type="BINDATA" />
446 </if> 446 </if>
447 <include name="IDR_WHISPERNET_PROXY_MANIFEST" file="resources\whispernet_p roxy\manifest.json" type="BINDATA" /> 447 <include name="IDR_WHISPERNET_PROXY_MANIFEST" file="resources\whispernet_p roxy\manifest.json" type="BINDATA" />
448 <include name="IDR_MD_SETTINGS_UI_HTML" file="resources\md_settings\md_set tings.html" type="BINDATA" /> 448 <include name="IDR_MD_SETTINGS_UI_HTML" file="resources\md_settings\md_set tings.html" type="BINDATA" />
449 </includes> 449 </includes>
450 </release> 450 </release>
451 </grit> 451 </grit>
OLDNEW
« no previous file with comments | « chrome/browser/DEPS ('k') | chrome/browser/chrome_browser_main.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698