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

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

Issue 1607403004: MD History: Display synced tabs history (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@second_patch
Patch Set: Merged but tests not working everything else SEEMS ok Created 4 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
« no previous file with comments | « chrome/browser/resources/md_history/synced_device_manager.js ('k') | no next file » | 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 8f04fe4b0d665f2abcfa13d0077b90211373c3f0..a737c5c243ba6815b5fdd47d10c11134dbcb2dc2 100644
--- a/chrome/browser/ui/webui/md_history_ui.cc
+++ b/chrome/browser/ui/webui/md_history_ui.cc
@@ -39,10 +39,16 @@ content::WebUIDataSource* CreateMdHistoryUIHTMLSource(Profile* profile) {
IDS_CLEAR_BROWSING_DATA_TITLE);
source->AddLocalizedString("clearSearch", IDS_MD_HISTORY_CLEAR_SEARCH);
source->AddLocalizedString("cancel", IDS_CANCEL);
+ source->AddLocalizedString("clearSearch", IDS_MD_HISTORY_CLEAR_SEARCH);
+ source->AddLocalizedString("clearSearch", IDS_MD_HISTORY_CLEAR_SEARCH);
source->AddLocalizedString("delete", IDS_MD_HISTORY_DELETE);
source->AddLocalizedString("itemsSelected", IDS_MD_HISTORY_ITEMS_SELECTED);
source->AddLocalizedString("moreFromSite", IDS_HISTORY_MORE_FROM_SITE);
+ source->AddLocalizedString("moreFromSite", IDS_HISTORY_MORE_FROM_SITE);
+ source->AddLocalizedString("openAll", IDS_HISTORY_OTHER_SESSIONS_OPEN_ALL);
source->AddLocalizedString("removeFromHistory", IDS_HISTORY_REMOVE_PAGE);
+ source->AddLocalizedString("removeFromHistory", IDS_HISTORY_REMOVE_PAGE);
+ source->AddLocalizedString("search", IDS_MD_HISTORY_SEARCH);
source->AddLocalizedString("search", IDS_MD_HISTORY_SEARCH);
source->AddLocalizedString("title", IDS_HISTORY_TITLE);
@@ -60,6 +66,18 @@ content::WebUIDataSource* CreateMdHistoryUIHTMLSource(Profile* profile) {
source->AddResourcePath("history_toolbar.js",
IDR_MD_HISTORY_HISTORY_TOOLBAR_JS);
source->AddResourcePath("history.js", IDR_MD_HISTORY_HISTORY_JS);
+ source->AddResourcePath("shared_style.html",
+ IDR_MD_HISTORY_SHARED_STYLE_HTML);
+ source->AddResourcePath("side_bar.html", IDR_MD_HISTORY_SIDE_BAR_HTML);
+ source->AddResourcePath("side_bar.js", IDR_MD_HISTORY_SIDE_BAR_JS);
+ source->AddResourcePath("synced_device_card.html",
+ IDR_MD_HISTORY_SYNCED_DEVICE_CARD_HTML);
+ source->AddResourcePath("synced_device_card.js",
+ IDR_MD_HISTORY_SYNCED_DEVICE_CARD_JS);
+ source->AddResourcePath("synced_device_manager.html",
+ 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);
source->SetJsonPath("strings.js");
« no previous file with comments | « chrome/browser/resources/md_history/synced_device_manager.js ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698