diff options
author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-10 03:41:45 +0000 |
---|---|---|
committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-10 03:41:45 +0000 |
commit | 650b2d5cdcab7d2c473c00d15b9f343f3a3405bb (patch) | |
tree | 1343ea25d7d6086ac1279e1e0e32562b3b9b3477 /chrome/browser/history/text_database.h | |
parent | 6f3638708ff440a2e80662ce49acc41cdad51ecd (diff) | |
download | chromium_src-650b2d5cdcab7d2c473c00d15b9f343f3a3405bb.zip chromium_src-650b2d5cdcab7d2c473c00d15b9f343f3a3405bb.tar.gz chromium_src-650b2d5cdcab7d2c473c00d15b9f343f3a3405bb.tar.bz2 |
Merge branch 'master' into file_path_browser
version control markers
Merge branch 'master' into file_path_browser
remove version control
Fix typo
Merge branch 'master' into file_path_browser
Conflicts:
chrome/browser/intents/native_services_browsertest.cc
chrome/browser/ui/intents/native_file_picker_service.cc
Merge branch 'master' into file_path_browser
Conflicts:
chrome/browser/chromeos/drive/drive_file_system.cc
chrome/browser/chromeos/drive/drive_file_system.h
chrome/browser/chromeos/drive/drive_file_system_interface.h
chrome/browser/chromeos/drive/drive_file_system_unittest.cc
chrome/browser/chromeos/drive/file_system/drive_operations.cc
chrome/browser/chromeos/login/wallpaper_manager.cc
chrome/browser/chromeos/login/wallpaper_manager.h
chrome/browser/chromeos/login/wallpaper_manager_browsertest.cc
chrome/browser/extensions/api/sync_file_system/extension_sync_event_observer.cc
chrome/browser/google_apis/gdata_wapi_operations.cc
chrome/browser/google_apis/gdata_wapi_operations.h
chrome/browser/google_apis/gdata_wapi_operations_unittest.cc
chrome/browser/profiles/off_the_record_profile_impl.cc
chrome/browser/profiles/off_the_record_profile_impl.h
chrome/browser/profiles/profile_impl.cc
chrome/browser/profiles/profile_impl.h
chrome/browser/profiles/profile_impl_io_data.cc
chrome/browser/profiles/profile_impl_io_data.h
chrome/browser/sync_file_system/drive_file_sync_client_unittest.cc
chrome/browser/ui/webui/options/manage_profile_handler.cc
Long lines
long lines
some long lines.
long lines
long lines
Beginning of lines.
Rename FilePath -> base::FilePath in chrome/browser
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@181638 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/history/text_database.h')
-rw-r--r-- | chrome/browser/history/text_database.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/chrome/browser/history/text_database.h b/chrome/browser/history/text_database.h index 9baa187..7be7870 100644 --- a/chrome/browser/history/text_database.h +++ b/chrome/browser/history/text_database.h @@ -70,7 +70,7 @@ class TextDatabase { // |allow_create| indicates if we want to allow creation of the file if it // doesn't exist. For files associated with older time periods, we don't want // to create them if they don't exist, so this flag would be false. - TextDatabase(const FilePath& path, + TextDatabase(const base::FilePath& path, DBIdent id, bool allow_create); ~TextDatabase(); @@ -89,16 +89,16 @@ class TextDatabase { // For testing, returns the file name of the database so it can be deleted // after the test. This is valid even before Init() is called. - const FilePath& file_name() const { return file_name_; } + const base::FilePath& file_name() const { return file_name_; } // Returns a NULL-terminated string that is the base of history index files, // which is the part before the database identifier. For example // "History Index *". This is for finding existing database files. - static const FilePath::CharType* file_base(); + static const base::FilePath::CharType* file_base(); // Converts a filename on disk (optionally including a path) to a database // identifier. If the filename doesn't have the correct format, returns 0. - static DBIdent FileNameToID(const FilePath& file_path); + static DBIdent FileNameToID(const base::FilePath& file_path); // Changing operations ------------------------------------------------------- @@ -142,7 +142,7 @@ class TextDatabase { // Converts the given database identifier to a filename. This does not include // the path, just the file and extension. - static FilePath IDToFileName(DBIdent id); + static base::FilePath IDToFileName(DBIdent id); private: // Ensures that the tables and indices are created. Returns true on success. @@ -151,12 +151,12 @@ class TextDatabase { // The sql database. Not valid until Init is called. sql::Connection db_; - const FilePath path_; + const base::FilePath path_; const DBIdent ident_; const bool allow_create_; // Full file name of the file on disk, computed in Init(). - FilePath file_name_; + base::FilePath file_name_; sql::MetaTable meta_table_; |