diff options
| author | mrossetti@chromium.org <mrossetti@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-11 02:49:05 +0000 |
|---|---|---|
| committer | mrossetti@chromium.org <mrossetti@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-11 02:49:05 +0000 |
| commit | b4113d5feb3b47f5f9aaa4e7aeeacc0d95d81f36 (patch) | |
| tree | e455862522cfe5a297c70edbce743e021a5769af /chrome/browser/history | |
| parent | 1c966c891f7f495fd08c84b58ec145bd6bd7d181 (diff) | |
| download | chromium_src-b4113d5feb3b47f5f9aaa4e7aeeacc0d95d81f36.zip chromium_src-b4113d5feb3b47f5f9aaa4e7aeeacc0d95d81f36.tar.gz chromium_src-b4113d5feb3b47f5f9aaa4e7aeeacc0d95d81f36.tar.bz2 | |
For the immediate milestone, exclude History and Thumbnails from being backed up by Time Machine. The bug describes appropriate long-term solutions to this problem.
BUG=259595
TEST=Launch Chrome. Inspect the following files found in ~/Library/Application Support/Chromium/Default/: a) History, b) History-journal, c) Thumbnails, and d) Thumbnails-journal and verify that they are not being backed up by Time Machine.
Review URL: http://codereview.chromium.org/387016
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@31644 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/history')
| -rw-r--r-- | chrome/browser/history/history_database.cc | 13 | ||||
| -rw-r--r-- | chrome/browser/history/thumbnail_database.cc | 12 |
2 files changed, 24 insertions, 1 deletions
diff --git a/chrome/browser/history/history_database.cc b/chrome/browser/history/history_database.cc index 87367a4..37296b0 100644 --- a/chrome/browser/history/history_database.cc +++ b/chrome/browser/history/history_database.cc @@ -7,9 +7,11 @@ #include <algorithm> #include <set> #include <string> - #include "app/sql/transaction.h" #include "base/file_util.h" +#if defined(OS_MACOSX) +#include "base/mac_util.h" +#endif #include "base/histogram.h" #include "base/rand_util.h" #include "base/string_util.h" @@ -88,6 +90,15 @@ InitStatus HistoryDatabase::Init(const FilePath& history_name, if (!committer.Begin()) return INIT_FAILURE; +#if defined(OS_MACOSX) + // Exclude the history file and its journal from backups. + mac_util::SetFileBackupExclusion(history_name, true); + FilePath::StringType history_name_string(history_name.value()); + history_name_string += "-journal"; + FilePath history_journal_name(history_name_string); + mac_util::SetFileBackupExclusion(history_journal_name, true); +#endif + // Prime the cache. db_.Preload(); diff --git a/chrome/browser/history/thumbnail_database.cc b/chrome/browser/history/thumbnail_database.cc index 96aebf7..8ce38da 100644 --- a/chrome/browser/history/thumbnail_database.cc +++ b/chrome/browser/history/thumbnail_database.cc @@ -8,6 +8,9 @@ #include "app/sql/statement.h" #include "app/sql/transaction.h" #include "base/file_util.h" +#if defined(OS_MACOSX) +#include "base/mac_util.h" +#endif #include "base/time.h" #include "base/string_util.h" #include "chrome/browser/diagnostics/sqlite_diagnostics.h" @@ -63,6 +66,15 @@ InitStatus ThumbnailDatabase::Init(const FilePath& db_name, sql::Transaction transaction(&db_); transaction.Begin(); +#if defined(OS_MACOSX) + // Exclude the thumbnails file and its journal from backups. + mac_util::SetFileBackupExclusion(db_name, true); + FilePath::StringType db_name_string(db_name.value()); + db_name_string += "-journal"; + FilePath db_journal_name(db_name_string); + mac_util::SetFileBackupExclusion(db_journal_name, true); +#endif + // Create the tables. if (!meta_table_.Init(&db_, kCurrentVersionNumber, kCompatibleVersionNumber) || |