[tbb-commits] [tor-browser/tor-browser-38.2.0esr-5.0-1] Bug 1192120 - Fix warnings that show up when opening the downloads window in private browsing mode; r=mconley

[gk at torproject.org]

commit 1efbcfcb50459140bf7c606a85d07e73600db414
Author: Ehsan Akhgari <ehsan at mozilla.com>
Date:   Fri Aug 7 00:15:24 2015 -0400

    Bug 1192120 - Fix warnings that show up when opening the downloads window in private browsing mode; r=mconley
---
 browser/components/downloads/DownloadsCommon.jsm                 |    6 +++---
 browser/components/downloads/content/contentAreaDownloadsView.js |    2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/browser/components/downloads/DownloadsCommon.jsm b/browser/components/downloads/DownloadsCommon.jsm
index f658db6..6376069 100644
--- a/browser/components/downloads/DownloadsCommon.jsm
+++ b/browser/components/downloads/DownloadsCommon.jsm
@@ -239,7 +239,7 @@ this.DownloadsCommon = {
    *        The browser window which owns the download button.
    */
   getData(aWindow) {
-    if (PrivateBrowsingUtils.isWindowPrivate(aWindow)) {
+    if (PrivateBrowsingUtils.isContentWindowPrivate(aWindow)) {
       return PrivateDownloadsData;
     } else {
       return DownloadsData;
@@ -261,7 +261,7 @@ this.DownloadsCommon = {
    * the window in question.
    */
   getIndicatorData(aWindow) {
-    if (PrivateBrowsingUtils.isWindowPrivate(aWindow)) {
+    if (PrivateBrowsingUtils.isContentWindowPrivate(aWindow)) {
       return PrivateDownloadsIndicatorData;
     } else {
       return DownloadsIndicatorData;
@@ -279,7 +279,7 @@ this.DownloadsCommon = {
    *        from the summary.
    */
   getSummary(aWindow, aNumToExclude) {
-    if (PrivateBrowsingUtils.isWindowPrivate(aWindow)) {
+    if (PrivateBrowsingUtils.isContentWindowPrivate(aWindow)) {
       if (this._privateSummary) {
         return this._privateSummary;
       }
diff --git a/browser/components/downloads/content/contentAreaDownloadsView.js b/browser/components/downloads/content/contentAreaDownloadsView.js
index 15bbffd..f841f63 100644
--- a/browser/components/downloads/content/contentAreaDownloadsView.js
+++ b/browser/components/downloads/content/contentAreaDownloadsView.js
@@ -8,7 +8,7 @@ let ContentAreaDownloadsView = {
   init() {
     let view = new DownloadsPlacesView(document.getElementById("downloadsRichListBox"));
     // Do not display the Places downloads in private windows
-    if (!PrivateBrowsingUtils.isWindowPrivate(window)) {
+    if (!PrivateBrowsingUtils.isContentWindowPrivate(window)) {
       view.place = "place:transition=7&sort=4";
     }
   },