Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-27 12:15:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 464736 - Cannot import History and Cookies from Safari while in Private Browsing mode; r=gavin

Browse Source
This commit is contained in:
Ehsan Akhgari 2009-02-19 09:34:12 +03:30
parent 56abfe0094
commit f156755f94
3 changed files with 74 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
browser/base/content/browser.js
View File

@ -6868,6 +6868,8 @@ let gPrivateBrowsingUI = {
onEnterPrivateBrowsing: function PBUI_onEnterPrivateBrowsing() {
this._setPBMenuTitle("stop");
document.getElementById("menu_import").setAttribute("disabled", "true");
this._privateBrowsingAutoStarted = this._privateBrowsingService.autoStarted;
if (!this._privateBrowsingAutoStarted) {
@ -6893,6 +6895,8 @@ let gPrivateBrowsingUI = {
if (BrowserSearch.searchBar)
BrowserSearch.searchBar.textbox.reset();
document.getElementById("menu_import").removeAttribute("disabled");
gFindBar.getElement("findbar-textbox").reset();
this._setPBMenuTitle("start");

1
browser/components/privatebrowsing/test/browser/Makefile.in
View File

@ -52,6 +52,7 @@ _BROWSER_TEST_FILES = \
browser_privatebrowsing_findbar.js \
browser_privatebrowsing_zoom.js \
browser_privatebrowsing_transition.js \
browser_privatebrowsing_import.js \
$(NULL)
libs:: $(_BROWSER_TEST_FILES)

69
browser/components/privatebrowsing/test/browser/browser_privatebrowsing_import.js Normal file
View File

@ -0,0 +1,69 @@
/* ***** BEGIN LICENSE BLOCK *****
* Version: MPL 1.1/GPL 2.0/LGPL 2.1
*
* The contents of this file are subject to the Mozilla Public License Version
* 1.1 (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
* http://www.mozilla.org/MPL/
*
* Software distributed under the License is distributed on an "AS IS" basis,
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
* for the specific language governing rights and limitations under the
* License.
*
* The Original Code is Private Browsing Tests.
*
* The Initial Developer of the Original Code is
* Ehsan Akhgari.
* Portions created by the Initial Developer are Copyright (C) 2008
* the Initial Developer. All Rights Reserved.
*
* Contributor(s):
* Ehsan Akhgari <ehsan.akhgari@gmail.com> (Original Author)
*
* Alternatively, the contents of this file may be used under the terms of
* either of the GNU General Public License Version 2 or later (the "GPL"),
* or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
* in which case the provisions of the GPL or the LGPL are applicable instead
* of those above. If you wish to allow use of your version of this file only
* under the terms of either the GPL or the LGPL, and not to allow others to
* use your version of this file under the terms of the MPL, indicate your
* decision by deleting the provisions above and replace them with the notice
* and other provisions required by the GPL or the LGPL. If you do not delete
* the provisions above, a recipient may use your version of this file under
* the terms of any one of the MPL, the GPL or the LGPL.
*
* ***** END LICENSE BLOCK ***** */
// This test makes sure that the File->Import menu item is disabled inside the
// private browsing mode.
function test() {
// initialization
let prefBranch = Cc["@mozilla.org/preferences-service;1"].
getService(Ci.nsIPrefBranch);
prefBranch.setBoolPref("browser.privatebrowsing.keep_current_session", true);
let pb = Cc["@mozilla.org/privatebrowsing;1"].
getService(Ci.nsIPrivateBrowsingService);
let importMenuItem = document.getElementById("menu_import");
// make sure the menu item is not disabled to begin with
ok(!importMenuItem.hasAttribute("disabled"),
"File->Import menu item should not be disabled outside of the private browsing mode");
// enter private browsing mode
pb.privateBrowsingEnabled = true;
ok(importMenuItem.hasAttribute("disabled"),
"File->Import menu item should be disabled inside of the private browsing mode");
// leave private browsing mode
pb.privateBrowsingEnabled = false;
ok(!importMenuItem.hasAttribute("disabled"),
"File->Import menu item should not be disabled after leaving the private browsing mode");
// cleanup
prefBranch.clearUserPref("browser.privatebrowsing.keep_current_session");
}