Merge NOTIFICATION_RENDER_VIEW_HOST_CHANGED into NOTIFICATION_WEB_CONTENTS_SWAPPED.

ui/views/controls/webview/webview.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 "ui/views/controls/webview/webview.h"
 
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_registrar.h"
@@ skipping 143 matching lines @@
   else
     return preferred_size_;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // WebView, content::NotificationObserver implementation:
 
 void WebView::Observe(int type,
                       const content::NotificationSource& source,
                       const content::NotificationDetails& details) {
-  if (type == content::NOTIFICATION_RENDER_VIEW_HOST_CHANGED) {
+  if (type == content::NOTIFICATION_WEB_CONTENTS_SWAPPED) {
     std::pair<content::RenderViewHost*, content::RenderViewHost*>*
         switched_details =
             content::Details<std::pair<content::RenderViewHost*,
                                        content::RenderViewHost*> >(
                 details).ptr();
     RenderViewHostChanged(switched_details->first,
                           switched_details->second);
   } else if (type == content::NOTIFICATION_WEB_CONTENTS_DESTROYED) {
     WebContentsDestroyed(content::Source<content::WebContents>(source).ptr());
   } else {
@@ skipping 48 matching lines @@
 
     // The WebContentsView will not be focused automatically when it is
     // attached, so we need to pass on focus to it if the FocusManager thinks
     // the WebView is focused. Note that not every Widget has a focus manager.
     FocusManager* focus_manager = GetFocusManager();
     if (focus_manager && focus_manager->GetFocusedView() == this)
       web_contents_->GetView()->Focus();
 
     registrar_.Add(
         this,
-        content::NOTIFICATION_RENDER_VIEW_HOST_CHANGED,
-        content::Source<content::NavigationController>(
-            &web_contents_->GetController()));
+        content::NOTIFICATION_WEB_CONTENTS_SWAPPED,
+        content::Source<content::WebContents>(web_contents_));
     registrar_.Add(
         this,
         content::NOTIFICATION_WEB_CONTENTS_DESTROYED,
         content::Source<content::WebContents>(web_contents_));
   }
 
 #if defined(OS_WIN) && defined(USE_AURA)
   web_contents_->SetParentNativeViewAccessible(
       parent()->GetNativeViewAccessible());
 #endif
@@ skipping 41 matching lines @@
   if (!contents) {
     content::WebContents::CreateParams create_params(
         browser_context, site_instance);
     return content::WebContents::Create(create_params);
   }
 
   return contents;
 }
 
 }  // namespace views