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 /app | |
| 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 'app')
| -rw-r--r-- | app/app_base.gypi | 1 | ||||
| -rw-r--r-- | app/sql/init_status.h | 23 |
2 files changed, 24 insertions, 0 deletions
diff --git a/app/app_base.gypi b/app/app_base.gypi index bdf1301..f8c86ca 100644 --- a/app/app_base.gypi +++ b/app/app_base.gypi @@ -180,6 +180,7 @@ 'slide_animation.h', 'sql/connection.cc', 'sql/connection.h', + 'sql/init_status.h', 'sql/meta_table.cc', 'sql/meta_table.h', 'sql/statement.cc', diff --git a/app/sql/init_status.h b/app/sql/init_status.h new file mode 100644 index 0000000..ac70c7b --- /dev/null +++ b/app/sql/init_status.h @@ -0,0 +1,23 @@ +// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#ifndef APP_SQL_INIT_STATUS_H_ +#define APP_SQL_INIT_STATUS_H_ + +namespace sql { + +// Used as the return value for some databases' init functions. +enum InitStatus { + INIT_OK, + + // Some error, usually I/O related opening the file. + INIT_FAILURE, + + // The database is from a future version of the app and cannot be read. + INIT_TOO_NEW, +}; + +} // namespace sql + +#endif // APP_SQL_INIT_STATUS_H_ |