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

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: Removed logic to check search_terms_replacement_key in template_url.cc. This is for a next CL. 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 cdf9d5828cb624ee7aa13d169169f546efaf6c5c..272909996fb6d9c39f4be75fa30d4c4e4f219f97 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 = 47;
+const int WebDatabase::kCurrentVersionNumber = 48;
Joao da Silva 2012/12/13 10:12:26 Shouldn't this version match kCurrentDataVersion i
beaudoin 2012/12/13 17:14:53 I don't think so, I believe their closeness is coi
namespace {
-const int kCompatibleVersionNumber = 47;
+const int kCompatibleVersionNumber = 48;
// Change the version number and possibly the compatibility version of
// |meta_table_|.
@@ -350,6 +350,14 @@ sql::InitStatus WebDatabase::MigrateOldVersionsAsNeeded() {
ChangeVersion(&meta_table_, 47, true);
// FALL THROUGH
+ case 47:
+ if (!keyword_table_->
+ MigrateToVersion48AddSearchTermsReplacementKeyColumn())
+ return FailedMigrationTo(48);
+
+ ChangeVersion(&meta_table_, 48, 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