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

Side by Side Diff: chrome/browser/ui/webui/md_history_ui.cc

Issue 1643693003: MD History: Implement search functionality. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@patch_to_be_uploaded
Patch Set: Address reviewer comments. 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 unified diff | Download patch
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/ui/webui/md_history_ui.h" 5 #include "chrome/browser/ui/webui/md_history_ui.h"
6 6
7 #include "build/build_config.h" 7 #include "build/build_config.h"
8 #include "chrome/browser/profiles/profile.h" 8 #include "chrome/browser/profiles/profile.h"
9 #include "chrome/browser/ui/webui/browsing_history_handler.h" 9 #include "chrome/browser/ui/webui/browsing_history_handler.h"
10 #include "chrome/browser/ui/webui/metrics_handler.h" 10 #include "chrome/browser/ui/webui/metrics_handler.h"
(...skipping 13 matching lines...) Expand all
24 #include "chrome/browser/ui/webui/history_login_handler.h" 24 #include "chrome/browser/ui/webui/history_login_handler.h"
25 #endif 25 #endif
26 26
27 namespace { 27 namespace {
28 28
29 content::WebUIDataSource* CreateMdHistoryUIHTMLSource() { 29 content::WebUIDataSource* CreateMdHistoryUIHTMLSource() {
30 content::WebUIDataSource* source = 30 content::WebUIDataSource* source =
31 content::WebUIDataSource::Create(chrome::kChromeUIHistoryHost); 31 content::WebUIDataSource::Create(chrome::kChromeUIHistoryHost);
32 32
33 // Localized strings (alphabetical order). 33 // Localized strings (alphabetical order).
34 source->AddLocalizedString("cancel", IDS_CANCEL);
34 source->AddLocalizedString("clearSearch", IDS_MD_HISTORY_CLEAR_SEARCH); 35 source->AddLocalizedString("clearSearch", IDS_MD_HISTORY_CLEAR_SEARCH);
35 source->AddLocalizedString("cancel", IDS_CANCEL);
36 source->AddLocalizedString("delete", IDS_MD_HISTORY_DELETE); 36 source->AddLocalizedString("delete", IDS_MD_HISTORY_DELETE);
37 source->AddLocalizedString("foundSearchResults",
38 IDS_HISTORY_FOUND_SEARCH_RESULTS);
37 source->AddLocalizedString("itemsSelected", IDS_MD_HISTORY_ITEMS_SELECTED); 39 source->AddLocalizedString("itemsSelected", IDS_MD_HISTORY_ITEMS_SELECTED);
38 source->AddLocalizedString("moreFromSite", IDS_HISTORY_MORE_FROM_SITE); 40 source->AddLocalizedString("moreFromSite", IDS_HISTORY_MORE_FROM_SITE);
41 source->AddLocalizedString("noResults", IDS_HISTORY_NO_RESULTS);
42 source->AddLocalizedString("noSearchResults", IDS_HISTORY_NO_SEARCH_RESULTS);
39 source->AddLocalizedString("removeFromHistory", IDS_HISTORY_REMOVE_PAGE); 43 source->AddLocalizedString("removeFromHistory", IDS_HISTORY_REMOVE_PAGE);
40 source->AddLocalizedString("search", IDS_MD_HISTORY_SEARCH); 44 source->AddLocalizedString("search", IDS_MD_HISTORY_SEARCH);
45 source->AddLocalizedString("searchResult", IDS_HISTORY_SEARCH_RESULT);
46 source->AddLocalizedString("searchResults", IDS_HISTORY_SEARCH_RESULTS);
41 source->AddLocalizedString("title", IDS_HISTORY_TITLE); 47 source->AddLocalizedString("title", IDS_HISTORY_TITLE);
42 48
43 source->AddResourcePath("history_card.html", 49 source->AddResourcePath("history_card.html",
44 IDR_MD_HISTORY_HISTORY_CARD_HTML); 50 IDR_MD_HISTORY_HISTORY_CARD_HTML);
45 source->AddResourcePath("history_card.js", IDR_MD_HISTORY_HISTORY_CARD_JS); 51 source->AddResourcePath("history_card.js", IDR_MD_HISTORY_HISTORY_CARD_JS);
46 source->AddResourcePath("history_card_manager.html", 52 source->AddResourcePath("history_card_manager.html",
47 IDR_MD_HISTORY_HISTORY_CARD_MANAGER_HTML); 53 IDR_MD_HISTORY_HISTORY_CARD_MANAGER_HTML);
48 source->AddResourcePath("history_card_manager.js", 54 source->AddResourcePath("history_card_manager.js",
49 IDR_MD_HISTORY_HISTORY_CARD_MANAGER_JS); 55 IDR_MD_HISTORY_HISTORY_CARD_MANAGER_JS);
50 source->AddResourcePath("history_item.html", 56 source->AddResourcePath("history_item.html",
(...skipping 29 matching lines...) Expand all
80 content::WebUIDataSource::Add(profile, CreateMdHistoryUIHTMLSource()); 86 content::WebUIDataSource::Add(profile, CreateMdHistoryUIHTMLSource());
81 } 87 }
82 88
83 MdHistoryUI::~MdHistoryUI() {} 89 MdHistoryUI::~MdHistoryUI() {}
84 90
85 base::RefCountedMemory* MdHistoryUI::GetFaviconResourceBytes( 91 base::RefCountedMemory* MdHistoryUI::GetFaviconResourceBytes(
86 ui::ScaleFactor scale_factor) { 92 ui::ScaleFactor scale_factor) {
87 return ResourceBundle::GetSharedInstance().LoadDataResourceBytesForScale( 93 return ResourceBundle::GetSharedInstance().LoadDataResourceBytesForScale(
88 IDR_HISTORY_FAVICON, scale_factor); 94 IDR_HISTORY_FAVICON, scale_factor);
89 } 95 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698