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

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

Issue 2700983003: Revert of WebUI: Vulcanize MD Settings at compile time. (Closed)
Patch Set: Created 3 years, 10 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
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 2cd4c0bfdc1bf2f109920ff2e17d0dbd6fde5d5d..e5a9ae4d0adaf3aeaa57dfc4fe659f1708d1261c 100644
--- a/chrome/browser/ui/webui/settings/md_settings_ui.cc
+++ b/chrome/browser/ui/webui/settings/md_settings_ui.cc
@@ -190,20 +190,14 @@
// Add the metrics handler to write uma stats.
web_ui->AddMessageHandler(base::MakeUnique<MetricsHandler>());
-#if BUILDFLAG(USE_VULCANIZE)
- html_source->AddResourcePath("crisper.js", IDR_MD_SETTINGS_CRISPER_JS);
- html_source->SetDefaultResource(IDR_MD_SETTINGS_VULCANIZED_HTML);
- html_source->UseGzip(std::unordered_set<std::string>());
-#else
// Add all settings resources.
for (size_t i = 0; i < kSettingsResourcesSize; ++i) {
html_source->AddResourcePath(kSettingsResources[i].name,
kSettingsResources[i].value);
}
+
+ AddLocalizedStrings(html_source, profile);
html_source->SetDefaultResource(IDR_SETTINGS_SETTINGS_HTML);
-#endif
-
- AddLocalizedStrings(html_source, profile);
content::WebUIDataSource::Add(web_ui->GetWebContents()->GetBrowserContext(),
html_source);
« no previous file with comments | « chrome/browser/resources/settings/settings_resources_vulcanized.grd ('k') | tools/gritsettings/resource_ids » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698