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

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: Address feedback Created 4 years, 11 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
« chrome/app/generated_resources.grd ('K') | « chrome/app/generated_resources.grd ('k') | chrome/browser/profiles/profile_avatar_icon_util.h » ('j') | chrome/browser/resources/sync_confirmation/sync_confirmation.css » ('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 307 matching lines...) Expand 10 before | Expand all | Expand 10 after
318 </if> 318 </if>
319 <if expr="enable_google_now"> 319 <if expr="enable_google_now">
320 <include name="IDR_GOOGLE_NOW_MANIFEST" file="resources\google_now\manif est.json" type="BINDATA" /> 320 <include name="IDR_GOOGLE_NOW_MANIFEST" file="resources\google_now\manif est.json" type="BINDATA" />
321 </if> 321 </if>
322 <include name="IDR_SITE_ENGAGEMENT_HTML" file="resources\engagement\site_e ngagement.html" flattenhtml="true" type="BINDATA" /> 322 <include name="IDR_SITE_ENGAGEMENT_HTML" file="resources\engagement\site_e ngagement.html" flattenhtml="true" type="BINDATA" />
323 <include name="IDR_SITE_ENGAGEMENT_JS" file="resources\engagement\site_eng agement.js" flattenhtml="true" type="BINDATA" /> 323 <include name="IDR_SITE_ENGAGEMENT_JS" file="resources\engagement\site_eng agement.js" flattenhtml="true" type="BINDATA" />
324 <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"/> 324 <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"/>
325 <include name="IDR_SITE_ENGAGEMENT_ENGAGEMENT_TABLE_CSS" file="resources\e ngagement\engagement_table.css" type="BINDATA" /> 325 <include name="IDR_SITE_ENGAGEMENT_ENGAGEMENT_TABLE_CSS" file="resources\e ngagement\engagement_table.css" type="BINDATA" />
326 <include name="IDR_SITE_ENGAGEMENT_ENGAGEMENT_TABLE_HTML" file="resources\ engagement\engagement_table.html" type="BINDATA" /> 326 <include name="IDR_SITE_ENGAGEMENT_ENGAGEMENT_TABLE_HTML" file="resources\ engagement\engagement_table.html" type="BINDATA" />
327 <include name="IDR_SITE_ENGAGEMENT_ENGAGEMENT_TABLE_JS" file="resources\en gagement\engagement_table.js" type="BINDATA" /> 327 <include name="IDR_SITE_ENGAGEMENT_ENGAGEMENT_TABLE_JS" file="resources\en gagement\engagement_table.js" type="BINDATA" />
328 <include name="IDR_SYNC_CONFIRMATION_CSS" file="resources\sync_confirmatio n\sync_confirmation.css" type="BINDATA" />
329 <include name="IDR_SYNC_CONFIRMATION_HTML" file="resources\sync_confirmati on\sync_confirmation.html" allowexternalscript="true" type="BINDATA" />
330 <include name="IDR_SYNC_CONFIRMATION_JS" file="resources\sync_confirmation \sync_confirmation.js" type="BINDATA" />
328 <include name="IDR_UBER_HTML" file="resources\uber\uber.html" flattenhtml= "true" type="BINDATA" /> 331 <include name="IDR_UBER_HTML" file="resources\uber\uber.html" flattenhtml= "true" type="BINDATA" />
329 <include name="IDR_UBER_JS" file="resources\uber\uber.js" type="BINDATA" / > 332 <include name="IDR_UBER_JS" file="resources\uber\uber.js" type="BINDATA" / >
330 <include name="IDR_UBER_FRAME_HTML" file="resources\uber\uber_frame.html" flattenhtml="true" type="BINDATA" /> 333 <include name="IDR_UBER_FRAME_HTML" file="resources\uber\uber_frame.html" flattenhtml="true" type="BINDATA" />
331 <include name="IDR_UBER_FRAME_JS" file="resources\uber\uber_frame.js" flat tenhtml="true" type="BINDATA" /> 334 <include name="IDR_UBER_FRAME_JS" file="resources\uber\uber_frame.js" flat tenhtml="true" type="BINDATA" />
332 <include name="IDR_UBER_UTILS_JS" file="resources\uber\uber_utils.js" type ="BINDATA" /> 335 <include name="IDR_UBER_UTILS_JS" file="resources\uber\uber_utils.js" type ="BINDATA" />
333 <include name="IDR_USER_ACTIONS_HTML" file="resources\user_actions\user_ac tions.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" /> 336 <include name="IDR_USER_ACTIONS_HTML" file="resources\user_actions\user_ac tions.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" />
334 <include name="IDR_USER_ACTIONS_CSS" file="resources\user_actions\user_act ions.css" type="BINDATA" /> 337 <include name="IDR_USER_ACTIONS_CSS" file="resources\user_actions\user_act ions.css" type="BINDATA" />
335 <include name="IDR_USER_ACTIONS_JS" file="resources\user_actions\user_acti ons.js" type="BINDATA" /> 338 <include name="IDR_USER_ACTIONS_JS" file="resources\user_actions\user_acti ons.js" type="BINDATA" />
336 <if expr="enable_webrtc"> 339 <if expr="enable_webrtc">
337 <include name="IDR_WEBRTC_LOGS_HTML" file="resources\media\webrtc_logs.h tml" flattenhtml="true" allowexternalscript="true" type="BINDATA" /> 340 <include name="IDR_WEBRTC_LOGS_HTML" file="resources\media\webrtc_logs.h tml" flattenhtml="true" allowexternalscript="true" type="BINDATA" />
(...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after
467 </if> 470 </if>
468 <include name="IDR_BRAILLE_MANIFEST" file="resources\chromeos\braille_im e\manifest.json" type="BINDATA" /> 471 <include name="IDR_BRAILLE_MANIFEST" file="resources\chromeos\braille_im e\manifest.json" type="BINDATA" />
469 </if> 472 </if>
470 <include name="IDR_WHISPERNET_PROXY_MANIFEST" file="resources\whispernet_p roxy\manifest.json" type="BINDATA" /> 473 <include name="IDR_WHISPERNET_PROXY_MANIFEST" file="resources\whispernet_p roxy\manifest.json" type="BINDATA" />
471 <if expr="enable_media_router"> 474 <if expr="enable_media_router">
472 <part file="media_router_resources.grdp" /> 475 <part file="media_router_resources.grdp" />
473 </if> 476 </if>
474 </includes> 477 </includes>
475 </release> 478 </release>
476 </grit> 479 </grit>
OLDNEW
« chrome/app/generated_resources.grd ('K') | « chrome/app/generated_resources.grd ('k') | chrome/browser/profiles/profile_avatar_icon_util.h » ('j') | chrome/browser/resources/sync_confirmation/sync_confirmation.css » ('J')

Powered by Google App Engine
This is Rietveld 408576698