Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1492)

Unified Diff: chrome/browser/webdata/web_database.cc

Issue 11552020: Add search_terms_replacement_key field to TemplateURL. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merged with protector removal Created 8 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/webdata/web_database.cc
diff --git a/chrome/browser/webdata/web_database.cc b/chrome/browser/webdata/web_database.cc
index 02c1f801b2955ab0854259577d8d50e803b65c91..90d703e785572b2fae5e473f1df3806689ecfefc 100644
--- a/chrome/browser/webdata/web_database.cc
+++ b/chrome/browser/webdata/web_database.cc
@@ -21,11 +21,11 @@
// 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 {
-const int kCompatibleVersionNumber = 48;
+const int kCompatibleVersionNumber = 49;
Peter Kasting 2012/12/18 01:54:43 I think maybe the compatible version can stay at 4
beaudoin 2012/12/20 04:23:29 Not 100% what this entails. I'll trust you on this
// Change the version number and possibly the compatibility version of
// |meta_table_|.
@@ -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.

Powered by Google App Engine
This is Rietveld 408576698