From 7b1d7317cdbc8f080af6a4057693d491bbfa4023 Mon Sep 17 00:00:00 2001 From: "danm%netscape.com" Date: Fri, 13 Sep 2002 20:59:56 +0000 Subject: [PATCH] moving nsIPopupWindowManager.idl from extensions to appshell, where it still doesn't belong but it's an improvement. long live bug 166442 r=jag,timeless git-svn-id: svn://10.0.0.236/trunk@129556 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/extensions/cookie/Makefile.in | 2 +- .../extensions/cookie/macbuild/cookieIDL.xml | 30 ---- .../cookie/nsIPopupWindowManager.idl | 129 ------------------ .../xpfe/appshell/macbuild/appshellIDL.xml | 30 ++++ mozilla/xpfe/appshell/public/Makefile.in | 1 + mozilla/xpfe/bootstrap/Makefile.in | 1 - 6 files changed, 32 insertions(+), 161 deletions(-) delete mode 100644 mozilla/extensions/cookie/nsIPopupWindowManager.idl diff --git a/mozilla/extensions/cookie/Makefile.in b/mozilla/extensions/cookie/Makefile.in index 7ca7dc58c2d..335693ebae5 100644 --- a/mozilla/extensions/cookie/Makefile.in +++ b/mozilla/extensions/cookie/Makefile.in @@ -42,6 +42,7 @@ REQUIRES = xpcom \ uriloader \ windowwatcher \ docshell \ + appshell \ $(NULL) ifdef ENABLE_TESTS @@ -73,7 +74,6 @@ XPIDLSRCS = \ nsICookieConsent.idl \ nsIImgManager.idl \ nsIPermissionManager.idl \ - nsIPopupWindowManager.idl \ nsIPermission.idl \ nsICookieAcceptDialog.idl \ $(NULL) diff --git a/mozilla/extensions/cookie/macbuild/cookieIDL.xml b/mozilla/extensions/cookie/macbuild/cookieIDL.xml index ca72e6d2aa2..68f42ca930b 100644 --- a/mozilla/extensions/cookie/macbuild/cookieIDL.xml +++ b/mozilla/extensions/cookie/macbuild/cookieIDL.xml @@ -776,13 +776,6 @@ Text - - Name - nsIPopupWindowManager.idl - MacOS - Text - - @@ -825,11 +818,6 @@ nsICookieAcceptDialog.idl MacOS - - Name - nsIPopupWindowManager.idl - MacOS - @@ -1555,13 +1543,6 @@ Text - - Name - nsIPopupWindowManager.idl - MacOS - Text - - @@ -1604,11 +1585,6 @@ nsICookieAcceptDialog.idl MacOS - - Name - nsIPopupWindowManager.idl - MacOS - @@ -1667,12 +1643,6 @@ nsICookieAcceptDialog.idl MacOS - - headers - Name - nsIPopupWindowManager.idl - MacOS - diff --git a/mozilla/extensions/cookie/nsIPopupWindowManager.idl b/mozilla/extensions/cookie/nsIPopupWindowManager.idl deleted file mode 100644 index ba9fc4e4799..00000000000 --- a/mozilla/extensions/cookie/nsIPopupWindowManager.idl +++ /dev/null @@ -1,129 +0,0 @@ -/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -/* ***** 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 mozilla.org code. - * - * The Initial Developer of the Original Code is - * Netscape Communications Corporation. - * Portions created by the Initial Developer are Copyright (C) 2002 - * the Initial Developer. All Rights Reserved. - * - * Contributor(s): - * - * Alternatively, the contents of this file may be used under the terms of - * either 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 is the interface to the Popup Window Manager: an object which - * maintains popup window permissions by website. - */ - -#include "nsISupports.idl" - -interface nsIObserver; -interface nsISimpleEnumerator; -interface nsIURI; - -[scriptable, uuid(2e14fec9-e8e9-44cc-8c86-c8673c2383cc)] -interface nsIPopupWindowManager : nsISupports { - - /** - * These values are returned by the testPermission method - */ - const PRUint32 eAllow = 1; - const PRUint32 eAllowConditionally = 2; - const PRUint32 eDisallow = 3; - - /** - * The manager's default permission can be eAllow (a whitelist) - * or eDisallow (a blacklist). - */ - attribute PRUint32 defaultPermission; - - /** - * Add permission information for a website. - * @param aURI the website to be blocked - * @param aPermit true to grant permission to the website - * false to refuse permission - */ - void add(in nsIURI aURI, in boolean aPermit); - - /** - * Remove permission information for a website. Popups will be permitted - * or not depending on whether this is a white- or black-list. - * is permitted to show popups.) - * @param aURI the website to be unblocked - */ - void remove(in nsIURI aURI); - - /** - * Clear permission information for all websites. - */ - void removeAll(); - - /** - * Test whether a website is suitable for popup permission storage. - * @param aURI the website to be tested - * @return true if permission can be stored for the website - */ - boolean testSuitability(in nsIURI aURI); - - /** - * Test whether a website has permission to show a popup window. - * @param aURI the website to be tested - * @return one of the eAllow consts defined above - */ - PRUint32 testPermission(in nsIURI aURI); - - /** - * Enumerates all stored permissions - * @return an enumerator which itself returns nsISupports objects which - * can be QIed to an nsIPermission - */ - nsISimpleEnumerator getEnumerator(); - - /** - * This service broadcasts a PPM_CHANGE_NOTIFICATION notification - * when any popup permission changes. Add yourself as an observer. - * @param observer the observer - */ - void addObserver(in nsIObserver aObserver); - - /** - * This service broadcasts a PPM_CHANGE_NOTIFICATION notification - * when any popup permission changes. Remove yourself as an observer. - * @param observer the observer - */ - void removeObserver(in nsIObserver aObserver); -}; - -%{ C++ -// {2e14fec9-e8e9-44cc-8c86-c8673c2383cc} -#define NS_POPUPWINDOWMANAGER_IID \ -{ 0x2e14fec9, 0xe8e9, 0x44cc, { 0x8c, 0x86, 0xc8, 0x67, 0x3c, 0x23, 0x83,0xcc }} -#define NS_POPUPWINDOWMANAGER_CONTRACTID "@mozilla.org/PopupWindowManager;1" - -#define PPM_CHANGE_NOTIFICATION "popup perm change" -%} diff --git a/mozilla/xpfe/appshell/macbuild/appshellIDL.xml b/mozilla/xpfe/appshell/macbuild/appshellIDL.xml index 28d4b97fc07..614bc4c7d8b 100644 --- a/mozilla/xpfe/appshell/macbuild/appshellIDL.xml +++ b/mozilla/xpfe/appshell/macbuild/appshellIDL.xml @@ -783,6 +783,13 @@ Text + + Name + nsIPopupWindowManager.idl + MacOS + Text + + Name nsICloseAllWindows.idl @@ -844,6 +851,11 @@ nsINativeAppSupport.idl MacOS + + Name + nsIPopupWindowManager.idl + MacOS + Name nsICloseAllWindows.idl @@ -1586,6 +1598,13 @@ Text + + Name + nsIPopupWindowManager.idl + MacOS + Text + + Name nsICloseAllWindows.idl @@ -1647,6 +1666,11 @@ nsINativeAppSupport.idl MacOS + + Name + nsIPopupWindowManager.idl + MacOS + Name nsICloseAllWindows.idl @@ -1721,6 +1745,12 @@ nsINativeAppSupport.idl MacOS + + headers + Name + nsIPopupWindowManager.idl + MacOS + headers Name diff --git a/mozilla/xpfe/appshell/public/Makefile.in b/mozilla/xpfe/appshell/public/Makefile.in index b89466916d0..7c09b68e37e 100644 --- a/mozilla/xpfe/appshell/public/Makefile.in +++ b/mozilla/xpfe/appshell/public/Makefile.in @@ -46,6 +46,7 @@ XPIDLSRCS = \ nsIUserInfo.idl \ nsITimingService.idl \ nsINativeAppSupport.idl \ + nsIPopupWindowManager.idl \ $(NULL) ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT))) diff --git a/mozilla/xpfe/bootstrap/Makefile.in b/mozilla/xpfe/bootstrap/Makefile.in index cd790161318..aef1cb58cf5 100644 --- a/mozilla/xpfe/bootstrap/Makefile.in +++ b/mozilla/xpfe/bootstrap/Makefile.in @@ -63,7 +63,6 @@ REQUIRES = xpcom \ locale \ xremoteservice \ profile \ - cookie \ $(NULL) # for jprof REQUIRES += jprof