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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 1487283005: Implement the new Sync Confirmation dialog on Linux and Windows. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Adress feedback Created 5 years 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/profiles/profile_avatar_icon_util.h » ('j') | chrome/browser/profiles/profile_avatar_icon_util.h » ('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 292 matching lines...) Expand 10 before | Expand all | Expand 10 after
303 </if> 303 </if>
304 <if expr="enable_google_now"> 304 <if expr="enable_google_now">
305 <include name="IDR_GOOGLE_NOW_MANIFEST" file="resources\google_now\manif est.json" type="BINDATA" /> 305 <include name="IDR_GOOGLE_NOW_MANIFEST" file="resources\google_now\manif est.json" type="BINDATA" />
306 </if> 306 </if>
307 <include name="IDR_SITE_ENGAGEMENT_HTML" file="resources\engagement\site_e ngagement.html" flattenhtml="true" type="BINDATA" /> 307 <include name="IDR_SITE_ENGAGEMENT_HTML" file="resources\engagement\site_e ngagement.html" flattenhtml="true" type="BINDATA" />
308 <include name="IDR_SITE_ENGAGEMENT_JS" file="resources\engagement\site_eng agement.js" flattenhtml="true" type="BINDATA" /> 308 <include name="IDR_SITE_ENGAGEMENT_JS" file="resources\engagement\site_eng agement.js" flattenhtml="true" type="BINDATA" />
309 <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"/> 309 <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"/>
310 <include name="IDR_SITE_ENGAGEMENT_ENGAGEMENT_TABLE_CSS" file="resources\e ngagement\engagement_table.css" type="BINDATA" /> 310 <include name="IDR_SITE_ENGAGEMENT_ENGAGEMENT_TABLE_CSS" file="resources\e ngagement\engagement_table.css" type="BINDATA" />
311 <include name="IDR_SITE_ENGAGEMENT_ENGAGEMENT_TABLE_HTML" file="resources\ engagement\engagement_table.html" type="BINDATA" /> 311 <include name="IDR_SITE_ENGAGEMENT_ENGAGEMENT_TABLE_HTML" file="resources\ engagement\engagement_table.html" type="BINDATA" />
312 <include name="IDR_SITE_ENGAGEMENT_ENGAGEMENT_TABLE_JS" file="resources\en gagement\engagement_table.js" type="BINDATA" /> 312 <include name="IDR_SITE_ENGAGEMENT_ENGAGEMENT_TABLE_JS" file="resources\en gagement\engagement_table.js" type="BINDATA" />
313 <include name="IDR_SYNC_CONFIRMATION_CSS" file="resources\sync_confirmatio n\sync_confirmation.css" type="BINDATA" />
314 <include name="IDR_SYNC_CONFIRMATION_HTML" file="resources\sync_confirmati on\sync_confirmation.html" allowexternalscript="true" type="BINDATA" />
315 <include name="IDR_SYNC_CONFIRMATION_JS" file="resources\sync_confirmation \sync_confirmation.js" type="BINDATA" />
313 <include name="IDR_UBER_HTML" file="resources\uber\uber.html" flattenhtml= "true" type="BINDATA" /> 316 <include name="IDR_UBER_HTML" file="resources\uber\uber.html" flattenhtml= "true" type="BINDATA" />
314 <include name="IDR_UBER_JS" file="resources\uber\uber.js" type="BINDATA" / > 317 <include name="IDR_UBER_JS" file="resources\uber\uber.js" type="BINDATA" / >
315 <include name="IDR_UBER_FRAME_HTML" file="resources\uber\uber_frame.html" flattenhtml="true" type="BINDATA" /> 318 <include name="IDR_UBER_FRAME_HTML" file="resources\uber\uber_frame.html" flattenhtml="true" type="BINDATA" />
316 <include name="IDR_UBER_FRAME_JS" file="resources\uber\uber_frame.js" flat tenhtml="true" type="BINDATA" /> 319 <include name="IDR_UBER_FRAME_JS" file="resources\uber\uber_frame.js" flat tenhtml="true" type="BINDATA" />
317 <include name="IDR_UBER_UTILS_JS" file="resources\uber\uber_utils.js" type ="BINDATA" /> 320 <include name="IDR_UBER_UTILS_JS" file="resources\uber\uber_utils.js" type ="BINDATA" />
318 <include name="IDR_USER_ACTIONS_HTML" file="resources\user_actions\user_ac tions.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" /> 321 <include name="IDR_USER_ACTIONS_HTML" file="resources\user_actions\user_ac tions.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" />
319 <include name="IDR_USER_ACTIONS_CSS" file="resources\user_actions\user_act ions.css" type="BINDATA" /> 322 <include name="IDR_USER_ACTIONS_CSS" file="resources\user_actions\user_act ions.css" type="BINDATA" />
320 <include name="IDR_USER_ACTIONS_JS" file="resources\user_actions\user_acti ons.js" type="BINDATA" /> 323 <include name="IDR_USER_ACTIONS_JS" file="resources\user_actions\user_acti ons.js" type="BINDATA" />
321 <if expr="enable_webrtc"> 324 <if expr="enable_webrtc">
322 <include name="IDR_WEBRTC_LOGS_HTML" file="resources\media\webrtc_logs.h tml" flattenhtml="true" allowexternalscript="true" type="BINDATA" /> 325 <include name="IDR_WEBRTC_LOGS_HTML" file="resources\media\webrtc_logs.h tml" flattenhtml="true" allowexternalscript="true" type="BINDATA" />
(...skipping 141 matching lines...) Expand 10 before | Expand all | Expand 10 after
464 </if> 467 </if>
465 <include name="IDR_BRAILLE_MANIFEST" file="resources\chromeos\braille_im e\manifest.json" type="BINDATA" /> 468 <include name="IDR_BRAILLE_MANIFEST" file="resources\chromeos\braille_im e\manifest.json" type="BINDATA" />
466 </if> 469 </if>
467 <include name="IDR_WHISPERNET_PROXY_MANIFEST" file="resources\whispernet_p roxy\manifest.json" type="BINDATA" /> 470 <include name="IDR_WHISPERNET_PROXY_MANIFEST" file="resources\whispernet_p roxy\manifest.json" type="BINDATA" />
468 <if expr="enable_media_router"> 471 <if expr="enable_media_router">
469 <part file="media_router_resources.grdp" /> 472 <part file="media_router_resources.grdp" />
470 </if> 473 </if>
471 </includes> 474 </includes>
472 </release> 475 </release>
473 </grit> 476 </grit>
OLDNEW
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/profiles/profile_avatar_icon_util.h » ('j') | chrome/browser/profiles/profile_avatar_icon_util.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698