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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 7980028: Ensure that TemplateURLs created from old database entries without sync_guids generate their own ... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 3 months 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
« no previous file with comments | « no previous file | chrome/browser/webdata/keyword_table_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/webdata/keyword_table.cc
===================================================================
--- chrome/browser/webdata/keyword_table.cc (revision 101377)
+++ chrome/browser/webdata/keyword_table.cc (working copy)
@@ -189,7 +189,10 @@
template_url->set_last_modified(Time::FromTimeT(s.ColumnInt64(17)));
- template_url->set_sync_guid(s.ColumnString(18));
+ // If the persisted sync_guid was empty, we ignore it and allow the TURL to
+ // keep its generated GUID.
+ if (!s.ColumnString(18).empty())
+ template_url->set_sync_guid(s.ColumnString(18));
urls->push_back(template_url);
}
« no previous file with comments | « no previous file | chrome/browser/webdata/keyword_table_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698