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

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: Address reviewer's 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 19 matching lines...) Expand all
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("clearSearch", IDS_MD_HISTORY_CLEAR_SEARCH); 34 source->AddLocalizedString("clearSearch", IDS_MD_HISTORY_CLEAR_SEARCH);
35 source->AddLocalizedString("moreFromSite", IDS_HISTORY_MORE_FROM_SITE); 35 source->AddLocalizedString("moreFromSite", IDS_HISTORY_MORE_FROM_SITE);
36 source->AddLocalizedString("removeFromHistory", IDS_HISTORY_REMOVE_PAGE); 36 source->AddLocalizedString("removeFromHistory", IDS_HISTORY_REMOVE_PAGE);
37 source->AddLocalizedString("search", IDS_MD_HISTORY_SEARCH); 37 source->AddLocalizedString("search", IDS_MD_HISTORY_SEARCH);
38 source->AddLocalizedString("title", IDS_HISTORY_TITLE); 38 source->AddLocalizedString("title", IDS_HISTORY_TITLE);
39 39
40 source->AddResourcePath("history_card.html",
41 IDR_MD_HISTORY_HISTORY_CARD_HTML);
42 source->AddResourcePath("history_card.js", IDR_MD_HISTORY_HISTORY_CARD_JS);
43 source->AddResourcePath("history_card_manager.html",
44 IDR_MD_HISTORY_HISTORY_CARD_MANAGER_HTML);
45 source->AddResourcePath("history_card_manager.js",
46 IDR_MD_HISTORY_HISTORY_CARD_MANAGER_JS);
47 source->AddResourcePath("history_item.html", 40 source->AddResourcePath("history_item.html",
48 IDR_MD_HISTORY_HISTORY_ITEM_HTML); 41 IDR_MD_HISTORY_HISTORY_ITEM_HTML);
49 source->AddResourcePath("history_item.js", IDR_MD_HISTORY_HISTORY_ITEM_JS); 42 source->AddResourcePath("history_item.js", IDR_MD_HISTORY_HISTORY_ITEM_JS);
43 source->AddResourcePath("history_list.html",
44 IDR_MD_HISTORY_HISTORY_LIST_HTML);
45 source->AddResourcePath("history_list.js", IDR_MD_HISTORY_HISTORY_LIST_JS);
50 source->AddResourcePath("history_toolbar.html", 46 source->AddResourcePath("history_toolbar.html",
51 IDR_MD_HISTORY_HISTORY_TOOLBAR_HTML); 47 IDR_MD_HISTORY_HISTORY_TOOLBAR_HTML);
52 source->AddResourcePath("history_toolbar.js", 48 source->AddResourcePath("history_toolbar.js",
53 IDR_MD_HISTORY_HISTORY_TOOLBAR_JS); 49 IDR_MD_HISTORY_HISTORY_TOOLBAR_JS);
54 source->AddResourcePath("history.js", IDR_MD_HISTORY_HISTORY_JS); 50 source->AddResourcePath("history.js", IDR_MD_HISTORY_HISTORY_JS);
55 51
56 source->SetDefaultResource(IDR_MD_HISTORY_HISTORY_HTML); 52 source->SetDefaultResource(IDR_MD_HISTORY_HISTORY_HTML);
57 source->SetJsonPath("strings.js"); 53 source->SetJsonPath("strings.js");
58 54
59 return source; 55 return source;
(...skipping 17 matching lines...) Expand all
77 content::WebUIDataSource::Add(profile, CreateMdHistoryUIHTMLSource()); 73 content::WebUIDataSource::Add(profile, CreateMdHistoryUIHTMLSource());
78 } 74 }
79 75
80 MdHistoryUI::~MdHistoryUI() {} 76 MdHistoryUI::~MdHistoryUI() {}
81 77
82 base::RefCountedMemory* MdHistoryUI::GetFaviconResourceBytes( 78 base::RefCountedMemory* MdHistoryUI::GetFaviconResourceBytes(
83 ui::ScaleFactor scale_factor) { 79 ui::ScaleFactor scale_factor) {
84 return ResourceBundle::GetSharedInstance().LoadDataResourceBytesForScale( 80 return ResourceBundle::GetSharedInstance().LoadDataResourceBytesForScale(
85 IDR_HISTORY_FAVICON, scale_factor); 81 IDR_HISTORY_FAVICON, scale_factor);
86 } 82 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698