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/starred_url_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/starred_url_database.h')
| -rw-r--r-- | chrome/browser/history/starred_url_database.h | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/chrome/browser/history/starred_url_database.h b/chrome/browser/history/starred_url_database.h index 434fab7..174e1da 100644 --- a/chrome/browser/history/starred_url_database.h +++ b/chrome/browser/history/starred_url_database.h @@ -2,13 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_BROWSER_HISTORY_STARRED_URL_DATABASE_H__ -#define CHROME_BROWSER_HISTORY_STARRED_URL_DATABASE_H__ +#ifndef CHROME_BROWSER_HISTORY_STARRED_URL_DATABASE_H_ +#define CHROME_BROWSER_HISTORY_STARRED_URL_DATABASE_H_ #include <map> #include <set> #include "base/basictypes.h" +#include "base/file_path.h" #include "chrome/browser/history/history_types.h" #include "chrome/browser/history/url_database.h" #include "chrome/views/controls/tree/tree_node_model.h" @@ -36,7 +37,7 @@ class StarredURLDatabase : public URLDatabase { FRIEND_TEST(HistoryTest, CreateStarGroup); // Writes bookmarks to the specified file. - bool MigrateBookmarksToFile(const std::wstring& path); + bool MigrateBookmarksToFile(const FilePath& path); // Returns the database and statement cache for the functions in this // interface. The decendent of this class implements these functions to @@ -175,11 +176,11 @@ class StarredURLDatabase : public URLDatabase { // Does the work of migrating bookmarks to a temporary file that // BookmarkStorage will read from. - bool MigrateBookmarksToFileImpl(const std::wstring& path); + bool MigrateBookmarksToFileImpl(const FilePath& path); - DISALLOW_EVIL_CONSTRUCTORS(StarredURLDatabase); + DISALLOW_COPY_AND_ASSIGN(StarredURLDatabase); }; } // namespace history -#endif // CHROME_BROWSER_HISTORY_STARRED_URL_DATABASE_H__ +#endif // CHROME_BROWSER_HISTORY_STARRED_URL_DATABASE_H_ |