Chromium Code Reviews| Index: chrome/browser/resources/history/history.js |
| diff --git a/chrome/browser/resources/history/history.js b/chrome/browser/resources/history/history.js |
| index 3ea486d1f9acf527550d3a3c5a61a9d224952454..b282c97a126747a18e219831df5fb0bd4dc06e63 100644 |
| --- a/chrome/browser/resources/history/history.js |
| +++ b/chrome/browser/resources/history/history.js |
| @@ -46,39 +46,6 @@ var SupervisedUserFilteringBehavior = { |
| }; |
| /** |
| - * The type of the history result object. The definition is based on |
| - * chrome/browser/ui/webui/history_ui.cc: |
| - * BrowsingHistoryHandler::HistoryEntry::ToValue() |
| - * @typedef {{allTimestamps: Array<number>, |
| - * blockedVisit: (boolean|undefined), |
| - * dateRelativeDay: (string|undefined), |
| - * dateShort: string, |
| - * dateTimeOfDay: (string|undefined), |
| - * deviceName: string, |
| - * deviceType: string, |
| - * domain: string, |
| - * hostFilteringBehavior: (number|undefined), |
| - * snippet: (string|undefined), |
| - * starred: boolean, |
| - * time: number, |
| - * title: string, |
| - * url: string}} |
| - */ |
| -var HistoryEntry; |
| - |
| -/** |
| - * The type of the history results info object. The definition is based on |
| - * chrome/browser/ui/webui/history_ui.cc: |
| - * BrowsingHistoryHandler::QueryComplete() |
| - * @typedef {{finished: boolean, |
| - * hasSyncedResults: (boolean|undefined), |
| - * queryEndTime: string, |
| - * queryStartTime: string, |
| - * term: string}} |
| - */ |
| -var HistoryQuery; |
| - |
| -/** |
| * Returns true if the mobile (non-desktop) version is being shown. |
| * @return {boolean} true if the mobile version is being shown. |
| */ |
| @@ -144,19 +111,19 @@ function Visit(result, continued, model) { |
| // See comment in BrowsingHistoryHandler::QueryComplete - we won't always |
| // get all of these. |
| - this.dateRelativeDay = result.dateRelativeDay || ''; |
| - this.dateTimeOfDay = result.dateTimeOfDay || ''; |
| - this.dateShort = result.dateShort || ''; |
| + this.dateRelativeDay = result.dateRelativeDay; |
| + this.dateTimeOfDay = result.dateTimeOfDay; |
| + this.dateShort = result.dateShort; |
| // Shows the filtering behavior for that host (only used for supervised |
| // users). |
| // A value of |SupervisedUserFilteringBehavior.ALLOW| is not displayed so it |
| // is used as the default value. |
| this.hostFilteringBehavior = SupervisedUserFilteringBehavior.ALLOW; |
| - if (typeof result.hostFilteringBehavior != 'undefined') |
| + if (result.hostFilteringBehavior != '') |
|
Dan Beam
2016/01/27 03:07:30
nit: just if (result.hostFilteringBehavior)
yingran
2016/01/27 05:05:03
Done.
|
| this.hostFilteringBehavior = result.hostFilteringBehavior; |
| - this.blockedVisit = result.blockedVisit || false; |
| + this.blockedVisit = result.blockedVisit; |
| // Whether this is the continuation of a previous day. |
| this.continued = continued; |