diff options
Diffstat (limited to 'base')
| -rw-r--r-- | base/path_service.cc | 4 | ||||
| -rw-r--r-- | base/path_service.h | 10 |
2 files changed, 3 insertions, 11 deletions
diff --git a/base/path_service.cc b/base/path_service.cc index 3e34892..a1b1db9 100644 --- a/base/path_service.cc +++ b/base/path_service.cc @@ -231,10 +231,6 @@ bool PathService::Override(int key, const FilePath& path) { return true; } -bool PathService::Override(int key, const std::wstring& path) { - return Override(key, FilePath::FromWStringHack(path)); -} - bool PathService::SetCurrentDirectory(const std::wstring& current_directory) { return file_util::SetCurrentDirectory(current_directory); } diff --git a/base/path_service.h b/base/path_service.h index 9cd0889..c85a39a 100644 --- a/base/path_service.h +++ b/base/path_service.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef BASE_PATH_SERVICE_H__ -#define BASE_PATH_SERVICE_H__ +#ifndef BASE_PATH_SERVICE_H_ +#define BASE_PATH_SERVICE_H_ #include "build/build_config.h" #ifdef OS_WIN @@ -49,9 +49,6 @@ class PathService { // WARNING: Consumers of PathService::Get may expect paths to be constant // over the lifetime of the app, so this method should be used with caution. static bool Override(int key, const FilePath& path); - // This version, using a wstring, is deprecated and only kept around - // until we can fix all callers. - static bool Override(int key, const std::wstring& path); // Return whether a path was overridden. static bool IsOverridden(int key); @@ -77,7 +74,6 @@ class PathService { private: static bool GetFromCache(int key, FilePath* path); static void AddToCache(int key, const FilePath& path); - }; -#endif // BASE_PATH_SERVICE_H__ +#endif // BASE_PATH_SERVICE_H_ |