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

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: Rebase and 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 17 matching lines...) Expand all
28 28
29 namespace { 29 namespace {
30 30
31 content::WebUIDataSource* CreateMdHistoryUIHTMLSource(Profile* profile) { 31 content::WebUIDataSource* CreateMdHistoryUIHTMLSource(Profile* profile) {
32 PrefService* prefs = profile->GetPrefs(); 32 PrefService* prefs = profile->GetPrefs();
33 33
34 content::WebUIDataSource* source = 34 content::WebUIDataSource* source =
35 content::WebUIDataSource::Create(chrome::kChromeUIHistoryHost); 35 content::WebUIDataSource::Create(chrome::kChromeUIHistoryHost);
36 36
37 // Localized strings (alphabetical order). 37 // Localized strings (alphabetical order).
38 source->AddLocalizedString("cancel", IDS_CANCEL);
38 source->AddLocalizedString("clearBrowsingData", 39 source->AddLocalizedString("clearBrowsingData",
39 IDS_CLEAR_BROWSING_DATA_TITLE); 40 IDS_CLEAR_BROWSING_DATA_TITLE);
40 source->AddLocalizedString("clearSearch", IDS_MD_HISTORY_CLEAR_SEARCH); 41 source->AddLocalizedString("clearSearch", IDS_MD_HISTORY_CLEAR_SEARCH);
41 source->AddLocalizedString("cancel", IDS_CANCEL);
42 source->AddLocalizedString("delete", IDS_MD_HISTORY_DELETE); 42 source->AddLocalizedString("delete", IDS_MD_HISTORY_DELETE);
43 source->AddLocalizedString("foundSearchResults",
44 IDS_HISTORY_FOUND_SEARCH_RESULTS);
43 source->AddLocalizedString("itemsSelected", IDS_MD_HISTORY_ITEMS_SELECTED); 45 source->AddLocalizedString("itemsSelected", IDS_MD_HISTORY_ITEMS_SELECTED);
44 source->AddLocalizedString("moreFromSite", IDS_HISTORY_MORE_FROM_SITE); 46 source->AddLocalizedString("moreFromSite", IDS_HISTORY_MORE_FROM_SITE);
47 source->AddLocalizedString("noResults", IDS_HISTORY_NO_RESULTS);
48 source->AddLocalizedString("noSearchResults", IDS_HISTORY_NO_SEARCH_RESULTS);
45 source->AddLocalizedString("removeFromHistory", IDS_HISTORY_REMOVE_PAGE); 49 source->AddLocalizedString("removeFromHistory", IDS_HISTORY_REMOVE_PAGE);
46 source->AddLocalizedString("search", IDS_MD_HISTORY_SEARCH); 50 source->AddLocalizedString("search", IDS_MD_HISTORY_SEARCH);
51 source->AddLocalizedString("searchResult", IDS_HISTORY_SEARCH_RESULT);
52 source->AddLocalizedString("searchResults", IDS_HISTORY_SEARCH_RESULTS);
47 source->AddLocalizedString("title", IDS_HISTORY_TITLE); 53 source->AddLocalizedString("title", IDS_HISTORY_TITLE);
48 54
49 bool allow_deleting_history = 55 bool allow_deleting_history =
50 prefs->GetBoolean(prefs::kAllowDeletingBrowserHistory); 56 prefs->GetBoolean(prefs::kAllowDeletingBrowserHistory);
51 source->AddBoolean("allowDeletingHistory", allow_deleting_history); 57 source->AddBoolean("allowDeletingHistory", allow_deleting_history);
52 source->AddResourcePath("history_item.html", 58 source->AddResourcePath("history_item.html",
53 IDR_MD_HISTORY_HISTORY_ITEM_HTML); 59 IDR_MD_HISTORY_HISTORY_ITEM_HTML);
54 source->AddResourcePath("history_item.js", IDR_MD_HISTORY_HISTORY_ITEM_JS); 60 source->AddResourcePath("history_item.js", IDR_MD_HISTORY_HISTORY_ITEM_JS);
55 source->AddResourcePath("history_list.html", 61 source->AddResourcePath("history_list.html",
56 IDR_MD_HISTORY_HISTORY_LIST_HTML); 62 IDR_MD_HISTORY_HISTORY_LIST_HTML);
(...skipping 28 matching lines...) Expand all
85 content::WebUIDataSource::Add(profile, CreateMdHistoryUIHTMLSource(profile)); 91 content::WebUIDataSource::Add(profile, CreateMdHistoryUIHTMLSource(profile));
86 } 92 }
87 93
88 MdHistoryUI::~MdHistoryUI() {} 94 MdHistoryUI::~MdHistoryUI() {}
89 95
90 base::RefCountedMemory* MdHistoryUI::GetFaviconResourceBytes( 96 base::RefCountedMemory* MdHistoryUI::GetFaviconResourceBytes(
91 ui::ScaleFactor scale_factor) { 97 ui::ScaleFactor scale_factor) {
92 return ResourceBundle::GetSharedInstance().LoadDataResourceBytesForScale( 98 return ResourceBundle::GetSharedInstance().LoadDataResourceBytesForScale(
93 IDR_HISTORY_FAVICON, scale_factor); 99 IDR_HISTORY_FAVICON, scale_factor);
94 } 100 }
OLDNEW
« no previous file with comments | « chrome/browser/resources/md_history/history_toolbar.js ('k') | chrome/test/data/webui/md_history/history_card_manager_test.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698