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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 1179323005: Polymer upgraded to 1.0 in login flow. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@polymer_pre_migration
Patch Set: Comments addressed. Created 5 years, 6 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/chromeos/login/login_browsertest.cc » ('j') | chrome/browser/resources/chromeos/login/controller-pairing-screen.html » ('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 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
66 <structure name="IDR_OOBE_ENROLLMENT_CSS" file="resources\chromeos\login \oobe_screen_oauth_enrollment.css" flattenhtml="true" type="chrome_html" /> 66 <structure name="IDR_OOBE_ENROLLMENT_CSS" file="resources\chromeos\login \oobe_screen_oauth_enrollment.css" flattenhtml="true" type="chrome_html" />
67 <structure name="IDR_OOBE_ENROLLMENT_JS" file="resources\chromeos\login\ oobe_screen_oauth_enrollment.js" flattenhtml="true" type="chrome_html" /> 67 <structure name="IDR_OOBE_ENROLLMENT_JS" file="resources\chromeos\login\ oobe_screen_oauth_enrollment.js" flattenhtml="true" type="chrome_html" />
68 <structure name="IDR_OOBE_ENROLLMENT_WEBVIEW_HTML" file="resources\chrom eos\login\oobe_screen_oauth_enrollment_webview.html" flattenhtml="true" type="ch rome_html" /> 68 <structure name="IDR_OOBE_ENROLLMENT_WEBVIEW_HTML" file="resources\chrom eos\login\oobe_screen_oauth_enrollment_webview.html" flattenhtml="true" type="ch rome_html" />
69 <structure name="IDR_OOBE_ENROLLMENT_WEBVIEW_CSS" file="resources\chrome os\login\oobe_screen_oauth_enrollment_webview.css" flattenhtml="true" type="chro me_html" /> 69 <structure name="IDR_OOBE_ENROLLMENT_WEBVIEW_CSS" file="resources\chrome os\login\oobe_screen_oauth_enrollment_webview.css" flattenhtml="true" type="chro me_html" />
70 <structure name="IDR_OOBE_ENROLLMENT_WEBVIEW_JS" file="resources\chromeo s\login\oobe_screen_oauth_enrollment_webview.js" flattenhtml="true" type="chrome _html" /> 70 <structure name="IDR_OOBE_ENROLLMENT_WEBVIEW_JS" file="resources\chromeo s\login\oobe_screen_oauth_enrollment_webview.js" flattenhtml="true" type="chrome _html" />
71 <structure name="IDR_KEYBOARD_UTILS_JS" file="resources\chromeos\keyboar d\keyboard_utils.js" flattenhtml="true" type="chrome_html" /> 71 <structure name="IDR_KEYBOARD_UTILS_JS" file="resources\chromeos\keyboar d\keyboard_utils.js" flattenhtml="true" type="chrome_html" />
72 <structure name="IDR_CUSTOM_ELEMENTS_OOBE_HTML" file="resources\chromeos \login\custom_elements_oobe.html" flattenhtml="true" type="chrome_html" /> 72 <structure name="IDR_CUSTOM_ELEMENTS_OOBE_HTML" file="resources\chromeos \login\custom_elements_oobe.html" flattenhtml="true" type="chrome_html" />
73 <structure name="IDR_CUSTOM_ELEMENTS_OOBE_JS" file="resources\chromeos\l ogin\custom_elements_oobe.js" flattenhtml="true" type="chrome_html" /> 73 <structure name="IDR_CUSTOM_ELEMENTS_OOBE_JS" file="resources\chromeos\l ogin\custom_elements_oobe.js" flattenhtml="true" type="chrome_html" />
74 <structure name="IDR_CUSTOM_ELEMENTS_LOGIN_HTML" file="resources\chromeo s\login\custom_elements_login.html" flattenhtml="true" type="chrome_html" /> 74 <structure name="IDR_CUSTOM_ELEMENTS_LOGIN_HTML" file="resources\chromeo s\login\custom_elements_login.html" flattenhtml="true" type="chrome_html" />
75 <structure name="IDR_CUSTOM_ELEMENTS_LOGIN_JS" file="resources\chromeos\ login\custom_elements_login.js" flattenhtml="true" type="chrome_html" /> 75 <structure name="IDR_CUSTOM_ELEMENTS_LOGIN_JS" file="resources\chromeos\ login\custom_elements_login.js" flattenhtml="true" type="chrome_html" />
76 <structure name="IDR_POLYMER_CONFIG_JS" file="resources\chromeos\login\p olymer_config.js" flattenhtml="true" type="chrome_html" />
76 </if> 77 </if>
77 <structure name="IDR_READER_OUT_OF_DATE_HTML" file="resources\reader_out_o f_date.html" flattenhtml="true" type="chrome_html" /> 78 <structure name="IDR_READER_OUT_OF_DATE_HTML" file="resources\reader_out_o f_date.html" flattenhtml="true" type="chrome_html" />
78 <structure name="IDR_SECURITY_INTERSTITIAL_UI_HTML" file="resources\securi ty_warnings\interstitial_ui.html" flattenhtml="true" type="chrome_html" /> 79 <structure name="IDR_SECURITY_INTERSTITIAL_UI_HTML" file="resources\securi ty_warnings\interstitial_ui.html" flattenhtml="true" type="chrome_html" />
79 <structure name="IDR_SECURITY_INTERSTITIAL_HTML" file="resources\security_ warnings\interstitial_v2.html" flattenhtml="true" type="chrome_html" /> 80 <structure name="IDR_SECURITY_INTERSTITIAL_HTML" file="resources\security_ warnings\interstitial_v2.html" flattenhtml="true" type="chrome_html" />
80 </structures> 81 </structures>
81 <includes> 82 <includes>
82 <if expr="is_win"> 83 <if expr="is_win">
83 <include name="IDR_ABOUT_CONFLICTS_HTML" file="resources\about_conflicts .html" flattenhtml="true" allowexternalscript="true" type="BINDATA" /> 84 <include name="IDR_ABOUT_CONFLICTS_HTML" file="resources\about_conflicts .html" flattenhtml="true" allowexternalscript="true" type="BINDATA" />
84 <include name="IDR_ABOUT_CONFLICTS_JS" file="resources\about_conflicts.j s" type="BINDATA" /> 85 <include name="IDR_ABOUT_CONFLICTS_JS" file="resources\about_conflicts.j s" type="BINDATA" />
85 </if> 86 </if>
(...skipping 345 matching lines...) Expand 10 before | Expand all | Expand 10 after
431 </if> 432 </if>
432 <include name="IDR_WHISPERNET_PROXY_MANIFEST" file="resources\whispernet_p roxy\manifest.json" type="BINDATA" /> 433 <include name="IDR_WHISPERNET_PROXY_MANIFEST" file="resources\whispernet_p roxy\manifest.json" type="BINDATA" />
433 <include name="IDR_MD_SETTINGS_UI_HTML" file="resources\md_settings\md_set tings.html" type="BINDATA" /> 434 <include name="IDR_MD_SETTINGS_UI_HTML" file="resources\md_settings\md_set tings.html" type="BINDATA" />
434 <include name="IDR_MD_SETTINGS_UI_CSS" file="resources\md_settings\md_sett ings.css" type="BINDATA" /> 435 <include name="IDR_MD_SETTINGS_UI_CSS" file="resources\md_settings\md_sett ings.css" type="BINDATA" />
435 <if expr="enable_media_router"> 436 <if expr="enable_media_router">
436 <part file="media_router_resources.grdp" /> 437 <part file="media_router_resources.grdp" />
437 </if> 438 </if>
438 </includes> 439 </includes>
439 </release> 440 </release>
440 </grit> 441 </grit>
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/chromeos/login/login_browsertest.cc » ('j') | chrome/browser/resources/chromeos/login/controller-pairing-screen.html » ('J')

Powered by Google App Engine
This is Rietveld 408576698