| Index: chrome/browser/extensions/external_policy_extension_loader.cc
|
| ===================================================================
|
| --- chrome/browser/extensions/external_policy_extension_loader.cc (revision 91968)
|
| +++ chrome/browser/extensions/external_policy_extension_loader.cc (working copy)
|
| @@ -11,8 +11,8 @@
|
| #include "chrome/common/extensions/extension.h"
|
| #include "chrome/common/pref_names.h"
|
| #include "content/browser/browser_thread.h"
|
| +#include "chrome/common/chrome_notification_types.h"
|
| #include "content/common/notification_service.h"
|
| -#include "content/common/notification_type.h"
|
| #include "googleurl/src/gurl.h"
|
|
|
| namespace {
|
| @@ -41,7 +41,7 @@
|
| pref_change_registrar_.Init(profile_->GetPrefs());
|
| pref_change_registrar_.Add(prefs::kExtensionInstallForceList, this);
|
| notification_registrar_.Add(this,
|
| - NotificationType::PROFILE_DESTROYED,
|
| + chrome::NOTIFICATION_PROFILE_DESTROYED,
|
| Source<Profile>(profile_));
|
| }
|
|
|
| @@ -73,12 +73,12 @@
|
| }
|
|
|
| void ExternalPolicyExtensionLoader::Observe(
|
| - NotificationType type,
|
| + int type,
|
| const NotificationSource& source,
|
| const NotificationDetails& details) {
|
| if (profile_ == NULL) return;
|
| - switch (type.value) {
|
| - case NotificationType::PREF_CHANGED: {
|
| + switch (type) {
|
| + case chrome::NOTIFICATION_PREF_CHANGED: {
|
| if (Source<PrefService>(source).ptr() == profile_->GetPrefs()) {
|
| std::string* pref_name = Details<std::string>(details).ptr();
|
| if (*pref_name == prefs::kExtensionInstallForceList) {
|
| @@ -89,7 +89,7 @@
|
| }
|
| break;
|
| }
|
| - case NotificationType::PROFILE_DESTROYED: {
|
| + case chrome::NOTIFICATION_PROFILE_DESTROYED: {
|
| if (Source<Profile>(source).ptr() == profile_) {
|
| notification_registrar_.RemoveAll();
|
| pref_change_registrar_.RemoveAll();
|
|
|