diff options
| author | jcampan@chromium.org <jcampan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-02 17:18:22 +0000 |
|---|---|---|
| committer | jcampan@chromium.org <jcampan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-02 17:18:22 +0000 |
| commit | 057a8553ab9f8cb5cc9cbecf0ddb8a73afe6f6c7 (patch) | |
| tree | 05ed42974e9a8863bfa6c59fd2a9419c8e9ec3d6 /base/path_service.h | |
| parent | f103ab7a3af66f93aa6b674598ee8c977917f5f2 (diff) | |
| download | chromium_src-057a8553ab9f8cb5cc9cbecf0ddb8a73afe6f6c7.zip chromium_src-057a8553ab9f8cb5cc9cbecf0ddb8a73afe6f6c7.tar.gz chromium_src-057a8553ab9f8cb5cc9cbecf0ddb8a73afe6f6c7.tar.bz2 | |
Landing the patch of Thiago Farina.
See http://codereview.chromium.org/183025
Removes the deprecated version of PathService::Override that uses std::wstring
and fix the callers.
BUG=None
TEST=None
Review URL: http://codereview.chromium.org/185007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25185 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/path_service.h')
| -rw-r--r-- | base/path_service.h | 10 |
1 files changed, 3 insertions, 7 deletions
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_ |