diff options
| author | erikkay@chromium.org <erikkay@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-16 16:31:28 +0000 |
|---|---|---|
| committer | erikkay@chromium.org <erikkay@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-16 16:31:28 +0000 |
| commit | 188505284e175f0f75c341c1a7fbe00ca1773324 (patch) | |
| tree | e1e868575e2b04b802770eb4579ce96271890dd0 /base/path_service.h | |
| parent | 2242609d9f24588b538af015d3ada1d4a9f8beb1 (diff) | |
| download | chromium_src-188505284e175f0f75c341c1a7fbe00ca1773324.zip chromium_src-188505284e175f0f75c341c1a7fbe00ca1773324.tar.gz chromium_src-188505284e175f0f75c341c1a7fbe00ca1773324.tar.bz2 | |
Quick fix to use file_util::SetCurrentDirectory method instead of the PathService method, also avoids the conflict with the the windows function.
BUG=None
TEST=None
Review URL: http://codereview.chromium.org/196072
Patch from thiago.farina@gmail.com.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26351 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/path_service.h')
| -rw-r--r-- | base/path_service.h | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/base/path_service.h b/base/path_service.h index c85a39a..39aaa2a 100644 --- a/base/path_service.h +++ b/base/path_service.h @@ -6,14 +6,6 @@ #define BASE_PATH_SERVICE_H_ #include "build/build_config.h" -#ifdef OS_WIN -// TODO(erikkay): this should be removable, but because SetCurrentDirectory -// is the name of a Windows function, it gets macro-ized to SetCurrentDirectoryW -// by windows.h, which leads to a different name in the header vs. the impl. -// Even if we could fix that, it would still hose all callers of the function. -// The right thing is likely to rename. -#include <windows.h> -#endif #include <string> @@ -53,9 +45,6 @@ class PathService { // Return whether a path was overridden. static bool IsOverridden(int key); - // Sets the current directory. - static bool SetCurrentDirectory(const std::wstring& current_directory); - // To extend the set of supported keys, you can register a path provider, // which is just a function mirroring PathService::Get. The ProviderFunc // returns false if it cannot provide a non-empty path for the given key. |