| Index: extensions/browser/event_router.cc
|
| diff --git a/extensions/browser/event_router.cc b/extensions/browser/event_router.cc
|
| index 21985b1d74dfaf4cf4384102aa4909c7d9f78aa7..d8ae867e95e33f84371337215429bb324b59ae50 100644
|
| --- a/extensions/browser/event_router.cc
|
| +++ b/extensions/browser/event_router.cc
|
| @@ -11,7 +11,6 @@
|
| #include "base/message_loop/message_loop.h"
|
| #include "base/stl_util.h"
|
| #include "base/values.h"
|
| -#include "chrome/browser/chrome_notification_types.h"
|
| #include "content/public/browser/child_process_security_policy.h"
|
| #include "content/public/browser/notification_service.h"
|
| #include "content/public/browser/render_process_host.h"
|
| @@ -23,6 +22,7 @@
|
| #include "extensions/browser/extension_util.h"
|
| #include "extensions/browser/extensions_browser_client.h"
|
| #include "extensions/browser/lazy_background_task_queue.h"
|
| +#include "extensions/browser/notification_types.h"
|
| #include "extensions/browser/process_manager.h"
|
| #include "extensions/browser/process_map.h"
|
| #include "extensions/common/extension.h"
|
| @@ -174,12 +174,14 @@ EventRouter::EventRouter(BrowserContext* browser_context,
|
| content::NotificationService::AllSources());
|
| registrar_.Add(this, content::NOTIFICATION_RENDERER_PROCESS_CLOSED,
|
| content::NotificationService::AllSources());
|
| - registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_ENABLED,
|
| + registrar_.Add(this,
|
| + extensions::NOTIFICATION_EXTENSION_ENABLED,
|
| content::Source<BrowserContext>(browser_context_));
|
| registrar_.Add(this,
|
| - chrome::NOTIFICATION_EXTENSION_LOADED_DEPRECATED,
|
| + extensions::NOTIFICATION_EXTENSION_LOADED_DEPRECATED,
|
| content::Source<BrowserContext>(browser_context_));
|
| - registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_UNLOADED_DEPRECATED,
|
| + registrar_.Add(this,
|
| + extensions::NOTIFICATION_EXTENSION_UNLOADED_DEPRECATED,
|
| content::Source<BrowserContext>(browser_context_));
|
| }
|
|
|
| @@ -735,7 +737,7 @@ void EventRouter::Observe(int type,
|
| listeners_.RemoveListenersForProcess(renderer);
|
| break;
|
| }
|
| - case chrome::NOTIFICATION_EXTENSION_ENABLED: {
|
| + case extensions::NOTIFICATION_EXTENSION_ENABLED: {
|
| // If the extension has a lazy background page, make sure it gets loaded
|
| // to register the events the extension is interested in.
|
| const Extension* extension =
|
| @@ -748,7 +750,7 @@ void EventRouter::Observe(int type,
|
| }
|
| break;
|
| }
|
| - case chrome::NOTIFICATION_EXTENSION_LOADED_DEPRECATED: {
|
| + case extensions::NOTIFICATION_EXTENSION_LOADED_DEPRECATED: {
|
| // Add all registered lazy listeners to our cache.
|
| const Extension* extension =
|
| content::Details<const Extension>(details).ptr();
|
| @@ -762,7 +764,7 @@ void EventRouter::Observe(int type,
|
| listeners_.LoadFilteredLazyListeners(extension->id(), *filtered_events);
|
| break;
|
| }
|
| - case chrome::NOTIFICATION_EXTENSION_UNLOADED_DEPRECATED: {
|
| + case extensions::NOTIFICATION_EXTENSION_UNLOADED_DEPRECATED: {
|
| // Remove all registered lazy listeners from our cache.
|
| UnloadedExtensionInfo* unloaded =
|
| content::Details<UnloadedExtensionInfo>(details).ptr();
|
|
|