diff options
author | jhawkins@chromium.org <jhawkins@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-13 21:58:42 +0000 |
---|---|---|
committer | jhawkins@chromium.org <jhawkins@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-13 21:58:42 +0000 |
commit | 9e77be2cf1bf9c966be4970868faefcc175e2859 (patch) | |
tree | 5b442a2342a539780c5359c1990b1693d5340335 /base/path_service.cc | |
parent | 1022f9f29117c294083d01fa5340eb5307beebbe (diff) | |
download | chromium_src-9e77be2cf1bf9c966be4970868faefcc175e2859.zip chromium_src-9e77be2cf1bf9c966be4970868faefcc175e2859.tar.gz chromium_src-9e77be2cf1bf9c966be4970868faefcc175e2859.tar.bz2 |
Revert "Options2: Pull the trigger."
This reverts commit 11079a4772dacf7865c3d650b7aa911242bb782e.
Revert "Fix build after code changed from underneath."
This reverts commit 93b43a2cd246c85ee6159a70223966f5efe2af86.
Revert "Moar build fix."
This reverts commit bf84b5766d5d05466da641685a1f554786598310.
Revert "Fix the fix."
This reverts commit 4aecf275ac5c7163483f48ffa2abcfa1481ffd53.
R=csilv@chromium.org
BUG=
TEST=
Review URL: http://codereview.chromium.org/8937011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@114276 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/path_service.cc')
-rw-r--r-- | base/path_service.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/base/path_service.cc b/base/path_service.cc index 47278c3..256318c 100644 --- a/base/path_service.cc +++ b/base/path_service.cc @@ -162,7 +162,7 @@ bool PathService::GetFromOverrides(int key, FilePath* result) { PathData* path_data = GetPathData(); base::AutoLock scoped_lock(path_data->lock); - // check for an overridden version. + // check for an overriden version. PathMap::const_iterator it = path_data->overrides.find(key); if (it != path_data->overrides.end()) { *result = it->second; @@ -230,13 +230,13 @@ bool PathService::Override(int key, const FilePath& path) { // Make sure the directory exists. We need to do this before we translate // this to the absolute path because on POSIX, AbsolutePath fails if called - // on a non-existent path. + // on a non-existant path. if (!file_util::PathExists(file_path) && !file_util::CreateDirectory(file_path)) return false; // We need to have an absolute path, as extensions and plugins don't like - // relative paths, and will gladly crash the browser in CHECK()s if they get a + // relative paths, and will glady crash the browser in CHECK()s if they get a // relative path. if (!file_util::AbsolutePath(&file_path)) return false; |