diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-19 03:07:55 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-19 03:07:55 +0000 |
| commit | 86ab86b73e4167c4bcf19c16bf08ca9a780fb48b (patch) | |
| tree | 9154a52a53f85e739c59f43fe34a3cc7963cc06f /chrome/browser/background | |
| parent | fccf2fb4583e78321e5da59dfba0c8b2021f914e (diff) | |
| download | chromium_src-86ab86b73e4167c4bcf19c16bf08ca9a780fb48b.zip chromium_src-86ab86b73e4167c4bcf19c16bf08ca9a780fb48b.tar.gz chromium_src-86ab86b73e4167c4bcf19c16bf08ca9a780fb48b.tar.bz2 | |
Move notification_source from content/common to content/browser/public and put it into the content namespace.
BUG=98716
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@106203 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/background')
| -rw-r--r-- | chrome/browser/background/background_application_list_model.cc | 28 |
1 files changed, 15 insertions, 13 deletions
diff --git a/chrome/browser/background/background_application_list_model.cc b/chrome/browser/background/background_application_list_model.cc index c506fdd..6550ba2 100644 --- a/chrome/browser/background/background_application_list_model.cc +++ b/chrome/browser/background/background_application_list_model.cc @@ -19,8 +19,8 @@ #include "chrome/common/chrome_notification_types.h" #include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_resource.h" -#include "content/common/notification_details.h" -#include "content/common/notification_source.h" +#include "content/public/browser/notification_details.h" +#include "content/public/browser/notification_source.h" #include "ui/base/l10n/l10n_util_collator.h" class ExtensionNameComparator { @@ -155,16 +155,16 @@ BackgroundApplicationListModel::BackgroundApplicationListModel(Profile* profile) DCHECK(profile_); registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_LOADED, - Source<Profile>(profile)); + content::Source<Profile>(profile)); registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_UNLOADED, - Source<Profile>(profile)); + content::Source<Profile>(profile)); registrar_.Add(this, chrome::NOTIFICATION_EXTENSIONS_READY, - Source<Profile>(profile)); + content::Source<Profile>(profile)); registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_PERMISSIONS_UPDATED, - Source<Profile>(profile)); + content::Source<Profile>(profile)); ExtensionService* service = profile->GetExtensionService(); if (service && service->is_ready()) Update(); @@ -254,8 +254,8 @@ bool BackgroundApplicationListModel::IsBackgroundApp( void BackgroundApplicationListModel::Observe( int type, - const NotificationSource& source, - const NotificationDetails& details) { + const content::NotificationSource& source, + const content::NotificationDetails& details) { if (type == chrome::NOTIFICATION_EXTENSIONS_READY) { Update(); return; @@ -266,16 +266,18 @@ void BackgroundApplicationListModel::Observe( switch (type) { case chrome::NOTIFICATION_EXTENSION_LOADED: - OnExtensionLoaded(Details<Extension>(details).ptr()); + OnExtensionLoaded(content::Details<Extension>(details).ptr()); break; case chrome::NOTIFICATION_EXTENSION_UNLOADED: - OnExtensionUnloaded(Details<UnloadedExtensionInfo>(details)->extension); + OnExtensionUnloaded( + content::Details<UnloadedExtensionInfo>(details)->extension); break; case chrome::NOTIFICATION_EXTENSION_PERMISSIONS_UPDATED: OnExtensionPermissionsUpdated( - Details<UpdatedExtensionPermissionsInfo>(details)->extension, - Details<UpdatedExtensionPermissionsInfo>(details)->reason, - Details<UpdatedExtensionPermissionsInfo>(details)->permissions); + content::Details<UpdatedExtensionPermissionsInfo>(details)->extension, + content::Details<UpdatedExtensionPermissionsInfo>(details)->reason, + content::Details<UpdatedExtensionPermissionsInfo>(details)-> + permissions); break; default: NOTREACHED() << "Received unexpected notification"; |