From d34d0b9bea2ea9d5554d7bc2fa6bfc7420b718b1 Mon Sep 17 00:00:00 2001 From: "ccarlen%netscape.com" Date: Tue, 3 Apr 2001 14:29:01 +0000 Subject: [PATCH] Sample code - not part of the process. Bug 71387 - remove unneeded code to determine locale of profile defaults. r=tao git-svn-id: svn://10.0.0.236/trunk@91141 18797224-902f-48f8-a5cc-f745e15eee43 --- .../source/CAppFileLocationProvider.cpp | 42 ++--------------- .../mfcembed/winEmbedFileLocProvider.cpp | 46 +------------------ 2 files changed, 5 insertions(+), 83 deletions(-) diff --git a/mozilla/embedding/browser/powerplant/source/CAppFileLocationProvider.cpp b/mozilla/embedding/browser/powerplant/source/CAppFileLocationProvider.cpp index 90da5905283..ce1a538f75e 100755 --- a/mozilla/embedding/browser/powerplant/source/CAppFileLocationProvider.cpp +++ b/mozilla/embedding/browser/powerplant/source/CAppFileLocationProvider.cpp @@ -29,7 +29,6 @@ #include "nsILocalFile.h" #include "nsString.h" #include "nsXPIDLString.h" -#include "nsIChromeRegistry.h" #include #include @@ -38,13 +37,8 @@ #include "ApplIDs.h" -static nsresult GetChromeLocale(PRUnichar** localeName); static char* GetResCString(PRInt32 stringIndex, Str255& buf); - -// IDs - -static NS_DEFINE_CID(kChromeRegistryCID, NS_CHROMEREGISTRY_CID); - + //***************************************************************************** // CAppFileLocationProvider::Constructor/Destructor @@ -107,23 +101,8 @@ CAppFileLocationProvider::GetFile(const char *prop, PRBool *persistant, nsIFile rv = localFile->AppendRelativePath(GetResCString(str_PrefDefaultsDirName, strBuf)); } } - else if (nsCRT::strcmp(prop, NS_APP_PROFILE_DEFAULTS_50_DIR) == 0) - { - rv = CloneMozBinDirectory(getter_AddRefs(localFile)); - if (NS_SUCCEEDED(rv)) { - rv = localFile->AppendRelativePath(GetResCString(str_DefaultsDirName, strBuf)); - if (NS_SUCCEEDED(rv)) { - rv = localFile->AppendRelativePath(GetResCString(str_ProfileDefaultsDirName, strBuf)); - if (NS_SUCCEEDED(rv)) { - nsXPIDLString localeName; - rv = GetChromeLocale(getter_Copies(localeName)); - if (NS_SUCCEEDED(rv)) - rv = localFile->AppendRelativeUnicodePath(localeName); - } - } - } - } - else if (nsCRT::strcmp(prop, NS_APP_PROFILE_DEFAULTS_NLOC_50_DIR) == 0) + else if (nsCRT::strcmp(prop, NS_APP_PROFILE_DEFAULTS_NLOC_50_DIR) == 0 || + nsCRT::strcmp(prop, NS_APP_PROFILE_DEFAULTS_50_DIR) == 0) { rv = CloneMozBinDirectory(getter_AddRefs(localFile)); if (NS_SUCCEEDED(rv)) { @@ -272,21 +251,6 @@ NS_METHOD CAppFileLocationProvider::GetDefaultUserProfileRoot(nsILocalFile **aLo // Static Routines //**************************************************************************************** -static nsresult GetChromeLocale(PRUnichar** localeName) -{ - NS_ENSURE_ARG_POINTER(localeName); - - nsresult rv; - *localeName = nsnull; - nsCOMPtr chromeRegistry = do_GetService(kChromeRegistryCID, &rv); - - if (NS_SUCCEEDED(rv)) { - nsString tmpstr; tmpstr.AssignWithConversion("navigator"); - rv = chromeRegistry->GetSelectedLocale(tmpstr.GetUnicode(), localeName); - } - return rv; -} - static char* GetResCString(PRInt32 stringIndex, Str255& buf) { GetIndString(buf, STRx_FileLocProviderStrings, stringIndex); diff --git a/mozilla/embedding/tests/mfcembed/winEmbedFileLocProvider.cpp b/mozilla/embedding/tests/mfcembed/winEmbedFileLocProvider.cpp index cbe046ae6c6..cf10580fe9e 100644 --- a/mozilla/embedding/tests/mfcembed/winEmbedFileLocProvider.cpp +++ b/mozilla/embedding/tests/mfcembed/winEmbedFileLocProvider.cpp @@ -28,14 +28,11 @@ #include "nsILocalFile.h" #include "nsString.h" #include "nsXPIDLString.h" -#include "nsIChromeRegistry.h" #include #include -static nsresult GetChromeLocale(PRUnichar** localeName); -static NS_DEFINE_CID(kChromeRegistryCID, NS_CHROMEREGISTRY_CID); // WARNING: These hard coded names need to go away. They need to // come from localizable resources @@ -112,25 +109,8 @@ winEmbedFileLocProvider::GetFile(const char *prop, PRBool *persistant, nsIFile * rv = localFile->AppendRelativePath(DEFAULTS_PREF_DIR_NAME); } } - else if (nsCRT::strcmp(prop, NS_APP_PROFILE_DEFAULTS_50_DIR) == 0) - { - rv = CloneMozBinDirectory(getter_AddRefs(localFile)); - if (NS_SUCCEEDED(rv)) { - rv = localFile->AppendRelativePath(DEFAULTS_DIR_NAME); - if (NS_SUCCEEDED(rv)) { - rv = localFile->AppendRelativePath(DEFAULTS_PROFILE_DIR_NAME); -#ifndef XPCOM_STANDALONE - if (NS_SUCCEEDED(rv)) { - nsXPIDLString localeName; - rv = GetChromeLocale(getter_Copies(localeName)); - if (NS_SUCCEEDED(rv)) - rv = localFile->AppendRelativeUnicodePath(localeName); - } -#endif - } - } - } - else if (nsCRT::strcmp(prop, NS_APP_PROFILE_DEFAULTS_NLOC_50_DIR) == 0) + else if (nsCRT::strcmp(prop, NS_APP_PROFILE_DEFAULTS_NLOC_50_DIR) == 0 || + nsCRT::strcmp(prop, NS_APP_PROFILE_DEFAULTS_50_DIR) == 0) { rv = CloneMozBinDirectory(getter_AddRefs(localFile)); if (NS_SUCCEEDED(rv)) { @@ -283,25 +263,3 @@ NS_METHOD winEmbedFileLocProvider::GetDefaultUserProfileRoot(nsILocalFile **aLoc return rv; } -//**************************************************************************************** -// Static Routines -//**************************************************************************************** - -#ifndef XPCOM_STANDALONE - -static nsresult GetChromeLocale(PRUnichar** localeName) -{ - NS_ENSURE_ARG_POINTER(localeName); - - nsresult rv; - *localeName = nsnull; - nsCOMPtr chromeRegistry = do_GetService(kChromeRegistryCID, &rv); - - if (NS_SUCCEEDED(rv)) { - nsString tmpstr; tmpstr.AssignWithConversion("navigator"); - rv = chromeRegistry->GetSelectedLocale(tmpstr.GetUnicode(), localeName); - } - return rv; -} - -#endif