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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 2298503002: [Signin Error Dialog] (1/3) Adds necessary web components (Closed)
Patch Set: Address feedback. Created 4 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 | « no previous file | chrome/browser/resources/signin/signin_error/signin_error.html » ('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" output_all_resource_defines= "false"> 2 <grit latest_public_release="0" current_release="1" output_all_resource_defines= "false">
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 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
63 <structure name="IDR_CUSTOM_ELEMENTS_OOBE_HTML" file="resources\chromeos \login\custom_elements_oobe.html" flattenhtml="true" type="chrome_html" /> 63 <structure name="IDR_CUSTOM_ELEMENTS_OOBE_HTML" file="resources\chromeos \login\custom_elements_oobe.html" flattenhtml="true" type="chrome_html" />
64 <structure name="IDR_CUSTOM_ELEMENTS_OOBE_JS" file="resources\chromeos\l ogin\custom_elements_oobe.js" flattenhtml="true" type="chrome_html" /> 64 <structure name="IDR_CUSTOM_ELEMENTS_OOBE_JS" file="resources\chromeos\l ogin\custom_elements_oobe.js" flattenhtml="true" type="chrome_html" />
65 <structure name="IDR_CUSTOM_ELEMENTS_LOCK_HTML" file="resources\chromeos \login\custom_elements_lock.html" flattenhtml="true" type="chrome_html" /> 65 <structure name="IDR_CUSTOM_ELEMENTS_LOCK_HTML" file="resources\chromeos \login\custom_elements_lock.html" flattenhtml="true" type="chrome_html" />
66 <structure name="IDR_CUSTOM_ELEMENTS_LOCK_JS" file="resources\chromeos\l ogin\custom_elements_lock.js" flattenhtml="true" type="chrome_html" /> 66 <structure name="IDR_CUSTOM_ELEMENTS_LOCK_JS" file="resources\chromeos\l ogin\custom_elements_lock.js" flattenhtml="true" type="chrome_html" />
67 <structure name="IDR_CUSTOM_ELEMENTS_LOGIN_HTML" file="resources\chromeo s\login\custom_elements_login.html" flattenhtml="true" type="chrome_html" /> 67 <structure name="IDR_CUSTOM_ELEMENTS_LOGIN_HTML" file="resources\chromeo s\login\custom_elements_login.html" flattenhtml="true" type="chrome_html" />
68 <structure name="IDR_CUSTOM_ELEMENTS_LOGIN_JS" file="resources\chromeos\ login\custom_elements_login.js" flattenhtml="true" type="chrome_html" /> 68 <structure name="IDR_CUSTOM_ELEMENTS_LOGIN_JS" file="resources\chromeos\ login\custom_elements_login.js" flattenhtml="true" type="chrome_html" />
69 <structure name="IDR_CUSTOM_ELEMENTS_PIN_KEYBOARD_HTML" file="resources\ chromeos\quick_unlock\pin_keyboard.html" flattenhtml="true" allowexternalscript= "true" type="chrome_html" /> 69 <structure name="IDR_CUSTOM_ELEMENTS_PIN_KEYBOARD_HTML" file="resources\ chromeos\quick_unlock\pin_keyboard.html" flattenhtml="true" allowexternalscript= "true" type="chrome_html" />
70 <structure name="IDR_CUSTOM_ELEMENTS_PIN_KEYBOARD_JS" file="resources\ch romeos\quick_unlock\pin_keyboard.js" type="chrome_html" /> 70 <structure name="IDR_CUSTOM_ELEMENTS_PIN_KEYBOARD_JS" file="resources\ch romeos\quick_unlock\pin_keyboard.js" type="chrome_html" />
71 </if> 71 </if>
72 <structure name="IDR_READER_OUT_OF_DATE_HTML" file="resources\reader_out_o f_date.html" flattenhtml="true" type="chrome_html" /> 72 <structure name="IDR_READER_OUT_OF_DATE_HTML" file="resources\reader_out_o f_date.html" flattenhtml="true" type="chrome_html" />
73 <structure name="IDR_SIGNIN_SHARED_CSS_HTML" file="resources\signin\signin _shared_css.html" preprocess="true" allowexternalscript="true" type="chrome_html " />
73 </structures> 74 </structures>
74 <includes> 75 <includes>
75 <if expr="is_win"> 76 <if expr="is_win">
76 <include name="IDR_ABOUT_CONFLICTS_HTML" file="resources\about_conflicts .html" flattenhtml="true" allowexternalscript="true" type="BINDATA" /> 77 <include name="IDR_ABOUT_CONFLICTS_HTML" file="resources\about_conflicts .html" flattenhtml="true" allowexternalscript="true" type="BINDATA" />
77 <include name="IDR_ABOUT_CONFLICTS_JS" file="resources\about_conflicts.j s" type="BINDATA" /> 78 <include name="IDR_ABOUT_CONFLICTS_JS" file="resources\about_conflicts.j s" type="BINDATA" />
78 </if> 79 </if>
79 <if expr="enable_plugins"> 80 <if expr="enable_plugins">
80 <include name="IDR_ABOUT_FLASH_HTML" file="resources\about_flash.html" f lattenhtml="true" allowexternalscript="true" type="BINDATA" /> 81 <include name="IDR_ABOUT_FLASH_HTML" file="resources\about_flash.html" f lattenhtml="true" allowexternalscript="true" type="BINDATA" />
81 <include name="IDR_ABOUT_FLASH_JS" file="resources\about_flash.js" type= "BINDATA" /> 82 <include name="IDR_ABOUT_FLASH_JS" file="resources\about_flash.js" type= "BINDATA" />
82 </if> 83 </if>
(...skipping 289 matching lines...) Expand 10 before | Expand all | Expand 10 after
372 </if> 373 </if>
373 <include name="IDR_PROFILER_HTML" file="resources\profiler\profiler.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" /> 374 <include name="IDR_PROFILER_HTML" file="resources\profiler\profiler.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" />
374 <include name="IDR_PROFILER_JS" file="resources\profiler\profiler.js" flat tenhtml="true" type="BINDATA" /> 375 <include name="IDR_PROFILER_JS" file="resources\profiler\profiler.js" flat tenhtml="true" type="BINDATA" />
375 <if expr="enable_google_now"> 376 <if expr="enable_google_now">
376 <include name="IDR_GOOGLE_NOW_MANIFEST" file="resources\google_now\manif est.json" type="BINDATA" /> 377 <include name="IDR_GOOGLE_NOW_MANIFEST" file="resources\google_now\manif est.json" type="BINDATA" />
377 </if> 378 </if>
378 <include name="IDR_SITE_ENGAGEMENT_HTML" file="resources\engagement\site_e ngagement.html" flattenhtml="true" type="BINDATA" /> 379 <include name="IDR_SITE_ENGAGEMENT_HTML" file="resources\engagement\site_e ngagement.html" flattenhtml="true" type="BINDATA" />
379 <include name="IDR_SITE_ENGAGEMENT_JS" file="resources\engagement\site_eng agement.js" flattenhtml="true" type="BINDATA" /> 380 <include name="IDR_SITE_ENGAGEMENT_JS" file="resources\engagement\site_eng agement.js" flattenhtml="true" type="BINDATA" />
380 <include name="IDR_SITE_ENGAGEMENT_MOJO_JS" file="${root_gen_dir}\chrome\b rowser\ui\webui\engagement\site_engagement.mojom.js" use_base_dir="false" type=" BINDATA"/> 381 <include name="IDR_SITE_ENGAGEMENT_MOJO_JS" file="${root_gen_dir}\chrome\b rowser\ui\webui\engagement\site_engagement.mojom.js" use_base_dir="false" type=" BINDATA"/>
381 <include name="IDR_URL_MOJO_JS" file="${root_gen_dir}\url\mojo\url.mojom.j s" use_base_dir="false" type="BINDATA"/> 382 <include name="IDR_URL_MOJO_JS" file="${root_gen_dir}\url\mojo\url.mojom.j s" use_base_dir="false" type="BINDATA"/>
382 <include name="IDR_SYNC_CONFIRMATION_CSS" file="resources\sync_confirmatio n\sync_confirmation.css" type="BINDATA" /> 383 <include name="IDR_SYNC_CONFIRMATION_CSS" file="resources\signin\sync_conf irmation\sync_confirmation.css" type="BINDATA" />
383 <include name="IDR_SYNC_CONFIRMATION_HTML" file="resources\sync_confirmati on\sync_confirmation.html" flattenhtml="true" allowexternalscript="true" type="B INDATA" /> 384 <include name="IDR_SYNC_CONFIRMATION_HTML" file="resources\signin\sync_con firmation\sync_confirmation.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" />
384 <include name="IDR_SYNC_CONFIRMATION_JS" file="resources\sync_confirmation \sync_confirmation.js" type="BINDATA" /> 385 <include name="IDR_SYNC_CONFIRMATION_JS" file="resources\signin\sync_confi rmation\sync_confirmation.js" type="BINDATA" />
386 <include name="IDR_SIGNIN_ERROR_HTML" file="resources\signin\signin_error\ signin_error.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" />
387 <include name="IDR_SIGNIN_ERROR_JS" file="resources\signin\signin_error\si gnin_error.js" type="BINDATA" />
385 <include name="IDR_UBER_HTML" file="resources\uber\uber.html" flattenhtml= "true" type="BINDATA" /> 388 <include name="IDR_UBER_HTML" file="resources\uber\uber.html" flattenhtml= "true" type="BINDATA" />
386 <include name="IDR_UBER_JS" file="resources\uber\uber.js" type="BINDATA" / > 389 <include name="IDR_UBER_JS" file="resources\uber\uber.js" type="BINDATA" / >
387 <include name="IDR_UBER_FRAME_HTML" file="resources\uber\uber_frame.html" flattenhtml="true" type="BINDATA" /> 390 <include name="IDR_UBER_FRAME_HTML" file="resources\uber\uber_frame.html" flattenhtml="true" type="BINDATA" />
388 <include name="IDR_UBER_FRAME_JS" file="resources\uber\uber_frame.js" flat tenhtml="true" type="BINDATA" /> 391 <include name="IDR_UBER_FRAME_JS" file="resources\uber\uber_frame.js" flat tenhtml="true" type="BINDATA" />
389 <include name="IDR_UBER_UTILS_JS" file="resources\uber\uber_utils.js" type ="BINDATA" /> 392 <include name="IDR_UBER_UTILS_JS" file="resources\uber\uber_utils.js" type ="BINDATA" />
390 <include name="IDR_USB_INTERNALS_CSS" file="resources\usb_internals\usb_in ternals.css" type="BINDATA" /> 393 <include name="IDR_USB_INTERNALS_CSS" file="resources\usb_internals\usb_in ternals.css" type="BINDATA" />
391 <include name="IDR_USB_INTERNALS_HTML" file="resources\usb_internals\usb_i nternals.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" /> 394 <include name="IDR_USB_INTERNALS_HTML" file="resources\usb_internals\usb_i nternals.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" />
392 <include name="IDR_USB_INTERNALS_JS" file="resources\usb_internals\usb_int ernals.js" type="BINDATA" /> 395 <include name="IDR_USB_INTERNALS_JS" file="resources\usb_internals\usb_int ernals.js" type="BINDATA" />
393 <include name="IDR_USB_INTERNALS_MOJO_JS" file="${root_gen_dir}\chrome\bro wser\ui\webui\usb_internals\usb_internals.mojom.js" use_base_dir="false" type="B INDATA"/> 396 <include name="IDR_USB_INTERNALS_MOJO_JS" file="${root_gen_dir}\chrome\bro wser\ui\webui\usb_internals\usb_internals.mojom.js" use_base_dir="false" type="B INDATA"/>
394 <include name="IDR_USER_ACTIONS_HTML" file="resources\user_actions\user_ac tions.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" /> 397 <include name="IDR_USER_ACTIONS_HTML" file="resources\user_actions\user_ac tions.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" />
(...skipping 176 matching lines...) Expand 10 before | Expand all | Expand 10 after
571 <include name="IDR_CAST_FAVICON" file="resources\cast\cast_favicon.ico" type="BINDATA" /> 574 <include name="IDR_CAST_FAVICON" file="resources\cast\cast_favicon.ico" type="BINDATA" />
572 </if> 575 </if>
573 <if expr="not is_android and not is_ios"> 576 <if expr="not is_android and not is_ios">
574 <include name="IDR_IME_WINDOW_CLOSE" file="resources\input_ime\ime_windo w_close.png" type="BINDATA" /> 577 <include name="IDR_IME_WINDOW_CLOSE" file="resources\input_ime\ime_windo w_close.png" type="BINDATA" />
575 <include name="IDR_IME_WINDOW_CLOSE_C" file="resources\input_ime\ime_win dow_close_click.png" type="BINDATA" /> 578 <include name="IDR_IME_WINDOW_CLOSE_C" file="resources\input_ime\ime_win dow_close_click.png" type="BINDATA" />
576 <include name="IDR_IME_WINDOW_CLOSE_H" file="resources\input_ime\ime_win dow_close_hover.png" type="BINDATA" /> 579 <include name="IDR_IME_WINDOW_CLOSE_H" file="resources\input_ime\ime_win dow_close_hover.png" type="BINDATA" />
577 </if> 580 </if>
578 </includes> 581 </includes>
579 </release> 582 </release>
580 </grit> 583 </grit>
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/resources/signin/signin_error/signin_error.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698