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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 2518233004: MD Settings: Move settings-advanced-page into settings-basic-page (Closed)
Patch Set: rebase/fix line lengths Created 4 years 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
« chrome/browser/resources/settings/basic_page/basic_page.js ('K') | « chrome/browser/resources/settings/settings_page/main_page_behavior.js ('k') | chrome/test/data/webui/settings/advanced_page_browsertest.js » ('j') | 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 4f04c098d9ee0aa154049174f680d3c2d28f4373..00ad33842e08140491f9f72dfc9b13d0ecf9c5d1 100644
--- a/chrome/browser/resources/settings/settings_resources.grd
+++ b/chrome/browser/resources/settings/settings_resources.grd
@@ -65,15 +65,6 @@
<structure name="IDR_SETTINGS_ADD_SITE_DIALOG_JS"
file="site_settings/add_site_dialog.js"
type="chrome_html" />
- <structure name="IDR_SETTINGS_ADVANCED_PAGE_JS"
- file="advanced_page/advanced_page.js"
- flattenhtml="true"
- type="chrome_html" />
- <structure name="IDR_SETTINGS_ADVANCED_PAGE_HTML"
- file="advanced_page/advanced_page.html"
- type="chrome_html"
- flattenhtml="true"
- allowexternalscript="true" />
<structure name="IDR_SETTINGS_ALL_SITES_HTML"
file="site_settings/all_sites.html"
type="chrome_html" />
@@ -123,6 +114,7 @@
flattenhtml="true" />
<structure name="IDR_SETTINGS_BASIC_PAGE_JS"
file="basic_page/basic_page.js"
+ flattenhtml="true"
type="chrome_html" />
<structure name="IDR_SETTINGS_BASIC_PAGE_HTML"
file="basic_page/basic_page.html"
« chrome/browser/resources/settings/basic_page/basic_page.js ('K') | « chrome/browser/resources/settings/settings_page/main_page_behavior.js ('k') | chrome/test/data/webui/settings/advanced_page_browsertest.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698