summaryrefslogtreecommitdiffstats
path: root/chrome/browser/webdata/web_database.cc
diff options
context:
space:
mode:
authorbeaudoin@chromium.org <beaudoin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-01-03 21:22:43 +0000
committerbeaudoin@chromium.org <beaudoin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-01-03 21:22:43 +0000
commit008987b027bb94fcffec30e2680d712a7eaf9912 (patch)
tree11991e5b517d991c537add773fa32fab316caf58 /chrome/browser/webdata/web_database.cc
parent7f25632befd598b0fa96088c03d16ed604724819 (diff)
downloadchromium_src-008987b027bb94fcffec30e2680d712a7eaf9912.zip
chromium_src-008987b027bb94fcffec30e2680d712a7eaf9912.tar.gz
chromium_src-008987b027bb94fcffec30e2680d712a7eaf9912.tar.bz2
Add search_terms_replacement_key field to TemplateURL.
This CL is the first step in removing the hardcoded "espv" parameter used by instant-extended to detect when to perform search term replacement in the omnibox. The search_terms_replacement_key has beed added to prepopulated_engines, TemplateURL, policy, web_database, prefs, and sync. BUG=161602 Review URL: https://chromiumcodereview.appspot.com/11552020 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@175014 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/webdata/web_database.cc')
-rw-r--r--chrome/browser/webdata/web_database.cc10
1 files changed, 9 insertions, 1 deletions
diff --git a/chrome/browser/webdata/web_database.cc b/chrome/browser/webdata/web_database.cc
index 02c1f80..fac52f5 100644
--- a/chrome/browser/webdata/web_database.cc
+++ b/chrome/browser/webdata/web_database.cc
@@ -21,7 +21,7 @@
// corresponding changes must happen in the unit tests, and new migration test
// added. See |WebDatabaseMigrationTest::kCurrentTestedVersionNumber|.
// static
-const int WebDatabase::kCurrentVersionNumber = 48;
+const int WebDatabase::kCurrentVersionNumber = 49;
namespace {
@@ -357,6 +357,14 @@ sql::InitStatus WebDatabase::MigrateOldVersionsAsNeeded() {
ChangeVersion(&meta_table_, 48, true);
// FALL THROUGH
+ case 48:
+ if (!keyword_table_->
+ MigrateToVersion49AddSearchTermsReplacementKeyColumn())
+ return FailedMigrationTo(49);
+
+ ChangeVersion(&meta_table_, 49, true);
+ // FALL THROUGH
+
// Add successive versions here. Each should set the version number and
// compatible version number as appropriate, then fall through to the next
// case.