diff options
| author | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-30 16:08:07 +0000 |
|---|---|---|
| committer | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-30 16:08:07 +0000 |
| commit | 9b74ab566e35df5e3b53a461ce53ea43d1177430 (patch) | |
| tree | b52dc38fe8f87f932277be8e9bb9695923d52caf /chrome/browser/ui/search_engines/template_url_table_model.cc | |
| parent | c8ad3ee0076e48d457d0a96207fa8e84791c6e4c (diff) | |
| download | chromium_src-9b74ab566e35df5e3b53a461ce53ea43d1177430.zip chromium_src-9b74ab566e35df5e3b53a461ce53ea43d1177430.tar.gz chromium_src-9b74ab566e35df5e3b53a461ce53ea43d1177430.tar.bz2 | |
Make TemplateURLRefs take an owner TemplateURL* (which must not be NULL). This in turn allows us to avoid passing in TemplateURLs to a few other APIs, and will be critical later when adding Profile*s and keeping URL strings on the owner.
This also moves some definitions in template_url.cc around to match declaration order, and makes the TemplateURL::SupportsReplacement() family of functions non-static.
BUG=none
TEST=none
Review URL: https://chromiumcodereview.appspot.com/9930002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@129864 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/search_engines/template_url_table_model.cc')
| -rw-r--r-- | chrome/browser/ui/search_engines/template_url_table_model.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/ui/search_engines/template_url_table_model.cc b/chrome/browser/ui/search_engines/template_url_table_model.cc index 343ed9a..08af8c6 100644 --- a/chrome/browser/ui/search_engines/template_url_table_model.cc +++ b/chrome/browser/ui/search_engines/template_url_table_model.cc @@ -275,7 +275,7 @@ void TemplateURLTableModel::ModifyTemplateURL(int index, template_url_service_->RemoveObserver(this); template_url_service_->ResetTemplateURL(template_url, title, keyword, url); if (template_url_service_->GetDefaultSearchProvider() == template_url && - !TemplateURL::SupportsReplacement(template_url)) { + !template_url->SupportsReplacement()) { // The entry was the default search provider, but the url has been modified // so that it no longer supports replacement. Reset the default search // provider so that it doesn't point to a bogus entry. |