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

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

Issue 1681813003: arc: Use incognito profile for OptIn and cookie fetcher (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: cleanup Created 4 years, 10 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"> 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 371 matching lines...) Expand 10 before | Expand all | Expand 10 after
382 <include name="IDR_CERT_MANAGER_DIALOG_HTML" file="resources\chromeos\ce rtificate_manager_dialog.html" flattenhtml="true" type="BINDATA" /> 382 <include name="IDR_CERT_MANAGER_DIALOG_HTML" file="resources\chromeos\ce rtificate_manager_dialog.html" flattenhtml="true" type="BINDATA" />
383 <include name="IDR_BLUETOOTH_PAIR_DEVICE_HTML" file="resources\chromeos\ bluetooth_pair_device.html" flattenhtml="true" type="BINDATA" /> 383 <include name="IDR_BLUETOOTH_PAIR_DEVICE_HTML" file="resources\chromeos\ bluetooth_pair_device.html" flattenhtml="true" type="BINDATA" />
384 <include name="IDR_SIM_UNLOCK_HTML" file="resources\chromeos\sim_unlock. html" flattenhtml="true" type="BINDATA" /> 384 <include name="IDR_SIM_UNLOCK_HTML" file="resources\chromeos\sim_unlock. html" flattenhtml="true" type="BINDATA" />
385 <include name="IDR_SLOW_HTML" file="resources\chromeos\slow.html" flatte nhtml="true" type="BINDATA" /> 385 <include name="IDR_SLOW_HTML" file="resources\chromeos\slow.html" flatte nhtml="true" type="BINDATA" />
386 <include name="IDR_SLOW_JS" file="resources\chromeos\slow.js" type="BIND ATA" /> 386 <include name="IDR_SLOW_JS" file="resources\chromeos\slow.js" type="BIND ATA" />
387 </if> 387 </if>
388 <if expr="chromeos"> 388 <if expr="chromeos">
389 <include name="IDR_DEMO_APP_MANIFEST" file="resources\chromeos\demo_app\ manifest.json" type="BINDATA" /> 389 <include name="IDR_DEMO_APP_MANIFEST" file="resources\chromeos\demo_app\ manifest.json" type="BINDATA" />
390 <include name="IDR_WALLPAPERMANAGER_MANIFEST" file="resources\chromeos\w allpaper_manager\manifest.json" type="BINDATA" /> 390 <include name="IDR_WALLPAPERMANAGER_MANIFEST" file="resources\chromeos\w allpaper_manager\manifest.json" type="BINDATA" />
391 <include name="IDR_FIRST_RUN_DIALOG_MANIFEST" file="resources\chromeos\f irst_run\app/manifest.json" type="BINDATA" /> 391 <include name="IDR_FIRST_RUN_DIALOG_MANIFEST" file="resources\chromeos\f irst_run\app/manifest.json" type="BINDATA" />
392 <include name="IDR_ARC_OPT_IN_MANIFEST" file="resources\chromeos\arc_opt _in\manifest.json" type="BINDATA" />
xiyuan 2016/02/11 17:57:20 nit: arc_opt_in is very specific. Since we want to
khmel 2016/02/12 02:45:23 Agree!
392 </if> 393 </if>
393 <if expr="chromeos and _google_chrome"> 394 <if expr="chromeos and _google_chrome">
394 <include name="IDR_GENIUS_APP_MANIFEST" file="resources\chromeos\genius_ app\manifest.json" type="BINDATA" /> 395 <include name="IDR_GENIUS_APP_MANIFEST" file="resources\chromeos\genius_ app\manifest.json" type="BINDATA" />
395 <include name="IDR_HELP_MANIFEST" file="resources\help_app\manifest.json " type="BINDATA" /> 396 <include name="IDR_HELP_MANIFEST" file="resources\help_app\manifest.json " type="BINDATA" />
396 <include name="IDR_QUICKOFFICE_MANIFEST" file="resources\chromeos\quicko ffice\manifest.json" type="BINDATA" /> 397 <include name="IDR_QUICKOFFICE_MANIFEST" file="resources\chromeos\quicko ffice\manifest.json" type="BINDATA" />
397 </if> 398 </if>
398 <if expr="is_win"> 399 <if expr="is_win">
399 <include name="IDR_SET_AS_DEFAULT_BROWSER_JS" file="resources\set_as_def ault_browser.js" flattenhtml="true" type="BINDATA" /> 400 <include name="IDR_SET_AS_DEFAULT_BROWSER_JS" file="resources\set_as_def ault_browser.js" flattenhtml="true" type="BINDATA" />
400 <include name="IDR_SET_AS_DEFAULT_BROWSER_HTML" file="resources\set_as_d efault_browser.html" flattenhtml="true" allowexternalscript="true" type="BINDATA " /> 401 <include name="IDR_SET_AS_DEFAULT_BROWSER_HTML" file="resources\set_as_d efault_browser.html" flattenhtml="true" allowexternalscript="true" type="BINDATA " />
401 </if> 402 </if>
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after
480 </if> 481 </if>
481 <include name="IDR_BRAILLE_MANIFEST" file="resources\chromeos\braille_im e\manifest.json" type="BINDATA" /> 482 <include name="IDR_BRAILLE_MANIFEST" file="resources\chromeos\braille_im e\manifest.json" type="BINDATA" />
482 </if> 483 </if>
483 <include name="IDR_WHISPERNET_PROXY_MANIFEST" file="resources\whispernet_p roxy\manifest.json" type="BINDATA" /> 484 <include name="IDR_WHISPERNET_PROXY_MANIFEST" file="resources\whispernet_p roxy\manifest.json" type="BINDATA" />
484 <if expr="enable_media_router"> 485 <if expr="enable_media_router">
485 <part file="media_router_resources.grdp" /> 486 <part file="media_router_resources.grdp" />
486 </if> 487 </if>
487 </includes> 488 </includes>
488 </release> 489 </release>
489 </grit> 490 </grit>
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/chromeos/arc/arc_auth_service.h » ('j') | chrome/browser/chromeos/arc/arc_auth_service.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698