diff options
Diffstat (limited to 'chrome/browser/extensions/extension_toolbar_model.cc')
-rw-r--r-- | chrome/browser/extensions/extension_toolbar_model.cc | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/chrome/browser/extensions/extension_toolbar_model.cc b/chrome/browser/extensions/extension_toolbar_model.cc index b21b63c..ef2d276 100644 --- a/chrome/browser/extensions/extension_toolbar_model.cc +++ b/chrome/browser/extensions/extension_toolbar_model.cc @@ -20,14 +20,14 @@ ExtensionToolbarModel::ExtensionToolbarModel(ExtensionService* service) DCHECK(service_); registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_LOADED, - Source<Profile>(service_->profile())); + content::Source<Profile>(service_->profile())); registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_UNLOADED, - Source<Profile>(service_->profile())); + content::Source<Profile>(service_->profile())); registrar_.Add(this, chrome::NOTIFICATION_EXTENSIONS_READY, - Source<Profile>(service_->profile())); + content::Source<Profile>(service_->profile())); registrar_.Add( this, chrome::NOTIFICATION_EXTENSION_BROWSER_ACTION_VISIBILITY_CHANGED, - Source<ExtensionPrefs>(service_->extension_prefs())); + content::Source<ExtensionPrefs>(service_->extension_prefs())); visible_icon_count_ = prefs_->GetInteger(prefs::kExtensionToolbarSize); } @@ -80,9 +80,10 @@ void ExtensionToolbarModel::SetVisibleIconCount(int count) { prefs_->ScheduleSavePersistentPrefs(); } -void ExtensionToolbarModel::Observe(int type, - const NotificationSource& source, - const NotificationDetails& details) { +void ExtensionToolbarModel::Observe( + int type, + const content::NotificationSource& source, + const content::NotificationDetails& details) { if (type == chrome::NOTIFICATION_EXTENSIONS_READY) { InitializeExtensionList(); return; @@ -93,9 +94,9 @@ void ExtensionToolbarModel::Observe(int type, const Extension* extension = NULL; if (type == chrome::NOTIFICATION_EXTENSION_UNLOADED) { - extension = Details<UnloadedExtensionInfo>(details)->extension; + extension = content::Details<UnloadedExtensionInfo>(details)->extension; } else { - extension = Details<const Extension>(details).ptr(); + extension = content::Details<const Extension>(details).ptr(); } if (type == chrome::NOTIFICATION_EXTENSION_LOADED) { // We don't want to add the same extension twice. It may have already been |