Bug 1249393 - Getting rid of more Nightly-only gates for about:performance;r=me

MozReview-Commit-ID: BWS1TPoLzYs
This commit is contained in:
David Rajchenbach-Teller 2016-02-29 21:58:32 +01:00
parent 9cce6a4221
commit 3b257b4ac1
2 changed files with 1 additions and 7 deletions

View File

@ -179,9 +179,7 @@ const mozilla::Module::ContractIDEntry kDocShellContracts[] = {
{ NS_ABOUT_MODULE_CONTRACTID_PREFIX "neterror", &kNS_ABOUT_REDIRECTOR_MODULE_CID },
{ NS_ABOUT_MODULE_CONTRACTID_PREFIX "networking", &kNS_ABOUT_REDIRECTOR_MODULE_CID },
{ NS_ABOUT_MODULE_CONTRACTID_PREFIX "newaddon", &kNS_ABOUT_REDIRECTOR_MODULE_CID },
#ifdef NIGHTLY_BUILD
{ NS_ABOUT_MODULE_CONTRACTID_PREFIX "performance", &kNS_ABOUT_REDIRECTOR_MODULE_CID },
#endif
{ NS_ABOUT_MODULE_CONTRACTID_PREFIX "plugins", &kNS_ABOUT_REDIRECTOR_MODULE_CID },
{ NS_ABOUT_MODULE_CONTRACTID_PREFIX "serviceworkers", &kNS_ABOUT_REDIRECTOR_MODULE_CID },
#ifndef ANDROID

View File

@ -21,6 +21,7 @@ LOCAL_INCLUDES += [
'../feeds',
'../find',
'../jsdownloads/src',
'../perfmonitoring',
'../protobuf',
'../startup',
'../statusfilter',
@ -33,10 +34,5 @@ if not CONFIG['MOZ_DISABLE_PARENTAL_CONTROLS']:
'../parentalcontrols',
]
if CONFIG['NIGHTLY_BUILD']:
LOCAL_INCLUDES += [
'../perfmonitoring',
]
if CONFIG['GNU_CXX']:
CXXFLAGS += ['-Wshadow']