| Index: chrome/browser/browser_resources.grd
|
| diff --git a/chrome/browser/browser_resources.grd b/chrome/browser/browser_resources.grd
|
| index 28acfba4e9f294b1a296fc5efba39f2bd1e146f2..977b96c299e911e6a1c4cf369918ea372ef4e6e6 100644
|
| --- a/chrome/browser/browser_resources.grd
|
| +++ b/chrome/browser/browser_resources.grd
|
| @@ -9,10 +9,10 @@
|
| </outputs>
|
| <release seq="1">
|
| <structures>
|
| - <if expr="is_posix and not is_macosx">
|
| + <if expr="is_posix and not is_macosx and not is_ios">
|
| <structure name="IDR_ABOUT_MEMORY_HTML" file="resources\about_memory_linux.html" flattenhtml="true" type="chrome_html" />
|
| </if>
|
| - <if expr="is_macosx">
|
| + <if expr="is_macosx or is_ios">
|
| <structure name="IDR_ABOUT_MEMORY_HTML" file="resources\about_memory_mac.html" flattenhtml="true" type="chrome_html" />
|
| </if>
|
| <if expr="is_win">
|
| @@ -55,10 +55,10 @@
|
| <if expr="pp_ifdef('chromeos')">
|
| <structure name="IDR_OOBE_HTML" file="resources\chromeos\login\oobe.html" flattenhtml="true" type="chrome_html" variables="OOBE=oobe" expand_variables="true"/>
|
| <structure name="IDR_OOBE_JS" file="resources\chromeos\login\oobe.js" flattenhtml="true" type="chrome_html" />
|
| - <structure name="IDR_OOBE_RESOURCE_LOADER_JS" file="resources\chromeos\login\resource_loader.js" flattenhtml="true" type="chrome_html" />
|
| - <structure name="IDR_OOBE_ENROLLMENT_HTML" file="resources\chromeos\login\oobe_screen_oauth_enrollment.html" flattenhtml="true" type="chrome_html" />
|
| - <structure name="IDR_OOBE_ENROLLMENT_CSS" file="resources\chromeos\login\oobe_screen_oauth_enrollment.css" flattenhtml="true" type="chrome_html" />
|
| - <structure name="IDR_OOBE_ENROLLMENT_JS" file="resources\chromeos\login\oobe_screen_oauth_enrollment.js" flattenhtml="true" type="chrome_html" />
|
| + <structure name="IDR_OOBE_RESOURCE_LOADER_JS" file="resources\chromeos\login\resource_loader.js" flattenhtml="true" type="chrome_html" />
|
| + <structure name="IDR_OOBE_ENROLLMENT_HTML" file="resources\chromeos\login\oobe_screen_oauth_enrollment.html" flattenhtml="true" type="chrome_html" />
|
| + <structure name="IDR_OOBE_ENROLLMENT_CSS" file="resources\chromeos\login\oobe_screen_oauth_enrollment.css" flattenhtml="true" type="chrome_html" />
|
| + <structure name="IDR_OOBE_ENROLLMENT_JS" file="resources\chromeos\login\oobe_screen_oauth_enrollment.js" flattenhtml="true" type="chrome_html" />
|
| <structure name="IDR_KEYBOARD_UTILS_JS" file="resources\chromeos\keyboard\keyboard_utils.js" flattenhtml="true" type="chrome_html" />
|
| </if>
|
| <structure name="IDR_READER_OUT_OF_DATE_HTML" file="resources\reader_out_of_date.html" flattenhtml="true" type="chrome_html" />
|
| @@ -87,7 +87,7 @@
|
| </if>
|
| <include name="IDR_BOOKMARKS_MANIFEST" file="resources\bookmark_manager\manifest.json" type="BINDATA" />
|
| <include name="IDR_APPS_DEBUGGER_MANIFEST" file="resources\apps_debugger\manifest.json" type="BINDATA" />
|
| - <if expr="is_posix and not is_macosx">
|
| + <if expr="is_posix and not is_macosx and not is_ios">
|
| <include name="IDR_CERTIFICATE_VIEWER_HTML" file="resources\certificate_viewer.html" type="BINDATA" />
|
| <include name="IDR_CERTIFICATE_VIEWER_JS" file="resources\certificate_viewer.js" type="BINDATA" />
|
| <include name="IDR_CERTIFICATE_VIEWER_CSS" file="resources\certificate_viewer.css" type="BINDATA" />
|
| @@ -205,8 +205,7 @@
|
| </if>
|
| <include name="IDR_POLICY_HTML" file="resources\policy.html" flattenhtml="true" allowexternalscript="true" type="BINDATA"/>
|
| <include name="IDR_POLICY_JS" file="resources\policy.js" type="BINDATA"/>
|
| - <include name="IDR_PRERENDER_URL_WHITELIST"
|
| - file="resources\prerender_url_whitelist.dat" type="BINDATA"/>
|
| + <include name="IDR_PRERENDER_URL_WHITELIST" file="resources\prerender_url_whitelist.dat" type="BINDATA"/>
|
| <if expr="pp_ifdef('enable_printing')">
|
| <include name="IDR_PRINT_PREVIEW_HTML" file="resources\print_preview\print_preview.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" />
|
| <include name="IDR_PRINT_PREVIEW_PAGE" file="resources\print_preview\print_preview_page.html" flattenhtml="true" allowexternalscript="false" type="BINDATA" />
|
| @@ -356,7 +355,7 @@
|
| <include name="IDR_SET_AS_DEFAULT_BROWSER_JS" file="resources\set_as_default_browser.js" flattenhtml="true" type="BINDATA" />
|
| <include name="IDR_SET_AS_DEFAULT_BROWSER_HTML" file="resources\set_as_default_browser.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" />
|
| </if>
|
| - <if expr="not is_android and not pp_ifdef('ios') and not pp_ifdef('chromeos')">
|
| + <if expr="not is_android and not is_ios and not pp_ifdef('chromeos')">
|
| <include name="IDR_USER_MANAGER_JS" file="resources\user_manager\user_manager.js" flattenhtml="true" type="BINDATA" />
|
| <include name="IDR_USER_MANAGER_HTML" file="resources\user_manager\user_manager.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" />
|
| </if>
|
|
|