diff options
author | jhawkins@chromium.org <jhawkins@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-13 20:47:47 +0000 |
---|---|---|
committer | jhawkins@chromium.org <jhawkins@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-13 20:47:47 +0000 |
commit | 11079a4772dacf7865c3d650b7aa911242bb782e (patch) | |
tree | 6731bf180dad1ef9e6ca6fd5ba2ac2130815e2de /base/path_service.cc | |
parent | 8a087f4885188a062320c0fba9feb33e48173b04 (diff) | |
download | chromium_src-11079a4772dacf7865c3d650b7aa911242bb782e.zip chromium_src-11079a4772dacf7865c3d650b7aa911242bb782e.tar.gz chromium_src-11079a4772dacf7865c3d650b7aa911242bb782e.tar.bz2 |
Options2: Pull the trigger.
Options2 is a copy of the resources for and implementation of chrome://settings that will be pared down significantly for UberPage (see bug).
BUG=100885
TEST=none
R=csilv
Review URL: http://codereview.chromium.org/8895023
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@114267 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 256318c..47278c3 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 overriden version. + // check for an overridden 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-existant path. + // on a non-existent 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 glady crash the browser in CHECK()s if they get a + // relative paths, and will gladly crash the browser in CHECK()s if they get a // relative path. if (!file_util::AbsolutePath(&file_path)) return false; |