Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / extensions / api / alarms / alarm_manager.cc

diff --git a/src/chrome/browser/extensions/api/alarms/alarm_manager.cc b/src/chrome/browser/extensions/api/alarms/alarm_manager.cc
index c3d8ac5..cc3267d 100644 (file)
--- a/src/chrome/browser/extensions/api/alarms/alarm_manager.cc
+++ b/src/chrome/browser/extensions/api/alarms/alarm_manager.cc
@@ -49,8 +49,7 @@ class DefaultAlarmDelegate : public AlarmManager::Delegate {
     args->Append(alarm.js_alarm->ToValue().release());
     scoped_ptr<Event> event(new Event(alarms::OnAlarm::kEventName,
                                       args.Pass()));
-    ExtensionSystem::Get(browser_context_)
-        ->event_router()
+    EventRouter::Get(browser_context_)
         ->DispatchEventToExtension(extension_id, event.Pass());
   }
 
@@ -101,7 +100,8 @@ AlarmManager::AlarmManager(content::BrowserContext* context)
     : profile_(Profile::FromBrowserContext(context)),
       clock_(new base::DefaultClock()),
       delegate_(new DefaultAlarmDelegate(context)) {
-  registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_LOADED,
+  registrar_.Add(this,
+                 chrome::NOTIFICATION_EXTENSION_LOADED_DEPRECATED,
                  content::Source<Profile>(profile_));
   registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_UNINSTALLED,
                  content::Source<Profile>(profile_));
@@ -415,7 +415,7 @@ void AlarmManager::Observe(
     const content::NotificationSource& source,
     const content::NotificationDetails& details) {
   switch (type) {
-    case chrome::NOTIFICATION_EXTENSION_LOADED: {
+    case chrome::NOTIFICATION_EXTENSION_LOADED_DEPRECATED: {
       const Extension* extension =
           content::Details<const Extension>(details).ptr();
       StateStore* storage = ExtensionSystem::Get(profile_)->state_store();