Merge NOTIFICATION_RENDER_VIEW_HOST_CHANGED into NOTIFICATION_WEB_CONTENTS_SWAPPED.

content/browser/web_contents/web_drag_source_win.cc

 // 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.
 
 #include "content/browser/web_contents/web_drag_source_win.h"
 
 #include "base/bind.h"
 #include "content/browser/renderer_host/render_view_host_impl.h"
 #include "content/browser/web_contents/web_contents_impl.h"
 #include "content/browser/web_contents/web_drag_utils_win.h"
@@ skipping 21 matching lines @@
 ///////////////////////////////////////////////////////////////////////////////
 // WebDragSource, public:
 
 WebDragSource::WebDragSource(gfx::NativeWindow source_wnd,
                              WebContents* web_contents)
     : ui::DragSourceWin(),
       source_wnd_(source_wnd),
       web_contents_(static_cast<WebContentsImpl*>(web_contents)),
       effect_(DROPEFFECT_NONE),
       data_(NULL) {
-  registrar_.Add(this, NOTIFICATION_WEB_CONTENTS_SWAPPED,
+  registrar_.Add(this, NOTIFICATION_RENDER_VIEW_HOST_CHANGED,
                  Source<WebContents>(web_contents));
   registrar_.Add(this, NOTIFICATION_WEB_CONTENTS_DISCONNECTED,
                  Source<WebContents>(web_contents));
 }
 
 WebDragSource::~WebDragSource() {
 }
 
 void WebDragSource::OnDragSourceCancel() {
   // Delegate to the UI thread if we do drag-and-drop in the background thread.
@@ skipping 54 matching lines @@
   gfx::Point client;
   gfx::Point screen;
   GetCursorPositions(source_wnd_, &client, &screen);
   web_contents_->DragSourceMovedTo(client.x(), client.y(),
                                    screen.x(), screen.y());
 }
 
 void WebDragSource::Observe(int type,
                             const NotificationSource& source,
                             const NotificationDetails& details) {
-  if (type == NOTIFICATION_WEB_CONTENTS_SWAPPED) {
+  if (type == NOTIFICATION_RENDER_VIEW_HOST_CHANGED) {
     // When the WebContents get swapped, our render view host goes away.
     // That's OK, we can continue the drag, we just can't send messages back to
     // our drag source.
     web_contents_ = NULL;
   } else if (type == NOTIFICATION_WEB_CONTENTS_DISCONNECTED) {
     // This could be possible when we close the tab and the source is still
     // being used in DoDragDrop at the time that the virtual file is being
     // downloaded.
     web_contents_ = NULL;
   }
 }
 
 }  // namespace content