diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2021-05-20 09:47:09 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2021-06-07 11:15:42 +0000 |
| commit | 189d4fd8fad9e3c776873be51938cd31a42b6177 (patch) | |
| tree | 6497caeff5e383937996768766ab3bb2081a40b2 /chromium/chrome/browser/extensions/api/omnibox/omnibox_api.cc | |
| parent | 8bc75099d364490b22f43a7ce366b366c08f4164 (diff) | |
BASELINE: Update Chromium to 90.0.4430.221
Change-Id: Iff4d9d18d2fcf1a576f3b1f453010f744a232920
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@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 | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/chromium/chrome/browser/extensions/api/omnibox/omnibox_api.cc b/chromium/chrome/browser/extensions/api/omnibox/omnibox_api.cc index db7a07d3e8f..da8e7b9e3e6 100644 --- a/chromium/chrome/browser/extensions/api/omnibox/omnibox_api.cc +++ b/chromium/chrome/browser/extensions/api/omnibox/omnibox_api.cc @@ -189,9 +189,9 @@ OmniboxAPI::OmniboxAPI(content::BrowserContext* context) url_service_(TemplateURLServiceFactory::GetForProfile(profile_)) { extension_registry_observer_.Add(ExtensionRegistry::Get(profile_)); if (url_service_) { - template_url_sub_ = url_service_->RegisterOnLoadedCallback( - base::Bind(&OmniboxAPI::OnTemplateURLsLoaded, - base::Unretained(this))); + template_url_subscription_ = + url_service_->RegisterOnLoadedCallback(base::BindOnce( + &OmniboxAPI::OnTemplateURLsLoaded, base::Unretained(this))); } // Use monochrome icons for Omnibox icons. @@ -199,7 +199,7 @@ OmniboxAPI::OmniboxAPI(content::BrowserContext* context) } void OmniboxAPI::Shutdown() { - template_url_sub_.reset(); + template_url_subscription_ = {}; } OmniboxAPI::~OmniboxAPI() { @@ -257,7 +257,7 @@ gfx::Image OmniboxAPI::GetOmniboxIcon(const std::string& extension_id) { void OmniboxAPI::OnTemplateURLsLoaded() { // Register keywords for pending extensions. - template_url_sub_.reset(); + template_url_subscription_ = {}; for (const auto* i : pending_extensions_) { url_service_->RegisterOmniboxKeyword( i->id(), i->short_name(), OmniboxInfo::GetKeyword(i), |