Skip to content

GitLab

T
tangled
Commit 154417d3 authored by estade@chromium.org's avatar estade@chromium.org
Browse files
Options

convert history page to loadTimeData 

BUG=122753
TEST=manual


Review URL: http://codereview.chromium.org/10238016

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@134577 0039d316-1c4b-4281-b951-d872f2087c98
parent 33acd002
Hide whitespace changes
Inline Side-by-side
Showing with 14 additions and 18 deletions
chrome/browser/resources/history/history.html
View file @ 154417d3
......@@ -18,10 +18,9 @@
<script src="chrome://resources/js/cr/ui/menu.js"></script>
<script src="chrome://resources/js/cr/ui/position_util.js"></script>
<script src="chrome://resources/js/cr/ui/menu_button.js"></script>
<script src="chrome://resources/js/local_strings.js"></script>
<script src="chrome://resources/js/load_time_data.js"></script>
<script src="chrome://history-frame/history.js"></script>
<script src="chrome://history-frame/strings.js"></script>
</head>
<body class="uber-frame"
......@@ -51,7 +50,7 @@
<button id="remove-page" i18n-content="removeFromHistory"></button>
</menu>
<script src="chrome://resources/js/i18n_template.js"></script>
<script src="chrome://resources/js/i18n_process.js"></script>
<script src="chrome://history-frame/strings.js"></script>
<script src="chrome://resources/js/i18n_template2.js"></script>
</body>
</html>
chrome/browser/resources/history/history.js
View file @ 154417d3
......@@ -38,7 +38,6 @@ function findAncestorWithClass(node, className) {
// or just make the classes own more of the page.
var historyModel;
var historyView;
var localStrings;
var pageState;
var deleteQueue = [];
var selectionAnchor = -1;
......@@ -124,7 +123,7 @@ Page.prototype.getResultDOM = function(searchResultFlag) {
var dropDown = createElementWithClassName('button', 'drop-down');
dropDown.value = 'Open action menu';
dropDown.title = localStrings.getString('actionMenuDescription');
dropDown.title = loadTimeData.getString('actionMenuDescription');
dropDown.setAttribute('menu', '#action-menu');
cr.ui.decorate(dropDown, MenuButton);
......@@ -686,7 +685,7 @@ HistoryView.prototype.displayResults_ = function() {
// Add a header for the search results, if there isn't already one.
if (!this.resultDiv_.querySelector('h3')) {
var header = document.createElement('h3');
header.textContent = localStrings.getStringF('searchresultsfor',
header.textContent = loadTimeData.getStringF('searchresultsfor',
searchText);
this.resultDiv_.appendChild(header);
}
......@@ -716,7 +715,7 @@ HistoryView.prototype.displayResults_ = function() {
day.appendChild(document.createTextNode(page.dateRelativeDay));
if (i == 0 && page.continued) {
day.appendChild(document.createTextNode(' ' +
localStrings.getString('cont')));
loadTimeData.getString('cont')));
}
// If there is an existing dayResults element, append it.
......@@ -756,10 +755,10 @@ HistoryView.prototype.displayNavBar_ = function() {
if (this.pageIndex_ > 0) {
this.pageDiv_.appendChild(
this.createPageNav_(0, localStrings.getString('newest')));
this.createPageNav_(0, loadTimeData.getString('newest')));
this.pageDiv_.appendChild(
this.createPageNav_(this.pageIndex_ - 1,
localStrings.getString('newer')));
loadTimeData.getString('newer')));
}
// TODO(feldstein): this causes the navbar to not show up when your first
......@@ -767,7 +766,7 @@ HistoryView.prototype.displayNavBar_ = function() {
if (this.model_.getSize() > (this.pageIndex_ + 1) * RESULTS_PER_PAGE) {
this.pageDiv_.appendChild(
this.createPageNav_(this.pageIndex_ + 1,
localStrings.getString('older')));
loadTimeData.getString('older')));
}
};
......@@ -927,7 +926,6 @@ function load() {
var searchField = $('search-field');
searchField.focus();
localStrings = new LocalStrings();
historyModel = new HistoryModel();
historyView = new HistoryView(historyModel);
pageState = new PageState(historyModel, historyView);
......@@ -950,7 +948,7 @@ function load() {
activePage = null;
});
var title = localStrings.getString('title');
var title = loadTimeData.getString('title');
uber.invokeMethodOnParent('setTitle', {title: title});
window.addEventListener('message', function(e) {
......@@ -1051,7 +1049,7 @@ function removeItems() {
if (urls.length > 0) {
queue.push([date, urls]);
}
if (checked.length > 0 && confirm(localStrings.getString('deletewarning'))) {
if (checked.length > 0 && confirm(loadTimeData.getString('deletewarning'))) {
for (var i = 0; i < queue.length; i++) {
// Reload the page when the final entry has been deleted.
var callback = i == 0 ? reloadHistory : null;
......
chrome/browser/ui/webui/history_ui.cc
View file @ 154417d3
......@@ -470,11 +470,10 @@ void BrowsingHistoryHandler::Observe(
HistoryUI::HistoryUI(content::WebUI* web_ui) : WebUIController(web_ui) {
web_ui->AddMessageHandler(new BrowsingHistoryHandler());
HistoryUIHTMLSource* html_source = new HistoryUIHTMLSource();
// Set up the chrome://history-frame/ source.
Profile* profile = Profile::FromWebUI(web_ui);
ChromeURLDataManager::AddDataSource(profile, html_source);
HistoryUIHTMLSource* html_source = new HistoryUIHTMLSource();
html_source->set_use_json_js_format_v2();
ChromeURLDataManager::AddDataSource(Profile::FromWebUI(web_ui), html_source);
}
// static
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment