diff options
| author | levin@chromium.org <levin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-27 22:55:56 +0000 |
|---|---|---|
| committer | levin@chromium.org <levin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-27 22:55:56 +0000 |
| commit | 774ef485a6f050b3ab9a8d360ff2de419a82d510 (patch) | |
| tree | db0b7f1d4ab943239186531f345e9016c9339db4 /chrome/browser/search_engines/template_url.cc | |
| parent | 192b9a0cc09f62b26b1435d1ce88a257d36fb992 (diff) | |
| download | chromium_src-774ef485a6f050b3ab9a8d360ff2de419a82d510.zip chromium_src-774ef485a6f050b3ab9a8d360ff2de419a82d510.tar.gz chromium_src-774ef485a6f050b3ab9a8d360ff2de419a82d510.tar.bz2 | |
Address feedback regarding r57641.
BUG=53557
TEST=unit_tests --gtest_filter=TemplateURLModelTest.LoadDoesAutoKeywordUpdate
Review URL: http://codereview.chromium.org/3237002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@57743 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/search_engines/template_url.cc')
| -rw-r--r-- | chrome/browser/search_engines/template_url.cc | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/chrome/browser/search_engines/template_url.cc b/chrome/browser/search_engines/template_url.cc index 4c32797..a289826f 100644 --- a/chrome/browser/search_engines/template_url.cc +++ b/chrome/browser/search_engines/template_url.cc @@ -583,13 +583,17 @@ void TemplateURL::set_keyword(const std::wstring& keyword) { } const std::wstring& TemplateURL::keyword() const { + EnsureKeyword(); + return keyword_; +} + +void TemplateURL::EnsureKeyword() const { if (autogenerate_keyword_ && !keyword_generated_) { // Generate a keyword and cache it. keyword_ = TemplateURLModel::GenerateKeyword( TemplateURLModel::GenerateSearchURL(this).GetWithEmptyPath(), true); keyword_generated_ = true; } - return keyword_; } bool TemplateURL::ShowInDefaultList() const { |