diff options
author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-02 05:12:33 +0000 |
---|---|---|
committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-02 05:12:33 +0000 |
commit | a3ef4830d5b5fdc52e5d7d0cb33dae8844f0961e (patch) | |
tree | bdd4dac76e6034ef6cf33450e203269a715ea0e6 /webkit/database/database_tracker.h | |
parent | 8bc574c57115e9ffd0169f33131c0865997dcb35 (diff) | |
download | chromium_src-a3ef4830d5b5fdc52e5d7d0cb33dae8844f0961e.zip chromium_src-a3ef4830d5b5fdc52e5d7d0cb33dae8844f0961e.tar.gz chromium_src-a3ef4830d5b5fdc52e5d7d0cb33dae8844f0961e.tar.bz2 |
Add FilePath to base namespace.
This updates headers that forward-declare it and a few random places to use the namespace explicitly. There us a using declaration in file_path.h that makes the rest compile, which we can do in future passes.
Review URL: https://codereview.chromium.org/12163003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@180245 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/database/database_tracker.h')
-rw-r--r-- | webkit/database/database_tracker.h | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/webkit/database/database_tracker.h b/webkit/database/database_tracker.h index df3079a..956a72e 100644 --- a/webkit/database/database_tracker.h +++ b/webkit/database/database_tracker.h @@ -38,8 +38,9 @@ class SpecialStoragePolicy; namespace webkit_database { -WEBKIT_STORAGE_EXPORT extern const FilePath::CharType kDatabaseDirectoryName[]; -WEBKIT_STORAGE_EXPORT extern const FilePath::CharType +WEBKIT_STORAGE_EXPORT extern const base::FilePath::CharType + kDatabaseDirectoryName[]; +WEBKIT_STORAGE_EXPORT extern const base::FilePath::CharType kTrackerDatabaseFileName[]; class DatabasesTable; @@ -93,7 +94,7 @@ class WEBKIT_STORAGE_EXPORT DatabaseTracker virtual ~Observer() {} }; - DatabaseTracker(const FilePath& profile_path, + DatabaseTracker(const base::FilePath& profile_path, bool is_incognito, quota::SpecialStoragePolicy* special_storage_policy, quota::QuotaManagerProxy* quota_manager_proxy, @@ -119,8 +120,8 @@ class WEBKIT_STORAGE_EXPORT DatabaseTracker void CloseTrackerDatabaseAndClearCaches(); - const FilePath& DatabaseDirectory() const { return db_dir_; } - FilePath GetFullDBFilePath(const string16& origin_identifier, + const base::FilePath& DatabaseDirectory() const { return db_dir_; } + base::FilePath GetFullDBFilePath(const string16& origin_identifier, const string16& database_name); // virtual for unit-testing only @@ -264,8 +265,8 @@ class WEBKIT_STORAGE_EXPORT DatabaseTracker const bool is_incognito_; bool force_keep_session_state_; bool shutting_down_; - const FilePath profile_path_; - const FilePath db_dir_; + const base::FilePath profile_path_; + const base::FilePath db_dir_; scoped_ptr<sql::Connection> db_; scoped_ptr<DatabasesTable> databases_table_; scoped_ptr<sql::MetaTable> meta_table_; |