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

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

Issue 1572383006: MD History: Hook all elements into the page and add tests. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@patch
Patch Set: Rebase. Created 4 years, 11 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/md_history/history_toolbar.js ('k') | chrome/chrome_tests.gypi » ('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 69deed7678de73e10000f0910882cc2ed66d542a..49ae383b54b02cc0f74db484d3b45afaadb31b0e 100644
--- a/chrome/browser/ui/webui/md_history_ui.cc
+++ b/chrome/browser/ui/webui/md_history_ui.cc
@@ -15,6 +15,7 @@
#include "grit/browser_resources.h"
#include "grit/components_scaled_resources.h"
#include "grit/components_strings.h"
+#include "grit/generated_resources.h"
#include "grit/theme_resources.h"
#include "ui/base/resource/resource_bundle.h"
@@ -30,9 +31,27 @@ content::WebUIDataSource* CreateMdHistoryUIHTMLSource() {
content::WebUIDataSource::Create(chrome::kChromeUIHistoryHost);
// Localized strings (alphabetical order).
+ source->AddLocalizedString("clearSearch", IDS_MD_HISTORY_CLEAR_SEARCH);
+ source->AddLocalizedString("moreFromSite", IDS_HISTORY_MORE_FROM_SITE);
+ source->AddLocalizedString("removeFromHistory", IDS_HISTORY_REMOVE_PAGE);
+ source->AddLocalizedString("search", IDS_MD_HISTORY_SEARCH);
source->AddLocalizedString("title", IDS_HISTORY_TITLE);
- // TODO(tsergeant): File resources (alphabetical order).
+ source->AddResourcePath("history_card.html",
+ IDR_MD_HISTORY_HISTORY_CARD_HTML);
+ source->AddResourcePath("history_card.js", IDR_MD_HISTORY_HISTORY_CARD_JS);
+ source->AddResourcePath("history_card_manager.html",
+ IDR_MD_HISTORY_HISTORY_CARD_MANAGER_HTML);
+ source->AddResourcePath("history_card_manager.js",
+ IDR_MD_HISTORY_HISTORY_CARD_MANAGER_JS);
+ source->AddResourcePath("history_item.html",
+ IDR_MD_HISTORY_HISTORY_ITEM_HTML);
+ source->AddResourcePath("history_item.js", IDR_MD_HISTORY_HISTORY_ITEM_JS);
+ source->AddResourcePath("history_toolbar.html",
+ IDR_MD_HISTORY_HISTORY_TOOLBAR_HTML);
+ source->AddResourcePath("history_toolbar.js",
+ IDR_MD_HISTORY_HISTORY_TOOLBAR_JS);
+ source->AddResourcePath("history.js", IDR_MD_HISTORY_HISTORY_JS);
source->SetDefaultResource(IDR_MD_HISTORY_HISTORY_HTML);
source->SetJsonPath("strings.js");
« no previous file with comments | « chrome/browser/resources/md_history/history_toolbar.js ('k') | chrome/chrome_tests.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698