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

Unified Diff: chrome/browser/ui/webui/md_history_ui.cc

Issue 2235593002: Vulcanize MD History (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 4 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/vulcanize_readme.md ('k') | third_party/polymer/v1_0/reproduce.sh » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/webui/md_history_ui.cc
diff --git a/chrome/browser/ui/webui/md_history_ui.cc b/chrome/browser/ui/webui/md_history_ui.cc
index 01e7845d26a9a4eaa106c8f583736278ed1785a4..95317c57fc1bb2f5ad237e6faa3dc4c0a85b15be 100644
--- a/chrome/browser/ui/webui/md_history_ui.cc
+++ b/chrome/browser/ui/webui/md_history_ui.cc
@@ -114,6 +114,10 @@ content::WebUIDataSource* CreateMdHistoryUIHTMLSource(Profile* profile) {
signin_manager->IsAuthenticated();
source->AddBoolean("isUserSignedIn", is_authenticated);
+#if BUILDFLAG(USE_VULCANIZE)
+ source->AddResourcePath("crisper.js", IDR_MD_HISTORY_CRISPER_JS);
+ source->SetDefaultResource(IDR_MD_HISTORY_VULCANIZED_HTML);
+#else
source->AddResourcePath("app.html", IDR_MD_HISTORY_APP_HTML);
source->AddResourcePath("app.js", IDR_MD_HISTORY_APP_JS);
source->AddResourcePath("browser_service.html",
@@ -137,10 +141,6 @@ content::WebUIDataSource* CreateMdHistoryUIHTMLSource(Profile* profile) {
IDR_MD_HISTORY_HISTORY_TOOLBAR_JS);
source->AddResourcePath("history.js", IDR_MD_HISTORY_HISTORY_JS);
source->AddResourcePath("icons.html", IDR_MD_HISTORY_ICONS_HTML);
- source->AddResourcePath("images/100/sign_in_promo.png",
- IDR_MD_HISTORY_IMAGES_100_SIGN_IN_PROMO_PNG);
- source->AddResourcePath("images/200/sign_in_promo.png",
- IDR_MD_HISTORY_IMAGES_200_SIGN_IN_PROMO_PNG);
source->AddResourcePath("list_container.html",
IDR_MD_HISTORY_LIST_CONTAINER_HTML);
source->AddResourcePath("list_container.js",
@@ -161,8 +161,14 @@ content::WebUIDataSource* CreateMdHistoryUIHTMLSource(Profile* profile) {
IDR_MD_HISTORY_SYNCED_DEVICE_MANAGER_HTML);
source->AddResourcePath("synced_device_manager.js",
IDR_MD_HISTORY_SYNCED_DEVICE_MANAGER_JS);
-
source->SetDefaultResource(IDR_MD_HISTORY_HISTORY_HTML);
+#endif
+
+ source->AddResourcePath("images/100/sign_in_promo.png",
+ IDR_MD_HISTORY_IMAGES_100_SIGN_IN_PROMO_PNG);
+ source->AddResourcePath("images/200/sign_in_promo.png",
+ IDR_MD_HISTORY_IMAGES_200_SIGN_IN_PROMO_PNG);
+
source->SetJsonPath("strings.js");
return source;
« no previous file with comments | « chrome/browser/resources/vulcanize_readme.md ('k') | third_party/polymer/v1_0/reproduce.sh » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698