| Index: chrome/browser/background/background_application_list_model.cc
|
| diff --git a/chrome/browser/background/background_application_list_model.cc b/chrome/browser/background/background_application_list_model.cc
|
| index 7945c4fb47ba99b807b824143e9c6109a5e41dac..50c426b7a0129c93b50c99efdfc459428956b71b 100644
|
| --- a/chrome/browser/background/background_application_list_model.cc
|
| +++ b/chrome/browser/background/background_application_list_model.cc
|
| @@ -27,6 +27,7 @@
|
| #include "extensions/browser/extension_system.h"
|
| #include "extensions/browser/extension_util.h"
|
| #include "extensions/browser/image_loader.h"
|
| +#include "extensions/browser/notification_types.h"
|
| #include "extensions/common/extension.h"
|
| #include "extensions/common/extension_icon_set.h"
|
| #include "extensions/common/extension_resource.h"
|
| @@ -179,16 +180,16 @@ BackgroundApplicationListModel::BackgroundApplicationListModel(Profile* profile)
|
| ready_(false) {
|
| DCHECK(profile_);
|
| registrar_.Add(this,
|
| - chrome::NOTIFICATION_EXTENSION_LOADED_DEPRECATED,
|
| + extensions::NOTIFICATION_EXTENSION_LOADED_DEPRECATED,
|
| content::Source<Profile>(profile));
|
| registrar_.Add(this,
|
| - chrome::NOTIFICATION_EXTENSION_UNLOADED_DEPRECATED,
|
| + extensions::NOTIFICATION_EXTENSION_UNLOADED_DEPRECATED,
|
| content::Source<Profile>(profile));
|
| registrar_.Add(this,
|
| - chrome::NOTIFICATION_EXTENSIONS_READY,
|
| + extensions::NOTIFICATION_EXTENSIONS_READY_DEPRECATED,
|
| content::Source<Profile>(profile));
|
| registrar_.Add(this,
|
| - chrome::NOTIFICATION_EXTENSION_PERMISSIONS_UPDATED,
|
| + extensions::NOTIFICATION_EXTENSION_PERMISSIONS_UPDATED,
|
| content::Source<Profile>(profile));
|
| registrar_.Add(this,
|
| chrome::NOTIFICATION_BACKGROUND_CONTENTS_SERVICE_CHANGED,
|
| @@ -353,7 +354,7 @@ void BackgroundApplicationListModel::Observe(
|
| int type,
|
| const content::NotificationSource& source,
|
| const content::NotificationDetails& details) {
|
| - if (type == chrome::NOTIFICATION_EXTENSIONS_READY) {
|
| + if (type == extensions::NOTIFICATION_EXTENSIONS_READY_DEPRECATED) {
|
| Update();
|
| ready_ = true;
|
| return;
|
| @@ -364,14 +365,14 @@ void BackgroundApplicationListModel::Observe(
|
| return;
|
|
|
| switch (type) {
|
| - case chrome::NOTIFICATION_EXTENSION_LOADED_DEPRECATED:
|
| + case extensions::NOTIFICATION_EXTENSION_LOADED_DEPRECATED:
|
| OnExtensionLoaded(content::Details<Extension>(details).ptr());
|
| break;
|
| - case chrome::NOTIFICATION_EXTENSION_UNLOADED_DEPRECATED:
|
| + case extensions::NOTIFICATION_EXTENSION_UNLOADED_DEPRECATED:
|
| OnExtensionUnloaded(
|
| content::Details<UnloadedExtensionInfo>(details)->extension);
|
| break;
|
| - case chrome::NOTIFICATION_EXTENSION_PERMISSIONS_UPDATED:
|
| + case extensions::NOTIFICATION_EXTENSION_PERMISSIONS_UPDATED:
|
| OnExtensionPermissionsUpdated(
|
| content::Details<UpdatedExtensionPermissionsInfo>(details)->extension,
|
| content::Details<UpdatedExtensionPermissionsInfo>(details)->reason,
|
|
|