summaryrefslogtreecommitdiffstats
path: root/chromium/chrome/browser/extensions/api/omnibox
diff options
context:
space:
mode:
Diffstat (limited to 'chromium/chrome/browser/extensions/api/omnibox')
-rw-r--r--chromium/chrome/browser/extensions/api/omnibox/omnibox_api.cc4
-rw-r--r--chromium/chrome/browser/extensions/api/omnibox/omnibox_api.h4
2 files changed, 3 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 7438cd81785..25f06908256 100644
--- a/chromium/chrome/browser/extensions/api/omnibox/omnibox_api.cc
+++ b/chromium/chrome/browser/extensions/api/omnibox/omnibox_api.cc
@@ -26,7 +26,6 @@
#include "extensions/browser/event_router.h"
#include "extensions/browser/extension_prefs.h"
#include "extensions/browser/extension_prefs_factory.h"
-#include "extensions/browser/extension_registry.h"
#include "extensions/browser/notification_types.h"
#include "ui/gfx/image/image.h"
@@ -187,8 +186,7 @@ void ExtensionOmniboxEventRouter::OnDeleteSuggestion(
OmniboxAPI::OmniboxAPI(content::BrowserContext* context)
: profile_(Profile::FromBrowserContext(context)),
- url_service_(TemplateURLServiceFactory::GetForProfile(profile_)),
- extension_registry_observer_(this) {
+ url_service_(TemplateURLServiceFactory::GetForProfile(profile_)) {
extension_registry_observer_.Add(ExtensionRegistry::Get(profile_));
if (url_service_) {
template_url_sub_ = url_service_->RegisterOnLoadedCallback(
diff --git a/chromium/chrome/browser/extensions/api/omnibox/omnibox_api.h b/chromium/chrome/browser/extensions/api/omnibox/omnibox_api.h
index 435ea6456f9..9a648b7e6fb 100644
--- a/chromium/chrome/browser/extensions/api/omnibox/omnibox_api.h
+++ b/chromium/chrome/browser/extensions/api/omnibox/omnibox_api.h
@@ -18,6 +18,7 @@
#include "components/omnibox/browser/autocomplete_match.h"
#include "components/search_engines/template_url_service.h"
#include "extensions/browser/browser_context_keyed_api_factory.h"
+#include "extensions/browser/extension_registry.h"
#include "extensions/browser/extension_registry_observer.h"
#include "ui/base/window_open_disposition.h"
@@ -35,7 +36,6 @@ class Image;
}
namespace extensions {
-class ExtensionRegistry;
// Event router class for events related to the omnibox API.
class ExtensionOmniboxEventRouter {
@@ -134,7 +134,7 @@ class OmniboxAPI : public BrowserContextKeyedAPI,
// Listen to extension load, unloaded notifications.
ScopedObserver<ExtensionRegistry, ExtensionRegistryObserver>
- extension_registry_observer_;
+ extension_registry_observer_{this};
// Keeps track of favicon-sized omnibox icons for extensions.
ExtensionIconManager omnibox_icon_manager_;