diff options
| author | Ben Murdoch <benm@google.com> | 2010-11-18 18:32:45 +0000 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2010-11-18 18:38:07 +0000 |
| commit | 513209b27ff55e2841eac0e4120199c23acce758 (patch) | |
| tree | aeba30bb08c5f47c57003544e378a377c297eee6 /chrome/common/chrome_paths.cc | |
| parent | 164f7496de0fbee436b385a79ead9e3cb81a50c1 (diff) | |
| download | external_chromium-513209b27ff55e2841eac0e4120199c23acce758.zip external_chromium-513209b27ff55e2841eac0e4120199c23acce758.tar.gz external_chromium-513209b27ff55e2841eac0e4120199c23acce758.tar.bz2 | |
Merge Chromium at r65505: Initial merge by git.
Change-Id: I31d8f1d8cd33caaf7f47ffa7350aef42d5fbdb45
Diffstat (limited to 'chrome/common/chrome_paths.cc')
| -rw-r--r-- | chrome/common/chrome_paths.cc | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/chrome/common/chrome_paths.cc b/chrome/common/chrome_paths.cc index 6f77510..181cf0a 100644 --- a/chrome/common/chrome_paths.cc +++ b/chrome/common/chrome_paths.cc @@ -295,6 +295,20 @@ bool PathProvider(int key, FilePath* result) { break; } #endif +#if defined(OS_MACOSX) + case chrome::DIR_MANAGED_PREFS: { + if (!GetLocalLibraryDirectory(&cur)) + return false; + cur = cur.Append(FILE_PATH_LITERAL("Managed Preferences")); + char* login = getlogin(); + if (!login) + return false; + cur = cur.AppendASCII(login); + if (!file_util::PathExists(cur)) // we don't want to create this + return false; + break; + } +#endif default: return false; } |