diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-04-05 17:15:33 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-04-11 07:47:18 +0000 |
commit | 7324afb043a0b1e623d8e8eb906cdc53bdeb4685 (patch) | |
tree | a3fe2d74ea9c9e142c390dac4ca0e219382ace46 /chromium/chrome/browser/extensions/api/omnibox/omnibox_api.cc | |
parent | 6a4cabb866f66d4128a97cdc6d9d08ce074f1247 (diff) |
BASELINE: Update Chromium to 58.0.3029.54
Change-Id: I67f57065a7afdc8e4614adb5c0230281428df4d1
Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
Diffstat (limited to 'chromium/chrome/browser/extensions/api/omnibox/omnibox_api.cc')
-rw-r--r-- | chromium/chrome/browser/extensions/api/omnibox/omnibox_api.cc | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/chromium/chrome/browser/extensions/api/omnibox/omnibox_api.cc b/chromium/chrome/browser/extensions/api/omnibox/omnibox_api.cc index d954ed0be43..b98495012a7 100644 --- a/chromium/chrome/browser/extensions/api/omnibox/omnibox_api.cc +++ b/chromium/chrome/browser/extensions/api/omnibox/omnibox_api.cc @@ -113,7 +113,7 @@ bool ExtensionOmniboxEventRouter::OnInputChanged( std::unique_ptr<base::ListValue> args(new base::ListValue()); args->Set(0, new base::StringValue(input)); - args->Set(1, new base::FundamentalValue(suggest_id)); + args->Set(1, new base::Value(suggest_id)); std::unique_ptr<Event> event = base::MakeUnique<Event>( events::OMNIBOX_ON_INPUT_CHANGED, omnibox::OnInputChanged::kEventName, @@ -219,7 +219,8 @@ void OmniboxAPI::OnExtensionLoaded(content::BrowserContext* browser_context, if (url_service_->loaded()) { url_service_->RegisterOmniboxKeyword( extension->id(), extension->name(), keyword, - GetTemplateURLStringForExtension(extension->id())); + GetTemplateURLStringForExtension(extension->id()), + ExtensionPrefs::Get(profile_)->GetInstallTime(extension->id())); } else { pending_extensions_.insert(extension); } @@ -247,11 +248,11 @@ gfx::Image OmniboxAPI::GetOmniboxIcon(const std::string& extension_id) { void OmniboxAPI::OnTemplateURLsLoaded() { // Register keywords for pending extensions. template_url_sub_.reset(); - for (PendingExtensions::const_iterator i(pending_extensions_.begin()); - i != pending_extensions_.end(); ++i) { + for (const auto* i : pending_extensions_) { url_service_->RegisterOmniboxKeyword( - (*i)->id(), (*i)->name(), OmniboxInfo::GetKeyword(*i), - GetTemplateURLStringForExtension((*i)->id())); + i->id(), i->name(), OmniboxInfo::GetKeyword(i), + GetTemplateURLStringForExtension(i->id()), + ExtensionPrefs::Get(profile_)->GetInstallTime(i->id())); } pending_extensions_.clear(); } |