Chromium Code Reviews| Index: components/search_engines/template_url.cc |
| diff --git a/components/search_engines/template_url.cc b/components/search_engines/template_url.cc |
| index da62aaa3c13bf3af09da2e8888ad0289aa3402da..9e3247d18810a4e9272078d8258faaa44e006f47 100644 |
| --- a/components/search_engines/template_url.cc |
| +++ b/components/search_engines/template_url.cc |
| @@ -1138,8 +1138,12 @@ std::string TemplateURLRef::HandleReplacements( |
| // TemplateURL ---------------------------------------------------------------- |
| TemplateURL::AssociatedExtensionInfo::AssociatedExtensionInfo( |
| - const std::string& extension_id) |
| - : extension_id(extension_id), wants_to_be_default_engine(false) {} |
| + const std::string& extension_id, |
| + base::Time install_time, |
| + bool wants_to_be_default_engine) |
| + : extension_id(extension_id), |
| + install_time(install_time), |
| + wants_to_be_default_engine(wants_to_be_default_engine) {} |
| TemplateURL::AssociatedExtensionInfo::~AssociatedExtensionInfo() { |
| } |
| @@ -1162,6 +1166,21 @@ TemplateURL::TemplateURL(const TemplateURLData& data, Type type) |
| data_.search_terms_replacement_key = google_util::kInstantExtendedAPIParam; |
| } |
| +TemplateURL::TemplateURL(const TemplateURLData& data, |
| + Type type, |
| + std::string extension_id, |
| + base::Time install_time, |
| + bool wants_to_be_default_engine) |
| + : TemplateURL(data, type) { |
| + DCHECK(type == NORMAL_CONTROLLED_BY_EXTENSION || |
| + type == OMNIBOX_API_EXTENSION); |
|
vasilii
2017/04/18 13:48:23
Add "<< type;"
Alexander Yashkin
2017/04/18 14:36:15
Done
|
| + // Omnibox keywords may not be set as default. |
| + DCHECK(!wants_to_be_default_engine || type != OMNIBOX_API_EXTENSION); |
| + DCHECK_EQ(kInvalidTemplateURLID, data.id); |
| + extension_info_ = base::MakeUnique<AssociatedExtensionInfo>( |
| + extension_id, install_time, wants_to_be_default_engine); |
| +} |
| + |
| TemplateURL::~TemplateURL() { |
| } |