diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-11-20 10:33:36 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-11-22 11:45:12 +0000 |
| commit | be59a35641616a4cf23c4a13fa0632624b021c1b (patch) | |
| tree | 9da183258bdf9cc413f7562079d25ace6955467f /chromium/chrome/browser/extensions/api/omnibox/omnibox_api.cc | |
| parent | d702e4b6a64574e97fc7df8fe3238cde70242080 (diff) | |
BASELINE: Update Chromium to 62.0.3202.101
Change-Id: I2d5eca8117600df6d331f6166ab24d943d9814ac
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'chromium/chrome/browser/extensions/api/omnibox/omnibox_api.cc')
| -rw-r--r-- | chromium/chrome/browser/extensions/api/omnibox/omnibox_api.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/chromium/chrome/browser/extensions/api/omnibox/omnibox_api.cc b/chromium/chrome/browser/extensions/api/omnibox/omnibox_api.cc index 2d9854e29ab..6fcfcfddccd 100644 --- a/chromium/chrome/browser/extensions/api/omnibox/omnibox_api.cc +++ b/chromium/chrome/browser/extensions/api/omnibox/omnibox_api.cc @@ -212,12 +212,11 @@ void OmniboxAPI::OnExtensionLoaded(content::BrowserContext* browser_context, if (!keyword.empty()) { // Load the omnibox icon so it will be ready to display in the URL bar. omnibox_icon_manager_.LoadIcon(profile_, extension); - if (url_service_) { url_service_->Load(); if (url_service_->loaded()) { url_service_->RegisterOmniboxKeyword( - extension->id(), extension->name(), keyword, + extension->id(), extension->short_name(), keyword, GetTemplateURLStringForExtension(extension->id()), ExtensionPrefs::Get(profile_)->GetInstallTime(extension->id())); } else { @@ -249,7 +248,7 @@ void OmniboxAPI::OnTemplateURLsLoaded() { template_url_sub_.reset(); for (const auto* i : pending_extensions_) { url_service_->RegisterOmniboxKeyword( - i->id(), i->name(), OmniboxInfo::GetKeyword(i), + i->id(), i->short_name(), OmniboxInfo::GetKeyword(i), GetTemplateURLStringForExtension(i->id()), ExtensionPrefs::Get(profile_)->GetInstallTime(i->id())); } |