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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 260083007: Replace chrome://network implementation with networkConfig API (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 7 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/resources/chromeos/network.css » ('j') | chrome/browser/resources/chromeos/network/network_config.js » ('J')
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 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
65 <structure name="IDR_NEW_TAB_ANDROID_HTML" file="resources\ntp_android\n ew_tab.html" flattenhtml="true" type="chrome_html" /> 65 <structure name="IDR_NEW_TAB_ANDROID_HTML" file="resources\ntp_android\n ew_tab.html" flattenhtml="true" type="chrome_html" />
66 </if> 66 </if>
67 <if expr="chromeos"> 67 <if expr="chromeos">
68 <structure name="IDR_OOBE_HTML" file="resources\chromeos\login\oobe.html " flattenhtml="true" type="chrome_html" variables="OOBE=oobe" expand_variables=" true"/> 68 <structure name="IDR_OOBE_HTML" file="resources\chromeos\login\oobe.html " flattenhtml="true" type="chrome_html" variables="OOBE=oobe" expand_variables=" true"/>
69 <structure name="IDR_OOBE_JS" file="resources\chromeos\login\oobe.js" fl attenhtml="true" type="chrome_html" /> 69 <structure name="IDR_OOBE_JS" file="resources\chromeos\login\oobe.js" fl attenhtml="true" type="chrome_html" />
70 <structure name="IDR_OOBE_RESOURCE_LOADER_JS" file="resources\login\reso urce_loader.js" flattenhtml="true" type="chrome_html" /> 70 <structure name="IDR_OOBE_RESOURCE_LOADER_JS" file="resources\login\reso urce_loader.js" flattenhtml="true" type="chrome_html" />
71 <structure name="IDR_OOBE_ENROLLMENT_HTML" file="resources\chromeos\logi n\oobe_screen_oauth_enrollment.html" flattenhtml="true" type="chrome_html" /> 71 <structure name="IDR_OOBE_ENROLLMENT_HTML" file="resources\chromeos\logi n\oobe_screen_oauth_enrollment.html" flattenhtml="true" type="chrome_html" />
72 <structure name="IDR_OOBE_ENROLLMENT_CSS" file="resources\chromeos\login \oobe_screen_oauth_enrollment.css" flattenhtml="true" type="chrome_html" /> 72 <structure name="IDR_OOBE_ENROLLMENT_CSS" file="resources\chromeos\login \oobe_screen_oauth_enrollment.css" flattenhtml="true" type="chrome_html" />
73 <structure name="IDR_OOBE_ENROLLMENT_JS" file="resources\chromeos\login\ oobe_screen_oauth_enrollment.js" flattenhtml="true" type="chrome_html" /> 73 <structure name="IDR_OOBE_ENROLLMENT_JS" file="resources\chromeos\login\ oobe_screen_oauth_enrollment.js" flattenhtml="true" type="chrome_html" />
74 <structure name="IDR_KEYBOARD_UTILS_JS" file="resources\chromeos\keyboar d\keyboard_utils.js" flattenhtml="true" type="chrome_html" /> 74 <structure name="IDR_KEYBOARD_UTILS_JS" file="resources\chromeos\keyboar d\keyboard_utils.js" flattenhtml="true" type="chrome_html" />
75 <structure name="IDR_NETWORK_CONFIG_JS" file="resources\chromeos\network \network_config.js" flattenhtml="true" type="chrome_html" />
75 </if> 76 </if>
76 <structure name="IDR_READER_OUT_OF_DATE_HTML" file="resources\reader_out_o f_date.html" flattenhtml="true" type="chrome_html" /> 77 <structure name="IDR_READER_OUT_OF_DATE_HTML" file="resources\reader_out_o f_date.html" flattenhtml="true" type="chrome_html" />
77 <structure name="IDR_SSL_ROAD_BLOCK_HTML" file="resources\ssl\roadblock.ht ml" flattenhtml="true" type="chrome_html" /> 78 <structure name="IDR_SSL_ROAD_BLOCK_HTML" file="resources\ssl\roadblock.ht ml" flattenhtml="true" type="chrome_html" />
78 <structure name="IDR_SSL_BLOCKING_HTML" file="resources\ssl\blocking.html" flattenhtml="true" type="chrome_html" /> 79 <structure name="IDR_SSL_BLOCKING_HTML" file="resources\ssl\blocking.html" flattenhtml="true" type="chrome_html" />
79 <structure name="IDR_SAFE_BROWSING_MALWARE_BLOCK_V2" file="resources\safe_ browsing\malware_block_v2.html" flattenhtml="true" type="chrome_html" /> 80 <structure name="IDR_SAFE_BROWSING_MALWARE_BLOCK_V2" file="resources\safe_ browsing\malware_block_v2.html" flattenhtml="true" type="chrome_html" />
80 </structures> 81 </structures>
81 <includes> 82 <includes>
82 <if expr="is_win"> 83 <if expr="is_win">
83 <include name="IDR_ABOUT_CONFLICTS_HTML" file="resources\about_conflicts .html" flattenhtml="true" allowexternalscript="true" type="BINDATA" /> 84 <include name="IDR_ABOUT_CONFLICTS_HTML" file="resources\about_conflicts .html" flattenhtml="true" allowexternalscript="true" type="BINDATA" />
84 <include name="IDR_ABOUT_CONFLICTS_JS" file="resources\about_conflicts.j s" type="BINDATA" /> 85 <include name="IDR_ABOUT_CONFLICTS_JS" file="resources\about_conflicts.j s" type="BINDATA" />
(...skipping 284 matching lines...) Expand 10 before | Expand all | Expand 10 after
369 <include name="IDR_PROFILE_SIGNIN_CONFIRMATION_HTML" file="resources\profi le_signin_confirmation.html" type="BINDATA" /> 370 <include name="IDR_PROFILE_SIGNIN_CONFIRMATION_HTML" file="resources\profi le_signin_confirmation.html" type="BINDATA" />
370 <include name="IDR_PROFILE_SIGNIN_CONFIRMATION_JS" file="resources\profile _signin_confirmation.js" type="BINDATA" /> 371 <include name="IDR_PROFILE_SIGNIN_CONFIRMATION_JS" file="resources\profile _signin_confirmation.js" type="BINDATA" />
371 <include name="IDR_PROFILE_SIGNIN_CONFIRMATION_CSS" file="resources\profil e_signin_confirmation.css" type="BINDATA" /> 372 <include name="IDR_PROFILE_SIGNIN_CONFIRMATION_CSS" file="resources\profil e_signin_confirmation.css" type="BINDATA" />
372 <include name="IDR_RECENTLY_CLOSED_WINDOW" file="resources\ntp4\images\clo sed_window.png" type="BINDATA" /> 373 <include name="IDR_RECENTLY_CLOSED_WINDOW" file="resources\ntp4\images\clo sed_window.png" type="BINDATA" />
373 <if expr="not is_android"> 374 <if expr="not is_android">
374 <include name="IDR_IDENTITY_INTERNALS_HTML" file="resources\identity_int ernals.html" type="BINDATA" /> 375 <include name="IDR_IDENTITY_INTERNALS_HTML" file="resources\identity_int ernals.html" type="BINDATA" />
375 <include name="IDR_IDENTITY_INTERNALS_CSS" file="resources\identity_inte rnals.css" type="BINDATA" /> 376 <include name="IDR_IDENTITY_INTERNALS_CSS" file="resources\identity_inte rnals.css" type="BINDATA" />
376 <include name="IDR_IDENTITY_INTERNALS_JS" file="resources\identity_inter nals.js" type="BINDATA" /> 377 <include name="IDR_IDENTITY_INTERNALS_JS" file="resources\identity_inter nals.js" type="BINDATA" />
377 </if> 378 </if>
378 <if expr="chromeos"> 379 <if expr="chromeos">
379 <include name="IDR_NETWORK_HTML" file="resources\chromeos\network.html" type="BINDATA" /> 380 <include name="IDR_NETWORK_UI_HTML" file="resources\chromeos\network_ui\ network_ui.html" type="BINDATA" />
380 <include name="IDR_NETWORK_JS" file="resources\chromeos\network.js" type ="BINDATA" /> 381 <include name="IDR_NETWORK_UI_JS" file="resources\chromeos\network_ui\ne twork_ui.js" type="BINDATA" />
381 <include name="IDR_NETWORK_CSS" file="resources\chromeos\network.css" ty pe="BINDATA" /> 382 <include name="IDR_NETWORK_UI_CSS" file="resources\chromeos\network_ui\n etwork_ui.css" type="BINDATA" />
382 </if> 383 </if>
383 <if expr="_google_chrome"> 384 <if expr="_google_chrome">
384 <include name="IDR_PREF_HASH_SEED_BIN" file="resources\settings_internal \pref_hash_seed.bin" type="BINDATA" /> 385 <include name="IDR_PREF_HASH_SEED_BIN" file="resources\settings_internal \pref_hash_seed.bin" type="BINDATA" />
385 <include name="IDR_AUTOMATIC_PROFILE_RESET_RULES" file="internal\resourc es\profile_reset\automatic_profile_reset_rules.dat" type="BINDATA" /> 386 <include name="IDR_AUTOMATIC_PROFILE_RESET_RULES" file="internal\resourc es\profile_reset\automatic_profile_reset_rules.dat" type="BINDATA" />
386 <include name="IDR_AUTOMATIC_PROFILE_RESET_RULES_DRY" file="internal\res ources\profile_reset\automatic_profile_reset_rules_dry.dat" type="BINDATA" /> 387 <include name="IDR_AUTOMATIC_PROFILE_RESET_RULES_DRY" file="internal\res ources\profile_reset\automatic_profile_reset_rules_dry.dat" type="BINDATA" />
387 <include name="IDR_AUTOMATIC_PROFILE_RESET_HASH_SEED" file="internal\res ources\profile_reset\automatic_profile_reset_rules.seed" type="BINDATA" /> 388 <include name="IDR_AUTOMATIC_PROFILE_RESET_HASH_SEED" file="internal\res ources\profile_reset\automatic_profile_reset_rules.seed" type="BINDATA" />
388 <include name="IDR_AUTOMATIC_PROFILE_RESET_HASH_SEED_DRY" file="internal \resources\profile_reset\automatic_profile_reset_rules_dry.seed" type="BINDATA" /> 389 <include name="IDR_AUTOMATIC_PROFILE_RESET_HASH_SEED_DRY" file="internal \resources\profile_reset\automatic_profile_reset_rules_dry.seed" type="BINDATA" />
389 <include name="IDR_ADDITIONAL_MODULE_IDS" file="${additional_modules_lis t_file}" use_base_dir="false" type="BINDATA" /> 390 <include name="IDR_ADDITIONAL_MODULE_IDS" file="${additional_modules_lis t_file}" use_base_dir="false" type="BINDATA" />
390 </if> 391 </if>
391 <if expr="chromeos"> 392 <if expr="chromeos">
(...skipping 18 matching lines...) Expand all
410 <include name="IDR_GCM_INTERNALS_JS" file="resources\gcm_internals.js" typ e="BINDATA" /> 411 <include name="IDR_GCM_INTERNALS_JS" file="resources\gcm_internals.js" typ e="BINDATA" />
411 <include name="IDR_EASY_UNLOCK_MANIFEST" file="resources\easy_unlock\manif est.json" type="BINDATA" /> 412 <include name="IDR_EASY_UNLOCK_MANIFEST" file="resources\easy_unlock\manif est.json" type="BINDATA" />
412 <if expr="chromeos"> 413 <if expr="chromeos">
413 <include name="IDR_SET_TIME_HTML" file="resources\chromeos\set_time.html " type="BINDATA" /> 414 <include name="IDR_SET_TIME_HTML" file="resources\chromeos\set_time.html " type="BINDATA" />
414 <include name="IDR_SET_TIME_CSS" file="resources\chromeos\set_time.css" type="BINDATA" /> 415 <include name="IDR_SET_TIME_CSS" file="resources\chromeos\set_time.css" type="BINDATA" />
415 <include name="IDR_SET_TIME_JS" file="resources\chromeos\set_time.js" ty pe="BINDATA" /> 416 <include name="IDR_SET_TIME_JS" file="resources\chromeos\set_time.js" ty pe="BINDATA" />
416 </if> 417 </if>
417 </includes> 418 </includes>
418 </release> 419 </release>
419 </grit> 420 </grit>
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/resources/chromeos/network.css » ('j') | chrome/browser/resources/chromeos/network/network_config.js » ('J')

Powered by Google App Engine
This is Rietveld 408576698