diff options
| author | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-18 20:50:46 +0000 |
|---|---|---|
| committer | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-18 20:50:46 +0000 |
| commit | 0a8f88c90840e5f642e6bc64e150229d336eca72 (patch) | |
| tree | 646c7fd7c7ccd20c8902c9b8058b5f675418c098 /chrome/browser/history/archived_database.h | |
| parent | 420949ff13d309c7bbc56173bca33ee4ffafd1b3 (diff) | |
| download | chromium_src-0a8f88c90840e5f642e6bc64e150229d336eca72.zip chromium_src-0a8f88c90840e5f642e6bc64e150229d336eca72.tar.gz chromium_src-0a8f88c90840e5f642e6bc64e150229d336eca72.tar.bz2 | |
Ports all of the chrome/browser/history code to use FilePath, except
for DownloadDatabase, InMemoryDatabase, and RedirectUiTest. Except for in those
files, we now only use std::wstring for text strings.
This CL also enables two more unittests on Mac.
patch by Rohit Rao.
http://codereview.chromium.org/48018
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@12009 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/history/archived_database.h')
| -rw-r--r-- | chrome/browser/history/archived_database.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/chrome/browser/history/archived_database.h b/chrome/browser/history/archived_database.h index 719fdf5..5693091 100644 --- a/chrome/browser/history/archived_database.h +++ b/chrome/browser/history/archived_database.h @@ -2,10 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_BROWSER_HISTORY_ARCHIVED_DATABASE_H__ -#define CHROME_BROWSER_HISTORY_ARCHIVED_DATABASE_H__ +#ifndef CHROME_BROWSER_HISTORY_ARCHIVED_DATABASE_H_ +#define CHROME_BROWSER_HISTORY_ARCHIVED_DATABASE_H_ #include "base/basictypes.h" +#include "base/file_path.h" #include "chrome/browser/history/download_database.h" #include "chrome/browser/history/url_database.h" #include "chrome/browser/history/visit_database.h" @@ -29,7 +30,7 @@ class ArchivedDatabase : public URLDatabase, // Initializes the database connection. This must return true before any other // functions on this class are called. - bool Init(const std::wstring& file_name); + bool Init(const FilePath& file_name); // Transactions on the database. We support nested transactions and only // commit when the outermost one is committed (sqlite doesn't support true @@ -64,9 +65,9 @@ class ArchivedDatabase : public URLDatabase, MetaTableHelper meta_table_; - DISALLOW_EVIL_CONSTRUCTORS(ArchivedDatabase); + DISALLOW_COPY_AND_ASSIGN(ArchivedDatabase); }; } // namespace history -#endif // CHROME_BROWSER_HISTORY_ARCHIVED_DATABASE_H__ +#endif // CHROME_BROWSER_HISTORY_ARCHIVED_DATABASE_H_ |