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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 1933913002: Add a very basic PIN UI implementation that is shared between lock and settings. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@lkgr
Patch Set: Fix tests by removing a previously unused import that started getting used b/c of resource loader c… Created 4 years, 7 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/resources/chromeos/compiled_resources.gyp » ('j') | no next file with comments »
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 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
59 <structure name="IDR_OOBE_ENROLLMENT_HTML" file="resources\chromeos\logi n\oobe_screen_oauth_enrollment.html" flattenhtml="true" type="chrome_html" /> 59 <structure name="IDR_OOBE_ENROLLMENT_HTML" file="resources\chromeos\logi n\oobe_screen_oauth_enrollment.html" flattenhtml="true" type="chrome_html" />
60 <structure name="IDR_OOBE_ENROLLMENT_CSS" file="resources\chromeos\login \oobe_screen_oauth_enrollment.css" flattenhtml="true" type="chrome_html" /> 60 <structure name="IDR_OOBE_ENROLLMENT_CSS" file="resources\chromeos\login \oobe_screen_oauth_enrollment.css" flattenhtml="true" type="chrome_html" />
61 <structure name="IDR_OOBE_ENROLLMENT_JS" file="resources\chromeos\login\ oobe_screen_oauth_enrollment.js" flattenhtml="true" type="chrome_html" /> 61 <structure name="IDR_OOBE_ENROLLMENT_JS" file="resources\chromeos\login\ oobe_screen_oauth_enrollment.js" flattenhtml="true" type="chrome_html" />
62 <structure name="IDR_KEYBOARD_UTILS_JS" file="resources\chromeos\keyboar d\keyboard_utils.js" flattenhtml="true" type="chrome_html" /> 62 <structure name="IDR_KEYBOARD_UTILS_JS" file="resources\chromeos\keyboar d\keyboard_utils.js" flattenhtml="true" type="chrome_html" />
63 <structure name="IDR_CUSTOM_ELEMENTS_OOBE_HTML" file="resources\chromeos \login\custom_elements_oobe.html" flattenhtml="true" type="chrome_html" /> 63 <structure name="IDR_CUSTOM_ELEMENTS_OOBE_HTML" file="resources\chromeos \login\custom_elements_oobe.html" flattenhtml="true" type="chrome_html" />
64 <structure name="IDR_CUSTOM_ELEMENTS_OOBE_JS" file="resources\chromeos\l ogin\custom_elements_oobe.js" flattenhtml="true" type="chrome_html" /> 64 <structure name="IDR_CUSTOM_ELEMENTS_OOBE_JS" file="resources\chromeos\l ogin\custom_elements_oobe.js" flattenhtml="true" type="chrome_html" />
65 <structure name="IDR_CUSTOM_ELEMENTS_LOCK_HTML" file="resources\chromeos \login\custom_elements_lock.html" flattenhtml="true" type="chrome_html" /> 65 <structure name="IDR_CUSTOM_ELEMENTS_LOCK_HTML" file="resources\chromeos \login\custom_elements_lock.html" flattenhtml="true" type="chrome_html" />
66 <structure name="IDR_CUSTOM_ELEMENTS_LOCK_JS" file="resources\chromeos\l ogin\custom_elements_lock.js" flattenhtml="true" type="chrome_html" /> 66 <structure name="IDR_CUSTOM_ELEMENTS_LOCK_JS" file="resources\chromeos\l ogin\custom_elements_lock.js" flattenhtml="true" type="chrome_html" />
67 <structure name="IDR_CUSTOM_ELEMENTS_LOGIN_HTML" file="resources\chromeo s\login\custom_elements_login.html" flattenhtml="true" type="chrome_html" /> 67 <structure name="IDR_CUSTOM_ELEMENTS_LOGIN_HTML" file="resources\chromeo s\login\custom_elements_login.html" flattenhtml="true" type="chrome_html" />
68 <structure name="IDR_CUSTOM_ELEMENTS_LOGIN_JS" file="resources\chromeos\ login\custom_elements_login.js" flattenhtml="true" type="chrome_html" /> 68 <structure name="IDR_CUSTOM_ELEMENTS_LOGIN_JS" file="resources\chromeos\ login\custom_elements_login.js" flattenhtml="true" type="chrome_html" />
69 <structure name="IDR_CUSTOM_ELEMENTS_PIN_KEYBOARD_HTML" file="resources\ chromeos\quick_unlock\pin_keyboard.html" flattenhtml="true" allowexternalscript= "true" type="chrome_html" />
70 <structure name="IDR_CUSTOM_ELEMENTS_PIN_KEYBOARD_JS" file="resources\ch romeos\quick_unlock\pin_keyboard.js" type="chrome_html" />
69 </if> 71 </if>
70 <structure name="IDR_READER_OUT_OF_DATE_HTML" file="resources\reader_out_o f_date.html" flattenhtml="true" type="chrome_html" /> 72 <structure name="IDR_READER_OUT_OF_DATE_HTML" file="resources\reader_out_o f_date.html" flattenhtml="true" type="chrome_html" />
71 </structures> 73 </structures>
72 <includes> 74 <includes>
73 <if expr="is_win"> 75 <if expr="is_win">
74 <include name="IDR_ABOUT_CONFLICTS_HTML" file="resources\about_conflicts .html" flattenhtml="true" allowexternalscript="true" type="BINDATA" /> 76 <include name="IDR_ABOUT_CONFLICTS_HTML" file="resources\about_conflicts .html" flattenhtml="true" allowexternalscript="true" type="BINDATA" />
75 <include name="IDR_ABOUT_CONFLICTS_JS" file="resources\about_conflicts.j s" type="BINDATA" /> 77 <include name="IDR_ABOUT_CONFLICTS_JS" file="resources\about_conflicts.j s" type="BINDATA" />
76 </if> 78 </if>
77 <if expr="enable_plugins"> 79 <if expr="enable_plugins">
78 <include name="IDR_ABOUT_FLASH_HTML" file="resources\about_flash.html" f lattenhtml="true" allowexternalscript="true" type="BINDATA" /> 80 <include name="IDR_ABOUT_FLASH_HTML" file="resources\about_flash.html" f lattenhtml="true" allowexternalscript="true" type="BINDATA" />
(...skipping 431 matching lines...) Expand 10 before | Expand all | Expand 10 after
510 <part file="media_router_resources.grdp" /> 512 <part file="media_router_resources.grdp" />
511 </if> 513 </if>
512 <if expr="not is_android and not is_ios and not chromeos"> 514 <if expr="not is_android and not is_ios and not chromeos">
513 <include name="IDR_IME_WINDOW_CLOSE" file="resources\input_ime\ime_windo w_close.png" type="BINDATA" /> 515 <include name="IDR_IME_WINDOW_CLOSE" file="resources\input_ime\ime_windo w_close.png" type="BINDATA" />
514 <include name="IDR_IME_WINDOW_CLOSE_C" file="resources\input_ime\ime_win dow_close_click.png" type="BINDATA" /> 516 <include name="IDR_IME_WINDOW_CLOSE_C" file="resources\input_ime\ime_win dow_close_click.png" type="BINDATA" />
515 <include name="IDR_IME_WINDOW_CLOSE_H" file="resources\input_ime\ime_win dow_close_hover.png" type="BINDATA" /> 517 <include name="IDR_IME_WINDOW_CLOSE_H" file="resources\input_ime\ime_win dow_close_hover.png" type="BINDATA" />
516 </if> 518 </if>
517 </includes> 519 </includes>
518 </release> 520 </release>
519 </grit> 521 </grit>
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/resources/chromeos/compiled_resources.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698