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

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

Issue 1641543002: MD History: Refactored design for displaying history information (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@second_patch
Patch Set: concat -> push 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 22 matching lines...) Expand all
33 // Localized strings (alphabetical order). 33 // Localized strings (alphabetical order).
34 source->AddLocalizedString("clearSearch", IDS_MD_HISTORY_CLEAR_SEARCH); 34 source->AddLocalizedString("clearSearch", IDS_MD_HISTORY_CLEAR_SEARCH);
35 source->AddLocalizedString("cancel", IDS_CANCEL); 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("itemsSelected", IDS_MD_HISTORY_ITEMS_SELECTED); 37 source->AddLocalizedString("itemsSelected", IDS_MD_HISTORY_ITEMS_SELECTED);
38 source->AddLocalizedString("moreFromSite", IDS_HISTORY_MORE_FROM_SITE); 38 source->AddLocalizedString("moreFromSite", IDS_HISTORY_MORE_FROM_SITE);
39 source->AddLocalizedString("removeFromHistory", IDS_HISTORY_REMOVE_PAGE); 39 source->AddLocalizedString("removeFromHistory", IDS_HISTORY_REMOVE_PAGE);
40 source->AddLocalizedString("search", IDS_MD_HISTORY_SEARCH); 40 source->AddLocalizedString("search", IDS_MD_HISTORY_SEARCH);
41 source->AddLocalizedString("title", IDS_HISTORY_TITLE); 41 source->AddLocalizedString("title", IDS_HISTORY_TITLE);
42 42
43 source->AddResourcePath("history_card.html",
44 IDR_MD_HISTORY_HISTORY_CARD_HTML);
45 source->AddResourcePath("history_card.js", IDR_MD_HISTORY_HISTORY_CARD_JS);
46 source->AddResourcePath("history_card_manager.html",
47 IDR_MD_HISTORY_HISTORY_CARD_MANAGER_HTML);
48 source->AddResourcePath("history_card_manager.js",
49 IDR_MD_HISTORY_HISTORY_CARD_MANAGER_JS);
50 source->AddResourcePath("history_item.html", 43 source->AddResourcePath("history_item.html",
51 IDR_MD_HISTORY_HISTORY_ITEM_HTML); 44 IDR_MD_HISTORY_HISTORY_ITEM_HTML);
52 source->AddResourcePath("history_item.js", IDR_MD_HISTORY_HISTORY_ITEM_JS); 45 source->AddResourcePath("history_item.js", IDR_MD_HISTORY_HISTORY_ITEM_JS);
46 source->AddResourcePath("history_list.html",
47 IDR_MD_HISTORY_HISTORY_LIST_HTML);
48 source->AddResourcePath("history_list.js", IDR_MD_HISTORY_HISTORY_LIST_JS);
53 source->AddResourcePath("history_toolbar.html", 49 source->AddResourcePath("history_toolbar.html",
54 IDR_MD_HISTORY_HISTORY_TOOLBAR_HTML); 50 IDR_MD_HISTORY_HISTORY_TOOLBAR_HTML);
55 source->AddResourcePath("history_toolbar.js", 51 source->AddResourcePath("history_toolbar.js",
56 IDR_MD_HISTORY_HISTORY_TOOLBAR_JS); 52 IDR_MD_HISTORY_HISTORY_TOOLBAR_JS);
57 source->AddResourcePath("history.js", IDR_MD_HISTORY_HISTORY_JS); 53 source->AddResourcePath("history.js", IDR_MD_HISTORY_HISTORY_JS);
58 54
59 source->SetDefaultResource(IDR_MD_HISTORY_HISTORY_HTML); 55 source->SetDefaultResource(IDR_MD_HISTORY_HISTORY_HTML);
60 source->SetJsonPath("strings.js"); 56 source->SetJsonPath("strings.js");
61 57
62 return source; 58 return source;
(...skipping 17 matching lines...) Expand all
80 content::WebUIDataSource::Add(profile, CreateMdHistoryUIHTMLSource()); 76 content::WebUIDataSource::Add(profile, CreateMdHistoryUIHTMLSource());
81 } 77 }
82 78
83 MdHistoryUI::~MdHistoryUI() {} 79 MdHistoryUI::~MdHistoryUI() {}
84 80
85 base::RefCountedMemory* MdHistoryUI::GetFaviconResourceBytes( 81 base::RefCountedMemory* MdHistoryUI::GetFaviconResourceBytes(
86 ui::ScaleFactor scale_factor) { 82 ui::ScaleFactor scale_factor) {
87 return ResourceBundle::GetSharedInstance().LoadDataResourceBytesForScale( 83 return ResourceBundle::GetSharedInstance().LoadDataResourceBytesForScale(
88 IDR_HISTORY_FAVICON, scale_factor); 84 IDR_HISTORY_FAVICON, scale_factor);
89 } 85 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698