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

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

Issue 2255413002: [Signin Error Dialog] (3/3) Added the triggering code (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Cleared up Get/SetLastLoginErrorEmail Created 4 years, 4 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
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 351 matching lines...) Expand 10 before | Expand all | Expand 10 after
362 <if expr="enable_google_now"> 362 <if expr="enable_google_now">
363 <include name="IDR_GOOGLE_NOW_MANIFEST" file="resources\google_now\manif est.json" type="BINDATA" /> 363 <include name="IDR_GOOGLE_NOW_MANIFEST" file="resources\google_now\manif est.json" type="BINDATA" />
364 </if> 364 </if>
365 <include name="IDR_SITE_ENGAGEMENT_HTML" file="resources\engagement\site_e ngagement.html" flattenhtml="true" type="BINDATA" /> 365 <include name="IDR_SITE_ENGAGEMENT_HTML" file="resources\engagement\site_e ngagement.html" flattenhtml="true" type="BINDATA" />
366 <include name="IDR_SITE_ENGAGEMENT_JS" file="resources\engagement\site_eng agement.js" flattenhtml="true" type="BINDATA" /> 366 <include name="IDR_SITE_ENGAGEMENT_JS" file="resources\engagement\site_eng agement.js" flattenhtml="true" type="BINDATA" />
367 <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"/> 367 <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"/>
368 <include name="IDR_URL_MOJO_JS" file="${root_gen_dir}\url\mojo\url.mojom.j s" use_base_dir="false" type="BINDATA"/> 368 <include name="IDR_URL_MOJO_JS" file="${root_gen_dir}\url\mojo\url.mojom.j s" use_base_dir="false" type="BINDATA"/>
369 <include name="IDR_SYNC_CONFIRMATION_CSS" file="resources\sync_confirmatio n\sync_confirmation.css" type="BINDATA" /> 369 <include name="IDR_SYNC_CONFIRMATION_CSS" file="resources\sync_confirmatio n\sync_confirmation.css" type="BINDATA" />
370 <include name="IDR_SYNC_CONFIRMATION_HTML" file="resources\sync_confirmati on\sync_confirmation.html" flattenhtml="true" allowexternalscript="true" type="B INDATA" /> 370 <include name="IDR_SYNC_CONFIRMATION_HTML" file="resources\sync_confirmati on\sync_confirmation.html" flattenhtml="true" allowexternalscript="true" type="B INDATA" />
371 <include name="IDR_SYNC_CONFIRMATION_JS" file="resources\sync_confirmation \sync_confirmation.js" type="BINDATA" /> 371 <include name="IDR_SYNC_CONFIRMATION_JS" file="resources\sync_confirmation \sync_confirmation.js" type="BINDATA" />
372 <include name="IDR_SIGNIN_ERROR_CSS" file="resources\signin_error\signin_e rror.css" type="BINDATA" />
373 <include name="IDR_SIGNIN_ERROR_HTML" file="resources\signin_error\signin_ error.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" />
374 <include name="IDR_SIGNIN_ERROR_JS" file="resources\signin_error\signin_er ror.js" type="BINDATA" />
372 <include name="IDR_UBER_HTML" file="resources\uber\uber.html" flattenhtml= "true" type="BINDATA" /> 375 <include name="IDR_UBER_HTML" file="resources\uber\uber.html" flattenhtml= "true" type="BINDATA" />
373 <include name="IDR_UBER_JS" file="resources\uber\uber.js" type="BINDATA" / > 376 <include name="IDR_UBER_JS" file="resources\uber\uber.js" type="BINDATA" / >
374 <include name="IDR_UBER_FRAME_HTML" file="resources\uber\uber_frame.html" flattenhtml="true" type="BINDATA" /> 377 <include name="IDR_UBER_FRAME_HTML" file="resources\uber\uber_frame.html" flattenhtml="true" type="BINDATA" />
375 <include name="IDR_UBER_FRAME_JS" file="resources\uber\uber_frame.js" flat tenhtml="true" type="BINDATA" /> 378 <include name="IDR_UBER_FRAME_JS" file="resources\uber\uber_frame.js" flat tenhtml="true" type="BINDATA" />
376 <include name="IDR_UBER_UTILS_JS" file="resources\uber\uber_utils.js" type ="BINDATA" /> 379 <include name="IDR_UBER_UTILS_JS" file="resources\uber\uber_utils.js" type ="BINDATA" />
377 <include name="IDR_USB_INTERNALS_CSS" file="resources\usb_internals\usb_in ternals.css" type="BINDATA" /> 380 <include name="IDR_USB_INTERNALS_CSS" file="resources\usb_internals\usb_in ternals.css" type="BINDATA" />
378 <include name="IDR_USB_INTERNALS_HTML" file="resources\usb_internals\usb_i nternals.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" /> 381 <include name="IDR_USB_INTERNALS_HTML" file="resources\usb_internals\usb_i nternals.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" />
379 <include name="IDR_USB_INTERNALS_JS" file="resources\usb_internals\usb_int ernals.js" type="BINDATA" /> 382 <include name="IDR_USB_INTERNALS_JS" file="resources\usb_internals\usb_int ernals.js" type="BINDATA" />
380 <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"/> 383 <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"/>
381 <include name="IDR_USER_ACTIONS_HTML" file="resources\user_actions\user_ac tions.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" /> 384 <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
558 <include name="IDR_CAST_FAVICON" file="resources\cast\cast_favicon.ico" type="BINDATA" /> 561 <include name="IDR_CAST_FAVICON" file="resources\cast\cast_favicon.ico" type="BINDATA" />
559 </if> 562 </if>
560 <if expr="not is_android and not is_ios"> 563 <if expr="not is_android and not is_ios">
561 <include name="IDR_IME_WINDOW_CLOSE" file="resources\input_ime\ime_windo w_close.png" type="BINDATA" /> 564 <include name="IDR_IME_WINDOW_CLOSE" file="resources\input_ime\ime_windo w_close.png" type="BINDATA" />
562 <include name="IDR_IME_WINDOW_CLOSE_C" file="resources\input_ime\ime_win dow_close_click.png" type="BINDATA" /> 565 <include name="IDR_IME_WINDOW_CLOSE_C" file="resources\input_ime\ime_win dow_close_click.png" type="BINDATA" />
563 <include name="IDR_IME_WINDOW_CLOSE_H" file="resources\input_ime\ime_win dow_close_hover.png" type="BINDATA" /> 566 <include name="IDR_IME_WINDOW_CLOSE_H" file="resources\input_ime\ime_win dow_close_hover.png" type="BINDATA" />
564 </if> 567 </if>
565 </includes> 568 </includes>
566 </release> 569 </release>
567 </grit> 570 </grit>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698