| Index: chrome/browser/resources/history/history.js
|
| diff --git a/chrome/browser/resources/history/history.js b/chrome/browser/resources/history/history.js
|
| index 8cfb2f8174496419691e2fe238fa70be527a07af..707ca5ea5bb1328d669dc9da5acedfe1610f4136 100644
|
| --- a/chrome/browser/resources/history/history.js
|
| +++ b/chrome/browser/resources/history/history.js
|
| @@ -128,6 +128,7 @@ function Visit(result, continued, model) {
|
| this.url_ = result.url;
|
| this.domain_ = result.domain;
|
| this.starred_ = result.starred;
|
| + this.context_ = result.context;
|
|
|
| // These identify the name and type of the device on which this visit
|
| // occurred. They will be empty if the visit occurred on the current device.
|
| @@ -858,8 +859,9 @@ HistoryModel.prototype.queryHistory_ = function() {
|
|
|
| $('loading-spinner').hidden = false;
|
| this.inFlight_ = true;
|
| + this.context = $('context-chooser').selectedIndex;
|
| chrome.send('queryHistory',
|
| - [this.searchText_, this.offset_, this.rangeInDays_, endTime, maxResults]);
|
| + [this.searchText_, this.offset_, this.rangeInDays_, endTime, this.context, maxResults]);
|
| };
|
|
|
| /**
|
| @@ -1008,6 +1010,7 @@ function HistoryView(model) {
|
|
|
| $('clear-browsing-data').addEventListener('click', openClearBrowsingData);
|
| $('remove-selected').addEventListener('click', removeItems);
|
| + $('context-chooser').addEventListener('change', onChange);
|
|
|
| // Add handlers for the page navigation buttons at the bottom.
|
| $('newest-button').addEventListener('click', function() {
|
| @@ -2147,6 +2150,10 @@ function confirmDeletion(okCallback, cancelCallback) {
|
| showConfirmationOverlay();
|
| }
|
|
|
| +function onChange() {
|
| + historyModel.reload();
|
| +}
|
| +
|
| /**
|
| * Click handler for the 'Remove selected items' button.
|
| * Confirms the deletion with the user, and then deletes the selected visits.
|
|
|