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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 2874303003: Fork PIN keyboard assets and create additional flag for lock screen (Closed)
Patch Set: Address comments Created 3 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/chromeos/login/chrome_restart_request.cc » ('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" output_all_resource_defines= "false"> 2 <grit latest_public_release="0" current_release="1" output_all_resource_defines= "false">
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 28 matching lines...) Expand all
39 <structure name="IDR_HELP_PAGE_HTML" file="resources\help\help_page.html " flattenhtml="true" type="chrome_html" /> 39 <structure name="IDR_HELP_PAGE_HTML" file="resources\help\help_page.html " flattenhtml="true" type="chrome_html" />
40 <structure name="IDR_HELP_CHANNEL_CHANGE_PAGE_CSS" file="resources\help\ channel_change_page.css" flattenhtml="true" type="chrome_html" /> 40 <structure name="IDR_HELP_CHANNEL_CHANGE_PAGE_CSS" file="resources\help\ channel_change_page.css" flattenhtml="true" type="chrome_html" />
41 <structure name="IDR_HELP_CHANNEL_CHANGE_PAGE_HTML" file="resources\help \channel_change_page.html" flattenhtml="true" type="chrome_html" /> 41 <structure name="IDR_HELP_CHANNEL_CHANGE_PAGE_HTML" file="resources\help \channel_change_page.html" flattenhtml="true" type="chrome_html" />
42 <structure name="IDR_INCOGNITO_TAB_HTML" file="resources\ntp4\incognito_ tab.html" flattenhtml="true" type="chrome_html" /> 42 <structure name="IDR_INCOGNITO_TAB_HTML" file="resources\ntp4\incognito_ tab.html" flattenhtml="true" type="chrome_html" />
43 <structure name="IDR_MD_INCOGNITO_TAB_HTML" file="resources\ntp4\md_inco gnito_tab.html" flattenhtml="true" type="chrome_html" /> 43 <structure name="IDR_MD_INCOGNITO_TAB_HTML" file="resources\ntp4\md_inco gnito_tab.html" flattenhtml="true" type="chrome_html" />
44 <structure name="IDR_GUEST_TAB_HTML" file="resources\ntp4\guest_tab.html " flattenhtml="true" type="chrome_html" /> 44 <structure name="IDR_GUEST_TAB_HTML" file="resources\ntp4\guest_tab.html " flattenhtml="true" type="chrome_html" />
45 </if> 45 </if>
46 <if expr="chromeos"> 46 <if expr="chromeos">
47 <structure name="IDR_LOCK_HTML" file="resources\chromeos\login\lock.html " flattenhtml="true" type="chrome_html" variables="OOBE=lock" expand_variables=" true"/> 47 <structure name="IDR_LOCK_HTML" file="resources\chromeos\login\lock.html " flattenhtml="true" type="chrome_html" variables="OOBE=lock" expand_variables=" true"/>
48 <structure name="IDR_LOCK_JS" file="resources\chromeos\login\lock.js" fl attenhtml="true" type="chrome_html" variables="OOBE=lock" expand_variables="true " /> 48 <structure name="IDR_LOCK_JS" file="resources\chromeos\login\lock.js" fl attenhtml="true" type="chrome_html" variables="OOBE=lock" expand_variables="true " />
49 <structure name="IDR_MD_LOCK_HTML" file="resources\chromeos\login\md_loc k.html" flattenhtml="true" type="chrome_html" variables="OOBE=md_lock" expand_va riables="true"/>
50 <structure name="IDR_MD_LOCK_JS" file="resources\chromeos\login\md_lock. js" flattenhtml="true" type="chrome_html" />
49 <structure name="IDR_LOGIN_HTML" file="resources\chromeos\login\login.ht ml" flattenhtml="true" type="chrome_html" variables="OOBE=login" expand_variable s="true"/> 51 <structure name="IDR_LOGIN_HTML" file="resources\chromeos\login\login.ht ml" flattenhtml="true" type="chrome_html" variables="OOBE=login" expand_variable s="true"/>
50 <structure name="IDR_LOGIN_JS" file="resources\chromeos\login\login.js" flattenhtml="true" type="chrome_html" /> 52 <structure name="IDR_LOGIN_JS" file="resources\chromeos\login\login.js" flattenhtml="true" type="chrome_html" />
51 <structure name="IDR_MD_LOGIN_HTML" file="resources\chromeos\login\md_lo gin.html" flattenhtml="true" type="chrome_html" variables="OOBE=md_login" expand _variables="true"/> 53 <structure name="IDR_MD_LOGIN_HTML" file="resources\chromeos\login\md_lo gin.html" flattenhtml="true" type="chrome_html" variables="OOBE=md_login" expand _variables="true"/>
52 <structure name="IDR_MD_LOGIN_JS" file="resources\chromeos\login\md_logi n.js" flattenhtml="true" type="chrome_html" /> 54 <structure name="IDR_MD_LOGIN_JS" file="resources\chromeos\login\md_logi n.js" flattenhtml="true" type="chrome_html" />
53 </if> 55 </if>
54 <if expr="not is_android"> 56 <if expr="not is_android">
55 <structure name="IDR_NEW_INCOGNITO_TAB_THEME_CSS" file="resources\ntp4\n ew_incognito_tab_theme.css" flattenhtml="true" type="chrome_html" /> 57 <structure name="IDR_NEW_INCOGNITO_TAB_THEME_CSS" file="resources\ntp4\n ew_incognito_tab_theme.css" flattenhtml="true" type="chrome_html" />
56 <structure name="IDR_NEW_TAB_4_HTML" file="resources\ntp4\new_tab.html" flattenhtml="true" type="chrome_html" /> 58 <structure name="IDR_NEW_TAB_4_HTML" file="resources\ntp4\new_tab.html" flattenhtml="true" type="chrome_html" />
57 <structure name="IDR_NEW_TAB_4_THEME_CSS" file="resources\ntp4\new_tab_t heme.css" flattenhtml="true" type="chrome_html" /> 59 <structure name="IDR_NEW_TAB_4_THEME_CSS" file="resources\ntp4\new_tab_t heme.css" flattenhtml="true" type="chrome_html" />
58 </if> 60 </if>
59 <if expr="chromeos"> 61 <if expr="chromeos">
60 <structure name="IDR_OOBE_HTML" file="resources\chromeos\login\oobe.html " flattenhtml="true" type="chrome_html" variables="OOBE=oobe" expand_variables=" true"/> 62 <structure name="IDR_OOBE_HTML" file="resources\chromeos\login\oobe.html " flattenhtml="true" type="chrome_html" variables="OOBE=oobe" expand_variables=" true"/>
61 <structure name="IDR_OOBE_JS" file="resources\chromeos\login\oobe.js" fl attenhtml="true" type="chrome_html" /> 63 <structure name="IDR_OOBE_JS" file="resources\chromeos\login\oobe.js" fl attenhtml="true" type="chrome_html" />
62 <structure name="IDR_OOBE_ENROLLMENT_HTML" file="resources\chromeos\logi n\oobe_screen_oauth_enrollment.html" flattenhtml="true" type="chrome_html" /> 64 <structure name="IDR_OOBE_ENROLLMENT_HTML" file="resources\chromeos\logi n\oobe_screen_oauth_enrollment.html" flattenhtml="true" type="chrome_html" />
63 <structure name="IDR_OOBE_ENROLLMENT_CSS" file="resources\chromeos\login \oobe_screen_oauth_enrollment.css" flattenhtml="true" type="chrome_html" /> 65 <structure name="IDR_OOBE_ENROLLMENT_CSS" file="resources\chromeos\login \oobe_screen_oauth_enrollment.css" flattenhtml="true" type="chrome_html" />
64 <structure name="IDR_OOBE_ENROLLMENT_JS" file="resources\chromeos\login\ oobe_screen_oauth_enrollment.js" flattenhtml="true" type="chrome_html" /> 66 <structure name="IDR_OOBE_ENROLLMENT_JS" file="resources\chromeos\login\ oobe_screen_oauth_enrollment.js" flattenhtml="true" type="chrome_html" />
65 <structure name="IDR_KEYBOARD_UTILS_JS" file="resources\chromeos\keyboar d\keyboard_utils.js" flattenhtml="true" type="chrome_html" /> 67 <structure name="IDR_KEYBOARD_UTILS_JS" file="resources\chromeos\keyboar d\keyboard_utils.js" flattenhtml="true" type="chrome_html" />
66 <structure name="IDR_CUSTOM_ELEMENTS_OOBE_HTML" file="resources\chromeos \login\custom_elements_oobe.html" flattenhtml="true" type="chrome_html" /> 68 <structure name="IDR_CUSTOM_ELEMENTS_OOBE_HTML" file="resources\chromeos \login\custom_elements_oobe.html" flattenhtml="true" type="chrome_html" />
67 <structure name="IDR_CUSTOM_ELEMENTS_OOBE_JS" file="resources\chromeos\l ogin\custom_elements_oobe.js" flattenhtml="true" type="chrome_html" /> 69 <structure name="IDR_CUSTOM_ELEMENTS_OOBE_JS" file="resources\chromeos\l ogin\custom_elements_oobe.js" flattenhtml="true" type="chrome_html" />
68 <structure name="IDR_CUSTOM_ELEMENTS_LOCK_HTML" file="resources\chromeos \login\custom_elements_lock.html" flattenhtml="true" type="chrome_html" /> 70 <structure name="IDR_CUSTOM_ELEMENTS_LOCK_HTML" file="resources\chromeos \login\custom_elements_lock.html" flattenhtml="true" type="chrome_html" />
69 <structure name="IDR_CUSTOM_ELEMENTS_LOCK_JS" file="resources\chromeos\l ogin\custom_elements_lock.js" flattenhtml="true" type="chrome_html" /> 71 <structure name="IDR_CUSTOM_ELEMENTS_LOCK_JS" file="resources\chromeos\l ogin\custom_elements_lock.js" flattenhtml="true" type="chrome_html" />
70 <structure name="IDR_CUSTOM_ELEMENTS_USER_POD_HTML" file="resources\chro meos\login\custom_elements_user_pod.html" flattenhtml="true" type="chrome_html" /> 72 <structure name="IDR_CUSTOM_ELEMENTS_USER_POD_HTML" file="resources\chro meos\login\custom_elements_user_pod.html" flattenhtml="true" type="chrome_html" />
71 <structure name="IDR_CUSTOM_ELEMENTS_LOGIN_HTML" file="resources\chromeo s\login\custom_elements_login.html" flattenhtml="true" type="chrome_html" /> 73 <structure name="IDR_CUSTOM_ELEMENTS_LOGIN_HTML" file="resources\chromeo s\login\custom_elements_login.html" flattenhtml="true" type="chrome_html" />
72 <structure name="IDR_CUSTOM_ELEMENTS_LOGIN_JS" file="resources\chromeos\ login\custom_elements_login.js" flattenhtml="true" type="chrome_html" /> 74 <structure name="IDR_CUSTOM_ELEMENTS_LOGIN_JS" file="resources\chromeos\ login\custom_elements_login.js" flattenhtml="true" type="chrome_html" />
73 <structure name="IDR_CUSTOM_ELEMENTS_PIN_KEYBOARD_HTML" file="resources\ chromeos\quick_unlock\pin_keyboard.html" flattenhtml="true" allowexternalscript= "true" type="chrome_html" /> 75 <structure name="IDR_CUSTOM_ELEMENTS_PIN_KEYBOARD_HTML" file="resources\ chromeos\quick_unlock\pin_keyboard.html" flattenhtml="true" allowexternalscript= "true" type="chrome_html" />
74 <structure name="IDR_CUSTOM_ELEMENTS_PIN_KEYBOARD_JS" file="resources\ch romeos\quick_unlock\pin_keyboard.js" type="chrome_html" /> 76 <structure name="IDR_CUSTOM_ELEMENTS_PIN_KEYBOARD_JS" file="resources\ch romeos\quick_unlock\pin_keyboard.js" type="chrome_html" />
77 <structure name="IDR_MD_CUSTOM_ELEMENTS_PIN_KEYBOARD_HTML" file="resourc es\chromeos\quick_unlock\md_pin_keyboard.html" flattenhtml="true" allowexternals cript="true" type="chrome_html" />
78 <structure name="IDR_MD_CUSTOM_ELEMENTS_PIN_KEYBOARD_JS" file="resources \chromeos\quick_unlock\md_pin_keyboard.js" type="chrome_html" />
75 </if> 79 </if>
76 <structure name="IDR_SIGNIN_SHARED_CSS_HTML" file="resources\signin\signin _shared_css.html" preprocess="true" allowexternalscript="true" type="chrome_html " /> 80 <structure name="IDR_SIGNIN_SHARED_CSS_HTML" file="resources\signin\signin _shared_css.html" preprocess="true" allowexternalscript="true" type="chrome_html " />
77 <if expr="not is_android and not is_ios and not chromeos"> 81 <if expr="not is_android and not is_ios and not chromeos">
78 <structure name="IDR_WELCOME_CSS" file="resources\welcome\welcome.css" t ype="chrome_html" preprocess="true"/> 82 <structure name="IDR_WELCOME_CSS" file="resources\welcome\welcome.css" t ype="chrome_html" preprocess="true"/>
79 <structure name="IDR_WELCOME_HTML" file="resources\welcome\welcome.html" type="chrome_html" preprocess="true"/> 83 <structure name="IDR_WELCOME_HTML" file="resources\welcome\welcome.html" type="chrome_html" preprocess="true"/>
80 <structure name="IDR_WELCOME_JS" file="resources\welcome\welcome.js" typ e="chrome_html" preprocess="true"/> 84 <structure name="IDR_WELCOME_JS" file="resources\welcome\welcome.js" typ e="chrome_html" preprocess="true"/>
81 </if> 85 </if>
82 <if expr="is_win"> 86 <if expr="is_win">
83 <structure name="IDR_WELCOME_WIN10_INLINE_CSS" file="resources\welcome\w in10\inline.css" type="chrome_html" /> 87 <structure name="IDR_WELCOME_WIN10_INLINE_CSS" file="resources\welcome\w in10\inline.css" type="chrome_html" />
84 <structure name="IDR_WELCOME_WIN10_INLINE_HTML" file="resources\welcome\ win10\inline.html" type="chrome_html" /> 88 <structure name="IDR_WELCOME_WIN10_INLINE_HTML" file="resources\welcome\ win10\inline.html" type="chrome_html" />
(...skipping 571 matching lines...) Expand 10 before | Expand all | Expand 10 after
656 <if expr="not is_android and not is_ios"> 660 <if expr="not is_android and not is_ios">
657 <include name="IDR_SSL_ERROR_ASSISTANT_PB" file="${root_gen_dir}/chrome/ browser/resources/ssl/ssl_error_assistant/ssl_error_assistant.pb" use_base_dir=" false" type="BINDATA" /> 661 <include name="IDR_SSL_ERROR_ASSISTANT_PB" file="${root_gen_dir}/chrome/ browser/resources/ssl/ssl_error_assistant/ssl_error_assistant.pb" use_base_dir=" false" type="BINDATA" />
658 </if> 662 </if>
659 <if expr="is_android or is_linux"> 663 <if expr="is_android or is_linux">
660 <include name="IDR_SANDBOX_INTERNALS_HTML" file="resources\sandbox_inter nals\sandbox_internals.html" flattenhtml="true" allowexternalscript="true" type= "BINDATA" compress="gzip" /> 664 <include name="IDR_SANDBOX_INTERNALS_HTML" file="resources\sandbox_inter nals\sandbox_internals.html" flattenhtml="true" allowexternalscript="true" type= "BINDATA" compress="gzip" />
661 <include name="IDR_SANDBOX_INTERNALS_JS" file="resources\sandbox_interna ls\sandbox_internals.js" type="BINDATA" compress="gzip" /> 665 <include name="IDR_SANDBOX_INTERNALS_JS" file="resources\sandbox_interna ls\sandbox_internals.js" type="BINDATA" compress="gzip" />
662 </if> 666 </if>
663 </includes> 667 </includes>
664 </release> 668 </release>
665 </grit> 669 </grit>
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/chromeos/login/chrome_restart_request.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698