chrome/browser/browser_resources.grd - Issue 22914008: Refactor kiosk app launch to be part of login screen UI flow.

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

Issue 22914008: Refactor kiosk app launch to be part of login screen UI flow. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Minor style fixes Created 7 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

OLD	NEW
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_MEMORY_CSS" file="resources\about_memory.css" t ype="chrome_html" />	21 <structure name="IDR_ABOUT_MEMORY_CSS" file="resources\about_memory.css" t ype="chrome_html" />

22 <structure name="IDR_ABOUT_VERSION_HTML" file="resources\about_version.htm l" flattenhtml="true" allowexternalscript="true" type="chrome_html" />	22 <structure name="IDR_ABOUT_VERSION_HTML" file="resources\about_version.htm l" flattenhtml="true" allowexternalscript="true" type="chrome_html" />

23 <if expr="is_android">	23 <if expr="is_android">

24 <structure name="IDR_ABOUT_WELCOME_HTML" file="resources\about_welcome_a ndroid\about_welcome_android.html" flattenhtml="true" type="chrome_html" />	24 <structure name="IDR_ABOUT_WELCOME_HTML" file="resources\about_welcome_a ndroid\about_welcome_android.html" flattenhtml="true" type="chrome_html" />

25 <structure name="IDR_ABOUT_WELCOME_CSS" file="resources\about_welcome_an droid\about_welcome_android.css" flattenhtml="true" type="chrome_html" />	25 <structure name="IDR_ABOUT_WELCOME_CSS" file="resources\about_welcome_an droid\about_welcome_android.css" flattenhtml="true" type="chrome_html" />

26 </if>	26 </if>

27 <if expr="pp_ifdef('chromeos')">	27 <if expr="pp_ifdef('chromeos')">

28 <structure name="IDR_DEMO_USER_LOGIN_HTML" file="resources\chromeos\logi n\demo_user_login.html" flattenhtml="true" type="chrome_html" />	28 <structure name="IDR_DEMO_USER_LOGIN_HTML" file="resources\chromeos\logi n\demo_user_login.html" flattenhtml="true" type="chrome_html" />

29 <structure name="IDR_DEMO_USER_LOGIN_JS" file="resources\chromeos\login\ demo_user_login.js" flattenhtml="true" type="chrome_html" />	29 <structure name="IDR_DEMO_USER_LOGIN_JS" file="resources\chromeos\login\ demo_user_login.js" flattenhtml="true" type="chrome_html" />

30 <structure name="IDR_APP_LAUNCH_SPLASH_HTML" file="resources\chromeos\ap p_launch\app_launch.html" flattenhtml="true" type="chrome_html" />

31 <structure name="IDR_APP_LAUNCH_SPLASH_JS" file="resources\chromeos\app_ launch\app_launch.js" flattenhtml="true" type="chrome_html" />

32 </if>	30 </if>

33 <structure name="IDR_DOWNLOADS_CSS" file="resources\downloads\downloads.cs s" flattenhtml="true" type="chrome_html" />	31 <structure name="IDR_DOWNLOADS_CSS" file="resources\downloads\downloads.cs s" flattenhtml="true" type="chrome_html" />

34 <structure name="IDR_DOWNLOADS_HTML" file="resources\downloads\downloads.h tml" flattenhtml="true" allowexternalscript="true" type="chrome_html" />	32 <structure name="IDR_DOWNLOADS_HTML" file="resources\downloads\downloads.h tml" flattenhtml="true" allowexternalscript="true" type="chrome_html" />

35 <structure name="IDR_EXTENSIONS_HTML" file="resources\extensions\extension s.html" flattenhtml="true" type="chrome_html" />	33 <structure name="IDR_EXTENSIONS_HTML" file="resources\extensions\extension s.html" flattenhtml="true" type="chrome_html" />

36 <structure name="IDR_HELP_CSS" file="resources\help\help.css" flattenhtml= "true" type="chrome_html" />	34 <structure name="IDR_HELP_CSS" file="resources\help\help.css" flattenhtml= "true" type="chrome_html" />

37 <structure name="IDR_HELP_HTML" file="resources\help\help.html" flattenhtm l="true" type="chrome_html" />	35 <structure name="IDR_HELP_HTML" file="resources\help\help.html" flattenhtm l="true" type="chrome_html" />

38 <structure name="IDR_HELP_CHANNEL_CHANGE_PAGE_CSS" file="resources\help\ch annel_change_page.css" flattenhtml="true" type="chrome_html" />	36 <structure name="IDR_HELP_CHANNEL_CHANGE_PAGE_CSS" file="resources\help\ch annel_change_page.css" flattenhtml="true" type="chrome_html" />

39 <structure name="IDR_HELP_CHANNEL_CHANGE_PAGE_HTML" file="resources\help\c hannel_change_page.html" flattenhtml="true" type="chrome_html" />	37 <structure name="IDR_HELP_CHANNEL_CHANGE_PAGE_HTML" file="resources\help\c hannel_change_page.html" flattenhtml="true" type="chrome_html" />

40 <structure name="IDR_INCOGNITO_TAB_HTML" file="resources\ntp4\incognito_ta b.html" flattenhtml="true" type="chrome_html" />	38 <structure name="IDR_INCOGNITO_TAB_HTML" file="resources\ntp4\incognito_ta b.html" flattenhtml="true" type="chrome_html" />

41 <structure name="IDR_GUEST_TAB_HTML" file="resources\ntp4\guest_tab.html" flattenhtml="true" type="chrome_html" />	39 <structure name="IDR_GUEST_TAB_HTML" file="resources\ntp4\guest_tab.html" flattenhtml="true" type="chrome_html" />

(...skipping 331 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
373 <include name="IDR_IDENTITY_INTERNALS_JS" file="resources\identity_inter nals.js" type="BINDATA" />	371 <include name="IDR_IDENTITY_INTERNALS_JS" file="resources\identity_inter nals.js" type="BINDATA" />

374 </if>	372 </if>

375 <if expr="pp_ifdef('chromeos')">	373 <if expr="pp_ifdef('chromeos')">

376 <include name="IDR_NETWORK_HTML" file="resources\chromeos\network.html" type="BINDATA" />	374 <include name="IDR_NETWORK_HTML" file="resources\chromeos\network.html" type="BINDATA" />

377 <include name="IDR_NETWORK_JS" file="resources\chromeos\network.js" type ="BINDATA" />	375 <include name="IDR_NETWORK_JS" file="resources\chromeos\network.js" type ="BINDATA" />

378 <include name="IDR_NETWORK_CSS" file="resources\chromeos\network.css" ty pe="BINDATA" />	376 <include name="IDR_NETWORK_CSS" file="resources\chromeos\network.css" ty pe="BINDATA" />

379 </if>	377 </if>

380 </includes>	378 </includes>

381 </release>	379 </release>

382 </grit>	380 </grit>

OLD	NEW

« no previous file with comments | « no previous file | chrome/browser/chromeos/app_mode/app_launch_utils.h » ('j') | chrome/browser/chromeos/app_mode/app_launch_utils.h » ('J')