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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 10827169: [cros] OOBE slide animation. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge Created 8 years, 4 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 | Annotate | Revision Log
« no previous file with comments | « chrome/app/theme/default_200_percent/snapshot_wide.png ('k') | chrome/browser/chromeos/login/webui_login_display_host.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"> 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 <output filename="browser_resources.rc" type="rc_all" /> 8 <output filename="browser_resources.rc" type="rc_all" />
9 </outputs> 9 </outputs>
10 <release seq="1"> 10 <release seq="1">
11 <structures> 11 <structures>
12 <if expr="is_posix and not is_macosx"> 12 <if expr="is_posix and not is_macosx">
13 <structure name="IDR_ABOUT_MEMORY_HTML" file="resources\about_memory_lin ux.html" flattenhtml="true" type="chrome_html" /> 13 <structure name="IDR_ABOUT_MEMORY_HTML" file="resources\about_memory_lin ux.html" flattenhtml="true" type="chrome_html" />
14 </if> 14 </if>
15 <if expr="is_macosx"> 15 <if expr="is_macosx">
16 <structure name="IDR_ABOUT_MEMORY_HTML" file="resources\about_memory_mac .html" flattenhtml="true" type="chrome_html" /> 16 <structure name="IDR_ABOUT_MEMORY_HTML" file="resources\about_memory_mac .html" flattenhtml="true" type="chrome_html" />
17 </if> 17 </if>
18 <if expr="is_win"> 18 <if expr="is_win">
19 <structure name="IDR_ABOUT_MEMORY_HTML" file="resources\about_memory.htm l" flattenhtml="true" type="chrome_html" /> 19 <structure name="IDR_ABOUT_MEMORY_HTML" file="resources\about_memory.htm l" flattenhtml="true" type="chrome_html" />
20 </if> 20 </if>
21 <structure name="IDR_ABOUT_VERSION_HTML" file="resources\about_version.htm l" flattenhtml="true" allowexternalscript="true" type="chrome_html" /> 21 <structure name="IDR_ABOUT_VERSION_HTML" file="resources\about_version.htm l" flattenhtml="true" allowexternalscript="true" type="chrome_html" />
22 <if expr="pp_ifdef('chromeos')">
23 <structure name="IDR_DEMO_USER_LOGIN_HTML" file="resources\chromeos\logi n\demo_user_login.html" flattenhtml="true" type="chrome_html" />
24 </if>
22 <structure name="IDR_DOWNLOADS_CSS" file="resources\downloads\downloads.cs s" flattenhtml="true" type="chrome_html" /> 25 <structure name="IDR_DOWNLOADS_CSS" file="resources\downloads\downloads.cs s" flattenhtml="true" type="chrome_html" />
23 <structure name="IDR_DOWNLOADS_HTML" file="resources\downloads\downloads.h tml" flattenhtml="true" allowexternalscript="true" type="chrome_html" /> 26 <structure name="IDR_DOWNLOADS_HTML" file="resources\downloads\downloads.h tml" flattenhtml="true" allowexternalscript="true" type="chrome_html" />
24 <structure name="IDR_EXTENSIONS_HTML" file="resources\extensions\extension s.html" flattenhtml="true" type="chrome_html" /> 27 <structure name="IDR_EXTENSIONS_HTML" file="resources\extensions\extension s.html" flattenhtml="true" type="chrome_html" />
25 <structure name="IDR_HELP_CSS" file="resources\help\help.css" flattenhtml= "true" type="chrome_html" /> 28 <structure name="IDR_HELP_CSS" file="resources\help\help.css" flattenhtml= "true" type="chrome_html" />
26 <structure name="IDR_HELP_HTML" file="resources\help\help.html" flattenhtm l="true" type="chrome_html" /> 29 <structure name="IDR_HELP_HTML" file="resources\help\help.html" flattenhtm l="true" type="chrome_html" />
27 <structure name="IDR_INCOGNITO_TAB_HTML" file="resources\incognito_tab.htm l" flattenhtml="true" type="chrome_html" /> 30 <structure name="IDR_INCOGNITO_TAB_HTML" file="resources\incognito_tab.htm l" flattenhtml="true" type="chrome_html" />
31 <if expr="pp_ifdef('chromeos')">
32 <structure name="IDR_LOGIN_HTML" file="resources\chromeos\login\login.ht ml" flattenhtml="true" type="chrome_html" />
33 </if>
28 <structure name="IDR_NEW_INCOGNITO_TAB_THEME_CSS" file="resources\new_inco gnito_tab_theme.css" flattenhtml="true" type="chrome_html" /> 34 <structure name="IDR_NEW_INCOGNITO_TAB_THEME_CSS" file="resources\new_inco gnito_tab_theme.css" flattenhtml="true" type="chrome_html" />
29 <structure name="IDR_NEW_TAB_4_HTML" file="resources\ntp4\new_tab.html" fl attenhtml="true" type="chrome_html" /> 35 <structure name="IDR_NEW_TAB_4_HTML" file="resources\ntp4\new_tab.html" fl attenhtml="true" type="chrome_html" />
30 <structure name="IDR_NEW_TAB_4_THEME_CSS" file="resources\ntp4\new_tab_the me.css" flattenhtml="true" type="chrome_html" /> 36 <structure name="IDR_NEW_TAB_4_THEME_CSS" file="resources\ntp4\new_tab_the me.css" flattenhtml="true" type="chrome_html" />
31 <structure name="IDR_NEW_TAB_SEARCH_HTML" file="resources\ntp_search\new_t ab.html" flattenhtml="true" type="chrome_html" /> 37 <structure name="IDR_NEW_TAB_SEARCH_HTML" file="resources\ntp_search\new_t ab.html" flattenhtml="true" type="chrome_html" />
32 <structure name="IDR_NEW_TAB_SEARCH_THEME_CSS" file="resources\ntp_search\ new_tab_theme.css" flattenhtml="true" type="chrome_html" /> 38 <structure name="IDR_NEW_TAB_SEARCH_THEME_CSS" file="resources\ntp_search\ new_tab_theme.css" flattenhtml="true" type="chrome_html" />
39 <if expr="pp_ifdef('chromeos')">
40 <structure name="IDR_OOBE_HTML" file="resources\chromeos\login\oobe.html " flattenhtml="true" type="chrome_html" />
41 </if>
33 <structure name="IDR_READER_OUT_OF_DATE_HTML" file="resources\reader_out_o f_date.html" flattenhtml="true" type="chrome_html" /> 42 <structure name="IDR_READER_OUT_OF_DATE_HTML" file="resources\reader_out_o f_date.html" flattenhtml="true" type="chrome_html" />
34 <structure name="IDR_SSL_ERROR_HTML" file="resources\ssl_error.html" flatt enhtml="true" type="chrome_html" /> 43 <structure name="IDR_SSL_ERROR_HTML" file="resources\ssl_error.html" flatt enhtml="true" type="chrome_html" />
35 <structure name="IDR_SSL_ROAD_BLOCK_HTML" file="resources\ssl_roadblock.ht ml" flattenhtml="true" type="chrome_html" /> 44 <structure name="IDR_SSL_ROAD_BLOCK_HTML" file="resources\ssl_roadblock.ht ml" flattenhtml="true" type="chrome_html" />
36 </structures> 45 </structures>
37 <includes> 46 <includes>
38 <if expr="is_win"> 47 <if expr="is_win">
39 <include name="IDR_ABOUT_CONFLICTS_HTML" file="resources\about_conflicts .html" flattenhtml="true" allowexternalscript="true" type="BINDATA" /> 48 <include name="IDR_ABOUT_CONFLICTS_HTML" file="resources\about_conflicts .html" flattenhtml="true" allowexternalscript="true" type="BINDATA" />
40 <include name="IDR_ABOUT_CONFLICTS_JS" file="resources\about_conflicts.j s" type="BINDATA" /> 49 <include name="IDR_ABOUT_CONFLICTS_JS" file="resources\about_conflicts.j s" type="BINDATA" />
41 </if> 50 </if>
42 <include name="IDR_ABOUT_FLASH_HTML" file="resources\about_flash.html" fla ttenhtml="true" allowexternalscript="true" type="BINDATA" /> 51 <include name="IDR_ABOUT_FLASH_HTML" file="resources\about_flash.html" fla ttenhtml="true" allowexternalscript="true" type="BINDATA" />
(...skipping 148 matching lines...) Expand 10 before | Expand all | Expand 10 after
191 <include name="IDR_DRIVE_INTERNALS_JS" file="resources\chromeos\drive_in ternals.js" type="BINDATA" /> 200 <include name="IDR_DRIVE_INTERNALS_JS" file="resources\chromeos\drive_in ternals.js" type="BINDATA" />
192 <include name="IDR_GAIA_AUTH_MANIFEST" file="resources\gaia_auth\manifes t.json" type="BINDATA" /> 201 <include name="IDR_GAIA_AUTH_MANIFEST" file="resources\gaia_auth\manifes t.json" type="BINDATA" />
193 <include name="IDR_GAIA_TEST_AUTH_MANIFEST" file="resources\gaia_auth\ma nifest_test.json" type="BINDATA" /> 202 <include name="IDR_GAIA_TEST_AUTH_MANIFEST" file="resources\gaia_auth\ma nifest_test.json" type="BINDATA" />
194 <include name="IDR_GUEST_SESSION_TAB_HTML" file="resources\chromeos\gues t_session_tab.html" flattenhtml="true" type="BINDATA" /> 203 <include name="IDR_GUEST_SESSION_TAB_HTML" file="resources\chromeos\gues t_session_tab.html" flattenhtml="true" type="BINDATA" />
195 <include name="IDR_HOST_REGISTRATION_PAGE_HTML" file="resources\chromeos \host_registration_page.html" flattenhtml="true" type="BINDATA" /> 204 <include name="IDR_HOST_REGISTRATION_PAGE_HTML" file="resources\chromeos \host_registration_page.html" flattenhtml="true" type="BINDATA" />
196 <include name="IDR_IMAGEBURNER_HTML" file="resources\chromeos\image_burn er.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" /> 205 <include name="IDR_IMAGEBURNER_HTML" file="resources\chromeos\image_burn er.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" />
197 <include name="IDR_IMAGEBURNER_JS" file="resources\chromeos\image_burner .js" type="BINDATA" /> 206 <include name="IDR_IMAGEBURNER_JS" file="resources\chromeos\image_burner .js" type="BINDATA" />
198 <include name="IDR_KEYBOARD_OVERLAY_CSS" file="resources\chromeos\keyboa rd_overlay.css" flattenhtml="true" type="BINDATA" /> 207 <include name="IDR_KEYBOARD_OVERLAY_CSS" file="resources\chromeos\keyboa rd_overlay.css" flattenhtml="true" type="BINDATA" />
199 <include name="IDR_KEYBOARD_OVERLAY_HTML" file="resources\chromeos\keybo ard_overlay.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" / > 208 <include name="IDR_KEYBOARD_OVERLAY_HTML" file="resources\chromeos\keybo ard_overlay.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" / >
200 <include name="IDR_KEYBOARD_OVERLAY_JS" file="resources\chromeos\keyboar d_overlay.js" flattenhtml="true" type="BINDATA" /> 209 <include name="IDR_KEYBOARD_OVERLAY_JS" file="resources\chromeos\keyboar d_overlay.js" flattenhtml="true" type="BINDATA" />
201 <include name="IDR_LOGIN_HTML" file="resources\chromeos\login\login.html " flattenhtml="true" type="BINDATA" />
202 <include name="IDR_DEMO_USER_LOGIN_HTML" file="resources\chromeos\login\ demo_user_login.html" flattenhtml="true" type="BINDATA" />
203 <include name="IDR_MENU_HTML" file="resources\chromeos\menu.html" flatte nhtml="true" type="BINDATA" /> 210 <include name="IDR_MENU_HTML" file="resources\chromeos\menu.html" flatte nhtml="true" type="BINDATA" />
204 <include name="IDR_MOBILE_MANIFEST" file="resources\chromeos\mobile_app\ manifest.json" type="BINDATA" /> 211 <include name="IDR_MOBILE_MANIFEST" file="resources\chromeos\mobile_app\ manifest.json" type="BINDATA" />
205 <include name="IDR_MOBILE_SETUP_PAGE_HTML" file="resources\chromeos\mobi le_setup.html" flattenhtml="true" type="BINDATA" /> 212 <include name="IDR_MOBILE_SETUP_PAGE_HTML" file="resources\chromeos\mobi le_setup.html" flattenhtml="true" type="BINDATA" />
206 <include name="IDR_NETWORK_MENU_CSS" file="resources\chromeos\network_me nu.css" flattenhtml="true" type="BINDATA" /> 213 <include name="IDR_NETWORK_MENU_CSS" file="resources\chromeos\network_me nu.css" flattenhtml="true" type="BINDATA" />
207 <include name="IDR_NETWORK_MENU_JS" file="resources\chromeos\network_men u.js" flattenhtml="true" type="BINDATA" /> 214 <include name="IDR_NETWORK_MENU_JS" file="resources\chromeos\network_men u.js" flattenhtml="true" type="BINDATA" />
208 <include name="IDR_NOTIFICATION_ICON_LINK_HTML" file="resources\chromeos \notification_icon_link.html" type="BINDATA" /> 215 <include name="IDR_NOTIFICATION_ICON_LINK_HTML" file="resources\chromeos \notification_icon_link.html" type="BINDATA" />
209 <include name="IDR_ECHO_MANIFEST" file="resources\chromeos\echo\manifest .json" type="BINDATA" /> 216 <include name="IDR_ECHO_MANIFEST" file="resources\chromeos\echo\manifest .json" type="BINDATA" />
210 <include name="IDR_OFFLINE_LOAD_HTML" file="resources\chromeos\offline_l oad.html" flattenhtml="true" type="BINDATA" /> 217 <include name="IDR_OFFLINE_LOAD_HTML" file="resources\chromeos\offline_l oad.html" flattenhtml="true" type="BINDATA" />
211 <include name="IDR_OOBE_HTML" file="resources\chromeos\login\oobe.html" flattenhtml="true" type="BINDATA" />
212 <include name="IDR_OS_CREDITS_HTML" file="resources\chromeos\about_os_cr edits.html" flattenhtml="true" type="BINDATA" /> 218 <include name="IDR_OS_CREDITS_HTML" file="resources\chromeos\about_os_cr edits.html" flattenhtml="true" type="BINDATA" />
213 <include name="IDR_PROXY_SETTINGS_HTML" file="resources\chromeos\proxy_s ettings.html" flattenhtml="true" type="BINDATA" /> 219 <include name="IDR_PROXY_SETTINGS_HTML" file="resources\chromeos\proxy_s ettings.html" flattenhtml="true" type="BINDATA" />
214 <include name="IDR_SIM_UNLOCK_HTML" file="resources\chromeos\sim_unlock. html" flattenhtml="true" type="BINDATA" /> 220 <include name="IDR_SIM_UNLOCK_HTML" file="resources\chromeos\sim_unlock. html" flattenhtml="true" type="BINDATA" />
215 <include name="IDR_WRENCH_MENU_CSS" file="resources\chromeos\wrench_menu .css" flattenhtml="true" type="BINDATA" /> 221 <include name="IDR_WRENCH_MENU_CSS" file="resources\chromeos\wrench_menu .css" flattenhtml="true" type="BINDATA" />
216 <include name="IDR_WRENCH_MENU_JS" file="resources\chromeos\wrench_menu. js" flattenhtml="true" type="BINDATA" /> 222 <include name="IDR_WRENCH_MENU_JS" file="resources\chromeos\wrench_menu. js" flattenhtml="true" type="BINDATA" />
217 </if> 223 </if>
218 <if expr="pp_ifdef('file_manager_extension')"> 224 <if expr="pp_ifdef('file_manager_extension')">
219 <include name="IDR_FILEMANAGER_MANIFEST" file="resources\file_manager\ma nifest.json" type="BINDATA" /> 225 <include name="IDR_FILEMANAGER_MANIFEST" file="resources\file_manager\ma nifest.json" type="BINDATA" />
220 </if> 226 </if>
221 <if expr="pp_ifdef('chromeos')"> 227 <if expr="pp_ifdef('chromeos')">
(...skipping 11 matching lines...) Expand all
233 <include name="IDR_GESTURE_CONFIG_HTML" file="resources\gesture_config.h tml" type="BINDATA" /> 239 <include name="IDR_GESTURE_CONFIG_HTML" file="resources\gesture_config.h tml" type="BINDATA" />
234 <include name="IDR_GESTURE_CONFIG_JS" file="resources\gesture_config.js" type="BINDATA" /> 240 <include name="IDR_GESTURE_CONFIG_JS" file="resources\gesture_config.js" type="BINDATA" />
235 </if> 241 </if>
236 <if expr="is_win"> 242 <if expr="is_win">
237 <include name="IDR_SET_AS_DEFAULT_BROWSER_JS" file="resources\set_as_def ault_browser.js" flattenhtml="true" type="BINDATA" /> 243 <include name="IDR_SET_AS_DEFAULT_BROWSER_JS" file="resources\set_as_def ault_browser.js" flattenhtml="true" type="BINDATA" />
238 <include name="IDR_SET_AS_DEFAULT_BROWSER_HTML" file="resources\set_as_d efault_browser.html" flattenhtml="true" allowexternalscript="true" type="BINDATA " /> 244 <include name="IDR_SET_AS_DEFAULT_BROWSER_HTML" file="resources\set_as_d efault_browser.html" flattenhtml="true" allowexternalscript="true" type="BINDATA " />
239 </if> 245 </if>
240 </includes> 246 </includes>
241 </release> 247 </release>
242 </grit> 248 </grit>
OLDNEW
« no previous file with comments | « chrome/app/theme/default_200_percent/snapshot_wide.png ('k') | chrome/browser/chromeos/login/webui_login_display_host.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698