Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

moves Firefox-specific microsummary directory definitions to nsBrowserDirectoryProvider

Browse Source 
bug=337324
r=bsmedberg
a=mconnor for the 1.8 branch


git-svn-id: svn://10.0.0.236/branches/MOZILLA_1_8_BRANCH@199737 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
myk%mozilla.org
2006-06-12 18:58:37 +00:00
parent b2acf4e569
commit ff1b129db9
5 changed files with 86 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
mozilla/xpcom/io/nsAppFileLocationProvider.cpp
View File

@@ -109,7 +109,6 @@
#define CHROME_DIR_NAME NS_LITERAL_CSTRING("Chrome")
#define PLUGINS_DIR_NAME NS_LITERAL_CSTRING("Plug-ins")
#define SEARCH_DIR_NAME NS_LITERAL_CSTRING("Search Plugins")
#define MICROSUMMARY_DIR_NAME NS_LITERAL_CSTRING("Microsummary Generators")
#else
#define DEFAULTS_DIR_NAME NS_LITERAL_CSTRING("defaults")
#define DEFAULTS_PREF_DIR_NAME NS_LITERAL_CSTRING("pref")
@@ -118,7 +117,6 @@
#define CHROME_DIR_NAME NS_LITERAL_CSTRING("chrome")
#define PLUGINS_DIR_NAME NS_LITERAL_CSTRING("plugins")
#define SEARCH_DIR_NAME NS_LITERAL_CSTRING("searchplugins")
#define MICROSUMMARY_DIR_NAME NS_LITERAL_CSTRING("microsummary-generators")
#endif
//*****************************************************************************
@@ -279,18 +277,6 @@ nsAppFileLocationProvider::GetFile(const char *prop, PRBool *persistant, nsIFile
if (NS_SUCCEEDED(rv))
rv = (*_retval)->AppendNative(SEARCH_DIR_NAME);
}
else if (nsCRT::strcmp(prop, NS_APP_MICROSUMMARY_DIR) == 0)
{
rv = CloneMozBinDirectory(getter_AddRefs(localFile));
if (NS_SUCCEEDED(rv))
rv = localFile->AppendRelativeNativePath(MICROSUMMARY_DIR_NAME);
}
else if (nsCRT::strcmp(prop, NS_APP_USER_MICROSUMMARY_DIR) == 0)
{
rv = NS_GetSpecialDirectory(NS_APP_USER_PROFILE_50_DIR, _retval);
if (NS_SUCCEEDED(rv))
rv = (*_retval)->AppendNative(MICROSUMMARY_DIR_NAME);
}
else if (nsCRT::strcmp(prop, NS_APP_INSTALL_CLEANUP_DIR) == 0)
{
// This is cloned so that embeddors will have a hook to override