Merge NOTIFICATION_RENDER_VIEW_HOST_CHANGED into NOTIFICATION_WEB_CONTENTS_SWAPPED.

content/public/browser/notification_types.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CONTENT_PUBLIC_BROWSER_NOTIFICATION_TYPES_H_
 #define CONTENT_PUBLIC_BROWSER_NOTIFICATION_TYPES_H_
 
 // This file describes various types used to describe and filter notifications
 // that pass through the NotificationService.
 //
@@ skipping 101 matching lines @@
   // This notification is sent when a render view host has connected to a
   // renderer process. The source is a Source<WebContents> with a pointer to
   // the WebContents.  A WEB_CONTENTS_DISCONNECTED notification is
   // guaranteed before the source pointer becomes junk.  No details are
   // expected.
   // DEPRECATED: Use WebContentsObserver::RenderViewReady()
   NOTIFICATION_WEB_CONTENTS_CONNECTED,
 
   // This notification is sent when a WebContents swaps its render view host
   // with another one, possibly changing processes. The source is a
-  // Source<WebContents> with a pointer to the WebContents.  A
-  // NOTIFICATION_WEB_CONTENTS_DISCONNECTED notification is guaranteed before
-  // the source pointer becomes junk.  Details are the RenderViewHost that
-  // has been replaced, or NULL if the old RVH was shut down.
-  // DEPRECATED: Use WebContentsObserver::RenderViewHostSwapped()
-  NOTIFICATION_WEB_CONTENTS_SWAPPED,
+  // Source<WebContents> with a pointer to the WebContents, details is a
+  // std::pair::<old RenderViewHost, new RenderViewHost>.
+  // DEPRECATED: Use WebContentsObserver::RenderViewHostChanged()
+  NOTIFICATION_RENDER_VIEW_HOST_CHANGED,
 
   // This message is sent after a WebContents is disconnected from the
   // renderer process.  The source is a Source<WebContents> with a pointer to
   // the WebContents (the pointer is usable).  No details are expected.
   // DEPRECATED: This is fired in two situations: when the render process
   // crashes, in which case use WebContentsObserver::RenderProcessGone, and when
   // the WebContents is being torn down, in which case use
   // WebContentsObserver::WebContentsDestroyed()
   NOTIFICATION_WEB_CONTENTS_DISCONNECTED,
 
@@ skipping 38 matching lines @@
   // RenderProcessHost might be reused).  The source will be the corresponding
   // RenderProcessHost.  The details will be a RendererClosedDetails struct.
   // This may get sent along with RENDERER_PROCESS_TERMINATED.
   NOTIFICATION_RENDERER_PROCESS_CLOSED,
 
   // Indicates that a render process has become unresponsive for a period of
   // time. The source will be the RenderWidgetHost that corresponds to the
   // hung view, and no details are expected.
   NOTIFICATION_RENDERER_PROCESS_HANG,
 
-  // This is sent to notify that the RenderViewHost displayed in a WebContents
-  // has changed.  Source is the NavigationController for which the change
-  // happened, details is a
-  // std::pair::<old RenderViewHost, new RenderViewHost>).
-  NOTIFICATION_RENDER_VIEW_HOST_CHANGED,
-
   // This is sent when a RenderWidgetHost is being destroyed. The source is
   // the RenderWidgetHost, the details are not used.
   NOTIFICATION_RENDER_WIDGET_HOST_DESTROYED,
 
   // Sent after the backing store has been updated but before the widget has
   // painted. The source is the RenderWidgetHost, the details are not used.
   NOTIFICATION_RENDER_WIDGET_HOST_DID_UPDATE_BACKING_STORE,
 
   // This notifies the observer that a PaintAtSizeACK was received. The source
   // is the RenderWidgetHost, the details are an instance of
@@ skipping 35 matching lines @@
   // the RenderViewHost, and the details is a DomOperationNotificationDetails.
   NOTIFICATION_DOM_OPERATION_RESPONSE,
 
   // Custom notifications used by the embedder should start from here.
   NOTIFICATION_CONTENT_END,
 };
 
 }  // namespace content
 
 #endif  // CONTENT_PUBLIC_BROWSER_NOTIFICATION_TYPES_H_