chrome/browser/ui/webui/md_history_ui.cc - Issue 1729263005: MD History: Display synced tabs history.

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

Issue 1729263005: MD History: Display synced tabs history. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@mdh_shared_styles

Patch Set: address comments Created 4 years, 9 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

« chrome/browser/resources/md_history/synced_device.html ('K') | « chrome/browser/resources/md_history/synced_device_manager.js ('k') | chrome/test/data/webui/md_history/history_synced_tabs_test.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | 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 c093657540e4fce2e6b57125bf47e4447da71fb0..54f94797ee15592854244d782f5ae815dfa4bf47 100644

--- a/chrome/browser/ui/webui/md_history_ui.cc

+++ b/chrome/browser/ui/webui/md_history_ui.cc

@@ -32,13 +32,18 @@ content::WebUIDataSource* CreateMdHistoryUIHTMLSource(Profile* profile) {

content::WebUIDataSource::Create(chrome::kChromeUIHistoryHost);

// Localized strings (alphabetical order).

+ source->AddLocalizedString("cancel", IDS_CANCEL);

source->AddLocalizedString("clearBrowsingData",

IDS_CLEAR_BROWSING_DATA_TITLE);

source->AddLocalizedString("clearSearch", IDS_MD_HISTORY_CLEAR_SEARCH);

- source->AddLocalizedString("cancel", IDS_CANCEL);

source->AddLocalizedString("delete", IDS_MD_HISTORY_DELETE);

+ source->AddLocalizedString("historyMenuItem",

+ IDS_MD_HISTORY_HISTORY_MENU_ITEM);

source->AddLocalizedString("itemsSelected", IDS_MD_HISTORY_ITEMS_SELECTED);

source->AddLocalizedString("moreFromSite", IDS_HISTORY_MORE_FROM_SITE);

+ source->AddLocalizedString("openAll", IDS_HISTORY_OTHER_SESSIONS_OPEN_ALL);

+ source->AddLocalizedString("openTabsMenuItem",

+ IDS_MD_HISTORY_OPEN_TABS_MENU_ITEM);

source->AddLocalizedString("removeFromHistory", IDS_HISTORY_REMOVE_PAGE);

source->AddLocalizedString("search", IDS_MD_HISTORY_SEARCH);

source->AddLocalizedString("title", IDS_HISTORY_TITLE);

@@ -59,6 +64,16 @@ content::WebUIDataSource* CreateMdHistoryUIHTMLSource(Profile* profile) {

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",

tsergeant 2016/03/09 04:36:50 We should make sure that our chrome:// paths match

calamity 2016/03/10 04:18:24 N/A

+ IDR_MD_HISTORY_SYNCED_DEVICE_HTML);

+ source->AddResourcePath("synced_device_card.js",

+ IDR_MD_HISTORY_SYNCED_DEVICE_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");