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/webdata/web_database.h | |
| 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/webdata/web_database.h')
| -rw-r--r-- | chrome/browser/webdata/web_database.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/chrome/browser/webdata/web_database.h b/chrome/browser/webdata/web_database.h index f5451ab..24bba2d 100644 --- a/chrome/browser/webdata/web_database.h +++ b/chrome/browser/webdata/web_database.h @@ -8,6 +8,7 @@ #include <vector> #include "app/sql/connection.h" +#include "app/sql/init_status.h" #include "app/sql/meta_table.h" #include "chrome/browser/search_engines/template_url.h" #include "third_party/skia/include/core/SkBitmap.h" @@ -40,8 +41,8 @@ class WebDatabase { ~WebDatabase(); // Initialize the database given a name. The name defines where the sqlite - // file is. If false is returned, no other method should be called. - bool Init(const FilePath& db_name); + // file is. If this returns an error code, no other method should be called. + sql::InitStatus Init(const FilePath& db_name); // Transactions management void BeginTransaction(); |