Bug 1192023 - Flatten away AppId enum. r=khuey

This commit is contained in:
Birunthan Mohanathas 2015-08-06 14:34:33 -07:00
parent 61803035c1
commit a7fac00637

View File

@ -234,11 +234,6 @@ const char kPrefIndexedDBEnabled[] = "dom.indexedDB.enabled";
#define PERMISSION_STRING_CHROME_READ_SUFFIX "-read"
#define PERMISSION_STRING_CHROME_WRITE_SUFFIX "-write"
enum AppId {
kNoAppId = nsIScriptSecurityManager::NO_APP_ID,
kUnknownAppId = nsIScriptSecurityManager::UNKNOWN_APP_ID
};
const char kIdleServiceContractId[] = "@mozilla.org/widget/idleservice;1";
#ifdef DEBUG
@ -18530,7 +18525,8 @@ FactoryOp::CheckAtLeastOneAppHasPermission(ContentParent* aContentParent,
index++) {
uint32_t appId =
TabParent::GetFrom(browsers[index])->OwnOrContainingAppId();
MOZ_ASSERT(kUnknownAppId != appId && kNoAppId != appId);
MOZ_ASSERT(appId != nsIScriptSecurityManager::UNKNOWN_APP_ID &&
appId != nsIScriptSecurityManager::NO_APP_ID);
nsCOMPtr<mozIApplication> app;
nsresult rv = appsService->GetAppByLocalId(appId, getter_AddRefs(app));