diff options
author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-18 00:19:44 +0000 |
---|---|---|
committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-18 00:19:44 +0000 |
commit | b3b2d6e76a2cfbb02933298c565d3718b0288774 (patch) | |
tree | 548c4d8fe0b7c7d22c44e045a61c7719977359cc /chrome/browser/history/archived_database.cc | |
parent | 5786d3d3a7cd151fb5dc0aa2f1f0d84460fb6cdf (diff) | |
download | chromium_src-b3b2d6e76a2cfbb02933298c565d3718b0288774.zip chromium_src-b3b2d6e76a2cfbb02933298c565d3718b0288774.tar.gz chromium_src-b3b2d6e76a2cfbb02933298c565d3718b0288774.tar.bz2 |
Fixes two related bugs:
. If we can't init the web db a dialog is shown to the user.
. If we can't init the web db the default search provider no longer
becomes NULL.
BUG=28374
TEST=none
Review URL: http://codereview.chromium.org/501090
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@34901 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/history/archived_database.cc')
-rw-r--r-- | chrome/browser/history/archived_database.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/chrome/browser/history/archived_database.cc b/chrome/browser/history/archived_database.cc index b7cd8bd..1b9e010 100644 --- a/chrome/browser/history/archived_database.cc +++ b/chrome/browser/history/archived_database.cc @@ -64,7 +64,7 @@ bool ArchivedDatabase::Init(const FilePath& file_name) { } CreateMainURLIndex(); - if (EnsureCurrentVersion() != INIT_OK) { + if (EnsureCurrentVersion() != sql::INIT_OK) { db_.Close(); return false; } @@ -86,11 +86,11 @@ sql::Connection& ArchivedDatabase::GetDB() { // Migration ------------------------------------------------------------------- -InitStatus ArchivedDatabase::EnsureCurrentVersion() { +sql::InitStatus ArchivedDatabase::EnsureCurrentVersion() { // We can't read databases newer than we were designed for. if (meta_table_.GetCompatibleVersionNumber() > kCurrentVersionNumber) { LOG(WARNING) << "Archived database is too new."; - return INIT_TOO_NEW; + return sql::INIT_TOO_NEW; } // NOTICE: If you are changing structures for things shared with the archived @@ -103,7 +103,7 @@ InitStatus ArchivedDatabase::EnsureCurrentVersion() { if (cur_version == 1) { if (!DropStarredIDFromURLs()) { LOG(WARNING) << "Unable to update archived database to version 2."; - return INIT_FAILURE; + return sql::INIT_FAILURE; } ++cur_version; meta_table_.SetVersionNumber(cur_version); @@ -118,6 +118,6 @@ InitStatus ArchivedDatabase::EnsureCurrentVersion() { LOG_IF(WARNING, cur_version < kCurrentVersionNumber) << "Archived database version " << cur_version << " is too old to handle."; - return INIT_OK; + return sql::INIT_OK; } } // namespace history |