Merge mozilla-central to fx-team to pick up the #1 top orange fix

UltraBlame original commit: b7d0f477f873814e06c9b77e60264788f582ec44
marco-c · Sep 28, 2019 · b6df9ad · b6df9ad
1 parent a216ae2
commit b6df9ad
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 10 deletions.
diff --git a/browser/base/content/urlbarBindings.xml b/browser/base/content/urlbarBindings.xml
@@ -550,7 +550,7 @@
 
             Cc["@mozilla.org/widget/clipboardhelper;1"]
               .getService(Ci.nsIClipboardHelper)
-              .copyString(val);
+              .copyString(val, document);
           },
           supportsCommand: function(aCommand) {
             switch (aCommand) {
@@ -753,7 +753,7 @@
 
         Cc["@mozilla.org/widget/clipboardhelper;1"]
           .getService(Ci.nsIClipboardHelper)
-          .copyStringToClipboard(val, Ci.nsIClipboard.kSelectionClipboard);
+          .copyStringToClipboard(val, document, Ci.nsIClipboard.kSelectionClipboard);
       ]]></handler>
     </handlers>
 

diff --git a/browser/components/nsBrowserGlue.js b/browser/components/nsBrowserGlue.js
@@ -492,13 +492,6 @@ BrowserGlue.prototype = {
     if (!aQuitType)
       aQuitType = "quit";
 
-
-    var inPrivateBrowsing = Cc["@mozilla.org/privatebrowsing;1"].
-                            getService(Ci.nsIPrivateBrowsingService).
-                            privateBrowsingEnabled;
-    if (inPrivateBrowsing)
-      return;
-
     var showPrompt = false;
     var mostRecentBrowserWindow;
 
@@ -530,6 +523,12 @@ BrowserGlue.prototype = {
       return;
     }
 
+    var inPrivateBrowsing = Cc["@mozilla.org/privatebrowsing;1"].
+                            getService(Ci.nsIPrivateBrowsingService).
+                            privateBrowsingEnabled;
+    if (inPrivateBrowsing)
+      return;
+
     if (!showPrompt)
       return;
 

diff --git a/browser/devtools/webconsole/HUDService.jsm b/browser/devtools/webconsole/HUDService.jsm
@@ -1012,7 +1012,7 @@ HUD_SERVICE.prototype =
         strings.push("[" + timestampString + "] " + item.clipboardText);
       }
     }
-    clipboardHelper.copyString(strings.join("\n"));
+    clipboardHelper.copyString(strings.join("\n"), this.doc);
   }
 };
-Original file line number
+Diff line change
@@ Expand Up / @@ -1012,7 +1012,7 @@ HUD_SERVICE.prototype = @@
             strings.push("[" + timestampString + "] " + item.clipboardText);
           }
         }
-        clipboardHelper.copyString(strings.join("\n"));
+        clipboardHelper.copyString(strings.join("\n"), this.doc);
       }
     };
@@ Expand Down @@