chrome/browser/webdata/keyword_table.cc - Issue 9965143: Revert 130431 - Move the URL string from TemplateURLRef onto the owning TemplateURL. This will mak…

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 9965143: Revert 130431 - Move the URL string from TemplateURLRef onto the owning TemplateURL. This will mak… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 8 years, 9 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 | « chrome/browser/ui/webui/options2/search_engine_manager_handler2.cc ('k') | chrome/browser/webdata/keyword_table_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/webdata/keyword_table.cc

===================================================================

--- chrome/browser/webdata/keyword_table.cc (revision 130565)

+++ chrome/browser/webdata/keyword_table.cc (working copy)

@@ -61,7 +61,8 @@

s->BindString(starting_column + 2, url.favicon_url().is_valid() ?

history::HistoryDatabase::GURLToDatabaseURL(url.favicon_url()) :

std::string());

- s->BindString(starting_column + 3, url.url());

+ s->BindString(starting_column + 3,

+ url.url() ? url.url()->url() : std::string());

s->BindBool(starting_column + 4, url.safe_for_autoreplace());

s->BindString(starting_column + 5, url.originating_url().is_valid() ?

history::HistoryDatabase::GURLToDatabaseURL(url.originating_url()) :

@@ -70,12 +71,14 @@

s->BindInt(starting_column + 7, url.usage_count());

s->BindString(starting_column + 8, JoinString(url.input_encodings(), ';'));

s->BindBool(starting_column + 9, url.show_in_default_list());

- s->BindString(starting_column + 10, url.suggestions_url());

+ s->BindString(starting_column + 10,

+ url.suggestions_url() ? url.suggestions_url()->url() : std::string());

s->BindInt(starting_column + 11, url.prepopulate_id());

s->BindInt(starting_column + 12, url.autogenerate_keyword() ? 1 : 0);

s->BindInt(starting_column + 13, 0);

s->BindBool(starting_column + 14, url.created_by_policy());

- s->BindString(starting_column + 15, url.instant_url());

+ s->BindString(starting_column + 15,

+ url.instant_url() ? url.instant_url()->url() : std::string());

s->BindInt64(starting_column + 16, url.last_modified().ToTimeT());

s->BindString(starting_column + 17, url.sync_guid());

}