Index: content/browser/tab_contents/render_view_host_manager.cc |
=================================================================== |
--- content/browser/tab_contents/render_view_host_manager.cc (revision 91968) |
+++ content/browser/tab_contents/render_view_host_manager.cc (working copy) |
@@ -20,7 +20,7 @@ |
#include "content/common/content_client.h" |
#include "content/common/content_switches.h" |
#include "content/common/notification_service.h" |
-#include "content/common/notification_type.h" |
+#include "content/common/content_notification_types.h" |
#include "content/common/url_constants.h" |
#include "content/common/view_messages.h" |
@@ -69,7 +69,7 @@ |
GetControllerForRenderManager().session_storage_namespace()); |
// Keep track of renderer processes as they start to shut down. |
- registrar_.Add(this, NotificationType::RENDERER_PROCESS_CLOSING, |
+ registrar_.Add(this, content::NOTIFICATION_RENDERER_PROCESS_CLOSING, |
NotificationService::AllSources()); |
} |
@@ -114,7 +114,7 @@ |
details.new_host = render_view_host_; |
details.old_host = NULL; |
NotificationService::current()->Notify( |
- NotificationType::RENDER_VIEW_HOST_CHANGED, |
+ content::NOTIFICATION_RENDER_VIEW_HOST_CHANGED, |
Source<NavigationController>( |
&delegate_->GetControllerForRenderManager()), |
Details<RenderViewHostSwitchedDetails>(&details)); |
@@ -314,11 +314,11 @@ |
CancelPending(); |
} |
-void RenderViewHostManager::Observe(NotificationType type, |
+void RenderViewHostManager::Observe(int type, |
const NotificationSource& source, |
const NotificationDetails& details) { |
- switch (type.value) { |
- case NotificationType::RENDERER_PROCESS_CLOSING: |
+ switch (type) { |
+ case content::NOTIFICATION_RENDERER_PROCESS_CLOSING: |
RendererProcessClosing(Source<RenderProcessHost>(source).ptr()); |
break; |
@@ -621,7 +621,7 @@ |
details.new_host = render_view_host_; |
details.old_host = old_render_view_host; |
NotificationService::current()->Notify( |
- NotificationType::RENDER_VIEW_HOST_CHANGED, |
+ content::NOTIFICATION_RENDER_VIEW_HOST_CHANGED, |
Source<NavigationController>(&delegate_->GetControllerForRenderManager()), |
Details<RenderViewHostSwitchedDetails>(&details)); |
@@ -842,7 +842,7 @@ |
details.new_host = render_view_host_; |
details.old_host = old_render_view_host; |
NotificationService::current()->Notify( |
- NotificationType::RENDER_VIEW_HOST_CHANGED, |
+ content::NOTIFICATION_RENDER_VIEW_HOST_CHANGED, |
Source<NavigationController>(&delegate_->GetControllerForRenderManager()), |
Details<RenderViewHostSwitchedDetails>(&details)); |