| Index: chrome/browser/extensions/user_script_master.cc
|
| ===================================================================
|
| --- chrome/browser/extensions/user_script_master.cc (revision 91771)
|
| +++ chrome/browser/extensions/user_script_master.cc (working copy)
|
| @@ -16,6 +16,7 @@
|
| #include "base/version.h"
|
| #include "chrome/browser/extensions/extension_service.h"
|
| #include "chrome/browser/profiles/profile.h"
|
| +#include "chrome/common/chrome_notification_types.h"
|
| #include "chrome/common/extensions/extension.h"
|
| #include "chrome/common/extensions/extension_messages.h"
|
| #include "chrome/common/extensions/extension_resource.h"
|
| @@ -250,11 +251,11 @@
|
| : extensions_service_ready_(false),
|
| pending_load_(false),
|
| profile_(profile) {
|
| - registrar_.Add(this, NotificationType::EXTENSIONS_READY,
|
| + registrar_.Add(this, chrome::EXTENSIONS_READY,
|
| Source<Profile>(profile_));
|
| - registrar_.Add(this, NotificationType::EXTENSION_LOADED,
|
| + registrar_.Add(this, chrome::EXTENSION_LOADED,
|
| Source<Profile>(profile_));
|
| - registrar_.Add(this, NotificationType::EXTENSION_UNLOADED,
|
| + registrar_.Add(this, chrome::EXTENSION_UNLOADED,
|
| Source<Profile>(profile_));
|
| registrar_.Add(this, NotificationType::RENDERER_PROCESS_CREATED,
|
| NotificationService::AllSources());
|
| @@ -286,7 +287,7 @@
|
| }
|
|
|
| NotificationService::current()->Notify(
|
| - NotificationType::USER_SCRIPTS_UPDATED,
|
| + chrome::USER_SCRIPTS_UPDATED,
|
| Source<Profile>(profile_),
|
| Details<base::SharedMemory>(handle));
|
| }
|
| @@ -297,11 +298,11 @@
|
| const NotificationDetails& details) {
|
| bool should_start_load = false;
|
| switch (type.value) {
|
| - case NotificationType::EXTENSIONS_READY:
|
| + case chrome::EXTENSIONS_READY:
|
| extensions_service_ready_ = true;
|
| should_start_load = true;
|
| break;
|
| - case NotificationType::EXTENSION_LOADED: {
|
| + case chrome::EXTENSION_LOADED: {
|
| // Add any content scripts inside the extension.
|
| const Extension* extension = Details<const Extension>(details).ptr();
|
| bool incognito_enabled = profile_->GetExtensionService()->
|
| @@ -316,7 +317,7 @@
|
| should_start_load = true;
|
| break;
|
| }
|
| - case NotificationType::EXTENSION_UNLOADED: {
|
| + case chrome::EXTENSION_UNLOADED: {
|
| // Remove any content scripts.
|
| const Extension* extension =
|
| Details<UnloadedExtensionInfo>(details)->extension;
|
|
|