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

Unified Diff: chrome/browser/ui/webui/settings/md_settings_ui.cc

Issue 2513673005: Vulcanize Settings (Closed)
Patch Set: don't error on applied patch Created 4 years, 1 month 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/vulcanize.py ('k') | patch_vulcanize.sh » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/webui/settings/md_settings_ui.cc
diff --git a/chrome/browser/ui/webui/settings/md_settings_ui.cc b/chrome/browser/ui/webui/settings/md_settings_ui.cc
index e8764b2b0ae1b9acdda6a4377224287e7da7c8e9..a77b19233aaa00fb0cd4934edbbc510b0c67590f 100644
--- a/chrome/browser/ui/webui/settings/md_settings_ui.cc
+++ b/chrome/browser/ui/webui/settings/md_settings_ui.cc
@@ -140,14 +140,20 @@ MdSettingsUI::MdSettingsUI(content::WebUI* web_ui, const GURL& url)
AddSettingsPageUIHandler(AboutHandler::Create(html_source, profile));
AddSettingsPageUIHandler(ResetSettingsHandler::Create(html_source, profile));
+#if BUILDFLAG(USE_VULCANIZE)
+ html_source->AddResourcePath("crisper.js",
+ IDR_SETTINGS_CRISPER_JS);
+ html_source->SetDefaultResource(IDR_SETTINGS_VULCANIZED_HTML);
+#else
// Add all settings resources.
for (size_t i = 0; i < kSettingsResourcesSize; ++i) {
html_source->AddResourcePath(kSettingsResources[i].name,
kSettingsResources[i].value);
}
+ html_source->SetDefaultResource(IDR_SETTINGS_SETTINGS_HTML);
+#endif
AddLocalizedStrings(html_source, profile);
- html_source->SetDefaultResource(IDR_SETTINGS_SETTINGS_HTML);
content::WebUIDataSource::Add(web_ui->GetWebContents()->GetBrowserContext(),
html_source);
« no previous file with comments | « chrome/browser/resources/settings/vulcanize.py ('k') | patch_vulcanize.sh » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698