diff options
| author | robertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-28 00:25:34 +0000 |
|---|---|---|
| committer | robertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-28 00:25:34 +0000 |
| commit | fd1e44cd31fc8c90d39479a5fe4bae6019a989b3 (patch) | |
| tree | c615848c4a19eabd5b30918b4c233796136ef986 /chrome/common/chrome_paths_linux.cc | |
| parent | 7a28f1690831eeb3c33d259a7bad9e676ce41ed7 (diff) | |
| download | chromium_src-fd1e44cd31fc8c90d39479a5fe4bae6019a989b3.zip chromium_src-fd1e44cd31fc8c90d39479a5fe4bae6019a989b3.tar.gz chromium_src-fd1e44cd31fc8c90d39479a5fe4bae6019a989b3.tar.bz2 | |
Remove the Chrome Frame preprocessor define in chrome_constants.cc and deal with resulting fallout.
Also, remove several instances of Chrome Frame using wstrings instead of FilePaths.
The main goal of this patch is to move towards ensuring that Chrome Frame and Google Chrome share binary-identical exes and dlls except for setup.exe and mini_installer.exe.
Review URL: http://codereview.chromium.org/338025
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@30290 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common/chrome_paths_linux.cc')
| -rw-r--r-- | chrome/common/chrome_paths_linux.cc | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/chrome/common/chrome_paths_linux.cc b/chrome/common/chrome_paths_linux.cc index abc7f8d..71cb03f 100644 --- a/chrome/common/chrome_paths_linux.cc +++ b/chrome/common/chrome_paths_linux.cc @@ -72,6 +72,16 @@ bool GetDefaultUserDataDirectory(FilePath* result) { return true; } +bool GetChromeFrameUserDataDirectory(FilePath* result) { + FilePath config_dir(GetXDGDirectory("XDG_CONFIG_HOME", ".config")); +#if defined(GOOGLE_CHROME_BUILD) + *result = config_dir.Append("google-chrome-frame"); +#else + *result = config_dir.Append("chrome-frame"); +#endif + return true; +} + // See http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html // for a spec on where cache files go. The net effect for most // systems is we use ~/.cache/chromium/ for Chromium and |