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

Unified Diff: chrome/browser/resources/settings/settings_resources.grd

Issue 1391933005: Elim defaultBrowser from settings on chromeos (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 5 years, 2 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/resources/settings/basic_page/basic_page.html ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/resources/settings/settings_resources.grd
diff --git a/chrome/browser/resources/settings/settings_resources.grd b/chrome/browser/resources/settings/settings_resources.grd
index ba83b63defc81a1201871958cbb1fc2875150589..70785765c5e7632da4252a66068a683328fe8294 100644
--- a/chrome/browser/resources/settings/settings_resources.grd
+++ b/chrome/browser/resources/settings/settings_resources.grd
@@ -194,17 +194,19 @@
<structure name="IDR_SETTINGS_CONTROLS_RADIO_GROUP_CSS"
file="controls/settings_radio_group.css"
type="chrome_html" />
- <structure name="IDR_SETTINGS_DEFAULT_BROWSER_PAGE_CSS"
- file="default_browser_page/default_browser_page.css"
- type="chrome_html" />
- <structure name="IDR_SETTINGS_DEFAULT_BROWSER_PAGE_HTML"
- file="default_browser_page/default_browser_page.html"
- type="chrome_html"
- flattenhtml="true"
- allowexternalscript="true" />
- <structure name="IDR_SETTINGS_DEFAULT_BROWSERE_PAGE_JS"
- file="default_browser_page/default_browser_page.js"
- type="chrome_html" />
+ <if expr="not chromeos">
+ <structure name="IDR_SETTINGS_DEFAULT_BROWSER_PAGE_CSS"
+ file="default_browser_page/default_browser_page.css"
+ type="chrome_html" />
+ <structure name="IDR_SETTINGS_DEFAULT_BROWSER_PAGE_HTML"
+ file="default_browser_page/default_browser_page.html"
+ type="chrome_html"
+ flattenhtml="true"
+ allowexternalscript="true" />
+ <structure name="IDR_SETTINGS_DEFAULT_BROWSERE_PAGE_JS"
+ file="default_browser_page/default_browser_page.js"
+ type="chrome_html" />
+ </if>
<structure name="IDR_SETTINGS_DOWNLOADS_PAGE_CSS"
file="downloads_page/downloads_page.css"
type="chrome_html" />
@@ -362,14 +364,16 @@
<structure name="IDR_SETTINGS_SEARCH_PAGE_CSS"
file="search_page/search_page.css"
type="chrome_html" />
- <structure name="IDR_SETTINGS_SIGNIN_PAGE_JS"
- file="signin_page/signin_page.js"
- type="chrome_html" />
- <structure name="IDR_SETTINGS_SIGNIN_PAGE_HTML"
- file="signin_page/signin_page.html"
- type="chrome_html"
- flattenhtml="true"
- allowexternalscript="true" />
+ <if expr="not chromeos">
+ <structure name="IDR_SETTINGS_SIGNIN_PAGE_JS"
+ file="signin_page/signin_page.js"
+ type="chrome_html" />
+ <structure name="IDR_SETTINGS_SIGNIN_PAGE_HTML"
+ file="signin_page/signin_page.html"
+ type="chrome_html"
+ flattenhtml="true"
+ allowexternalscript="true" />
+ </if>
<structure name="IDR_SETTINGS_SYNC_PAGE_JS"
file="sync_page/sync_page.js"
type="chrome_html" />
« no previous file with comments | « chrome/browser/resources/settings/basic_page/basic_page.html ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698