зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1278985 - Remove unused URL arg from CreateChromeWindow2. r=mrbkap
MozReview-Commit-ID: I1H2WZeoHTJ --HG-- extra : rebase_source : 7418216f51c6bc223c08621853f19ac542b0b470 extra : source : 3b5b92f04ea56dcf8fb123585a6ea2eaba550614
This commit is contained in:
Родитель
bcfaeeffb2
Коммит
ea4b26ca22
|
@ -837,9 +837,8 @@ nsWindowWatcher::OpenWindowInternal(mozIDOMWindowProxy* aParent,
|
||||||
|
|
||||||
bool cancel = false;
|
bool cancel = false;
|
||||||
rv = windowCreator2->CreateChromeWindow2(parentChrome, chromeFlags,
|
rv = windowCreator2->CreateChromeWindow2(parentChrome, chromeFlags,
|
||||||
contextFlags, uriToLoad,
|
contextFlags, aOpeningTab,
|
||||||
aOpeningTab, &cancel,
|
&cancel, getter_AddRefs(newChrome));
|
||||||
getter_AddRefs(newChrome));
|
|
||||||
if (NS_SUCCEEDED(rv) && cancel) {
|
if (NS_SUCCEEDED(rv) && cancel) {
|
||||||
newChrome = 0; // just in case
|
newChrome = 0; // just in case
|
||||||
rv = NS_ERROR_ABORT;
|
rv = NS_ERROR_ABORT;
|
||||||
|
|
|
@ -40,11 +40,6 @@ interface nsIWindowCreator2 : nsIWindowCreator {
|
||||||
to the underlying OS).
|
to the underlying OS).
|
||||||
@param chromeFlags Chrome features from nsIWebBrowserChrome
|
@param chromeFlags Chrome features from nsIWebBrowserChrome
|
||||||
@param contextFlags Flags about the context of the window being created.
|
@param contextFlags Flags about the context of the window being created.
|
||||||
@param uri The URL for which this window is intended. It can be null
|
|
||||||
or zero-length. The implementation of this interface
|
|
||||||
may use the URL to help determine what sort of window
|
|
||||||
to open or whether to cancel window creation. It will not
|
|
||||||
load the URL.
|
|
||||||
@param aOpeningTab The TabParent that is trying to open this new chrome
|
@param aOpeningTab The TabParent that is trying to open this new chrome
|
||||||
window. Can be nullptr.
|
window. Can be nullptr.
|
||||||
@param cancel Return |true| to reject window creation. If true the
|
@param cancel Return |true| to reject window creation. If true the
|
||||||
|
@ -56,7 +51,6 @@ interface nsIWindowCreator2 : nsIWindowCreator {
|
||||||
nsIWebBrowserChrome createChromeWindow2(in nsIWebBrowserChrome parent,
|
nsIWebBrowserChrome createChromeWindow2(in nsIWebBrowserChrome parent,
|
||||||
in uint32_t chromeFlags,
|
in uint32_t chromeFlags,
|
||||||
in uint32_t contextFlags,
|
in uint32_t contextFlags,
|
||||||
in nsIURI uri,
|
|
||||||
in nsITabParent aOpeningTab,
|
in nsITabParent aOpeningTab,
|
||||||
out boolean cancel);
|
out boolean cancel);
|
||||||
|
|
||||||
|
|
|
@ -614,7 +614,7 @@ nsAppStartup::CreateChromeWindow(nsIWebBrowserChrome *aParent,
|
||||||
nsIWebBrowserChrome **_retval)
|
nsIWebBrowserChrome **_retval)
|
||||||
{
|
{
|
||||||
bool cancel;
|
bool cancel;
|
||||||
return CreateChromeWindow2(aParent, aChromeFlags, 0, 0, nullptr, &cancel, _retval);
|
return CreateChromeWindow2(aParent, aChromeFlags, 0, nullptr, &cancel, _retval);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -637,7 +637,6 @@ NS_IMETHODIMP
|
||||||
nsAppStartup::CreateChromeWindow2(nsIWebBrowserChrome *aParent,
|
nsAppStartup::CreateChromeWindow2(nsIWebBrowserChrome *aParent,
|
||||||
uint32_t aChromeFlags,
|
uint32_t aChromeFlags,
|
||||||
uint32_t aContextFlags,
|
uint32_t aContextFlags,
|
||||||
nsIURI *aURI,
|
|
||||||
nsITabParent *aOpeningTab,
|
nsITabParent *aOpeningTab,
|
||||||
bool *aCancel,
|
bool *aCancel,
|
||||||
nsIWebBrowserChrome **_retval)
|
nsIWebBrowserChrome **_retval)
|
||||||
|
|
Загрузка…
Ссылка в новой задаче