Chromium Code Reviews| 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 f7084edb36aefb8b4587d91674102e959c121a28..cc9a9242da82940a01c233b7a7866c27531f23dc 100644 |
| --- a/chrome/browser/ui/webui/md_history_ui.cc |
| +++ b/chrome/browser/ui/webui/md_history_ui.cc |
| @@ -14,6 +14,7 @@ |
| #include "content/public/browser/web_ui_data_source.h" |
| #include "grit/browser_resources.h" |
| #include "grit/components_strings.h" |
| +#include "grit/generated_resources.h" |
| #include "grit/theme_resources.h" |
| #include "ui/base/resource/resource_bundle.h" |
| @@ -29,9 +30,27 @@ content::WebUIDataSource* CreateMdHistoryUIHTMLSource() { |
| content::WebUIDataSource::Create(chrome::kChromeUIHistoryHost); |
| // Localized strings (alphabetical order). |
| + source->AddLocalizedString("moreFromSite", IDS_HISTORY_MORE_FROM_SITE); |
|
tsergeant
2016/01/19 03:43:46
Can you sort these, please?
hsampson
2016/01/19 03:56:50
Done, thank you.
|
| + source->AddLocalizedString("removeFromHistory", IDS_HISTORY_REMOVE_PAGE); |
| source->AddLocalizedString("title", IDS_HISTORY_TITLE); |
| + source->AddLocalizedString("clearSearch", IDS_MD_HISTORY_CLEAR_SEARCH); |
| + source->AddLocalizedString("search", IDS_MD_HISTORY_SEARCH); |
| - // 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"); |