diff options
| author | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-10 03:25:40 +0000 |
|---|---|---|
| committer | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-10 03:25:40 +0000 |
| commit | fc3fc45793bbd882909b01e2c0f771741f4849ed (patch) | |
| tree | fe0c38eea8c3615066355034ff934545b3aa7f89 /chrome/browser/history/history_backend.cc | |
| parent | 4bcac78e6c353cd9823f559dc8c6181e824e88ce (diff) | |
| download | chromium_src-fc3fc45793bbd882909b01e2c0f771741f4849ed.zip chromium_src-fc3fc45793bbd882909b01e2c0f771741f4849ed.tar.gz chromium_src-fc3fc45793bbd882909b01e2c0f771741f4849ed.tar.bz2 | |
Re-check in some of my dynamic linking change.
We can't link in any more of these fixed .cc files because of a chain of
dependencies:
- temp_scaffolding_stubs defines the same symbols as these files
- removing the scaffolding pulls in more source
- pulling in that extra source breaks on Mac.
I have resigned myself to checking in this small bit.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@9448 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/history/history_backend.cc')
| -rw-r--r-- | chrome/browser/history/history_backend.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/history/history_backend.cc b/chrome/browser/history/history_backend.cc index c899700..6bed37a 100644 --- a/chrome/browser/history/history_backend.cc +++ b/chrome/browser/history/history_backend.cc @@ -477,7 +477,7 @@ void HistoryBackend::InitImpl() { std::wstring archived_name = GetArchivedFileName(); std::wstring tmp_bookmarks_file = history_dir_; file_util::AppendToPath(&tmp_bookmarks_file, - chrome::kHistoryBookmarksFileName); + FilePath(chrome::kHistoryBookmarksFileName).ToWStringHack()); // History database. db_.reset(new HistoryDatabase()); |