diff options
| author | msw@chromium.org <msw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-16 11:29:03 +0000 |
|---|---|---|
| committer | msw@chromium.org <msw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-16 11:29:03 +0000 |
| commit | 667b1dd812092dc80759c654d439e06882c74474 (patch) | |
| tree | 8d75b8b6bedc68365664698fe79641237e0eb887 /chrome/browser/webdata/keyword_table.cc | |
| parent | b9ca3b91adf91b4679b5df0a12d72a5074fc1a00 (diff) | |
| download | chromium_src-667b1dd812092dc80759c654d439e06882c74474.zip chromium_src-667b1dd812092dc80759c654d439e06882c74474.tar.gz chromium_src-667b1dd812092dc80759c654d439e06882c74474.tar.bz2 | |
Nix TemplateURL::logo_id, EXPLICIT_DEFAULT_PROVIDER, etc.
Remove IDR_SEARCH_ENGINE_LOGO_*, references, and utilities.
These are unused after deprecating the first run search engine ballot.
Remove EXPLICIT_DEFAULT_PROVIDER, ConfirmSetDefaultSearchProvider, and DefaultSearchView.
These are unused after the fix for Issue 100946.
Followup CL TODOs:
TODO(msw|pkasting): Remove KeywordTable's logo_id column.
TODO(msw): Nix chrome/app/theme/google/chrome/search_*.png
TODO(msw): Nix chrome/app/theme/search_engine_top.png
BUG=113248,38475,100946,108206
TEST=none
Review URL: http://codereview.chromium.org/9373049
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@122274 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/webdata/keyword_table.cc')
| -rw-r--r-- | chrome/browser/webdata/keyword_table.cc | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/chrome/browser/webdata/keyword_table.cc b/chrome/browser/webdata/keyword_table.cc index 819959a..e54d243 100644 --- a/chrome/browser/webdata/keyword_table.cc +++ b/chrome/browser/webdata/keyword_table.cc @@ -78,7 +78,7 @@ void BindURLToStatement(const TemplateURL& url, sql::Statement* s) { std::string()); s->BindInt(11, url.prepopulate_id()); s->BindInt(12, url.autogenerate_keyword() ? 1 : 0); - s->BindInt(13, url.logo_id()); + s->BindInt(13, 0); s->BindBool(14, url.created_by_policy()); s->BindString(15, url.instant_url() ? url.instant_url()->url() : std::string()); @@ -561,8 +561,6 @@ void KeywordTable::GetURLFromStatement( url->set_autogenerate_keyword(s.ColumnInt(13) == 1); - url->set_logo_id(s.ColumnInt(14)); - url->set_created_by_policy(s.ColumnBool(15)); url->SetInstantURL(s.ColumnString(16), 0, 0); |