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

Bug 1153978 - Part 0: Separate nsIPlatformInfo from nsIXULAppInfo. r=jst

Browse Source
This commit is contained in:
Tooru Fujisawa 2016-02-04 06:12:45 +09:00
parent 8de144a510
commit d2fd3db0e7
4 changed files with 27 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
toolkit/xre/nsAppRunner.cpp
View File

@ -68,6 +68,7 @@
#include "nsIIOService2.h"
#include "nsIObserverService.h"
#include "nsINativeAppSupport.h"
#include "nsIPlatformInfo.h"
#include "nsIProcess.h"
#include "nsIProfileUnlocker.h"
#include "nsIPromptService.h"
@ -741,6 +742,7 @@ class nsXULAppInfo : public nsIXULAppInfo,
public:
MOZ_CONSTEXPR nsXULAppInfo() {}
NS_DECL_ISUPPORTS_INHERITED
NS_DECL_NSIPLATFORMINFO
NS_DECL_NSIXULAPPINFO
NS_DECL_NSIXULRUNTIME
NS_DECL_NSIOBSERVER
@ -764,7 +766,8 @@ NS_INTERFACE_MAP_BEGIN(nsXULAppInfo)
NS_INTERFACE_MAP_ENTRY(nsICrashReporter)
NS_INTERFACE_MAP_ENTRY(nsIFinishDumpingCallback)
#endif
NS_INTERFACE_MAP_ENTRY_CONDITIONAL(nsIXULAppInfo, gAppData ||
NS_INTERFACE_MAP_ENTRY(nsIPlatformInfo)
NS_INTERFACE_MAP_ENTRY_CONDITIONAL(nsIXULAppInfo, gAppData ||
XRE_IsContentProcess())
NS_INTERFACE_MAP_END

1
xpcom/system/moz.build
View File

@ -14,6 +14,7 @@ XPIDL_SOURCES += [
'nsIGSettingsService.idl',
'nsIHapticFeedback.idl',
'nsIPackageKitService.idl',
'nsIPlatformInfo.idl',
'nsIXULAppInfo.idl',
'nsIXULRuntime.idl',
]

19
xpcom/system/nsIPlatformInfo.idl Normal file
View File

@ -0,0 +1,19 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#include "nsISupports.idl"
[scriptable, uuid(ab6650cf-0806-4aea-b8f2-40fdae74f1cc)]
interface nsIPlatformInfo : nsISupports
{
/**
* The version of the XULRunner platform.
*/
readonly attribute ACString platformVersion;
/**
* The build ID/date of gecko and the XULRunner platform.
*/
readonly attribute ACString platformBuildID;
};

16
xpcom/system/nsIXULAppInfo.idl
View File

@ -2,15 +2,15 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#include "nsISupports.idl"
#include "nsIPlatformInfo.idl"
/**
* A scriptable interface to the nsXULAppAPI structure. See nsXULAppAPI.h for
* a detailed description of each attribute.
*/
[scriptable, uuid(1518e7d2-022a-4dae-b02e-bbe7ffcf2145)]
interface nsIXULAppInfo : nsISupports
[scriptable, uuid(ddea4f31-3c5e-4769-ac68-21ab4b3d7845)]
interface nsIXULAppInfo : nsIPlatformInfo
{
/**
* @see nsXREAppData.vendor
@ -45,16 +45,6 @@ interface nsIXULAppInfo : nsISupports
*/
readonly attribute ACString appBuildID;
/**
* The version of the XULRunner platform.
*/
readonly attribute ACString platformVersion;
/**
* The build ID/date of gecko and the XULRunner platform.
*/
readonly attribute ACString platformBuildID;
/**
* @see nsXREAppData.UAName
* @returns an empty string if nsXREAppData.UAName is not set.