Merge NOTIFICATION_RENDER_VIEW_HOST_CHANGED into NOTIFICATION_WEB_CONTENTS_SWAPPED.

chrome/browser/ui/gtk/apps/native_app_window_gtk.cc

 // Copyright 2013 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 "chrome/browser/ui/gtk/apps/native_app_window_gtk.h"
 
 #include <gdk/gdkx.h>
 #include <vector>
 
 #include "base/message_loop/message_pump_gtk.h"
@@ skipping 33 matching lines @@
                                        const ShellWindow::CreateParams& params)
     : shell_window_(shell_window),
       window_(NULL),
       state_(GDK_WINDOW_STATE_WITHDRAWN),
       is_active_(false),
       content_thinks_its_fullscreen_(false),
       frameless_(params.frame == ShellWindow::FRAME_NONE),
       frame_cursor_(NULL),
       atom_cache_(base::MessagePumpGtk::GetDefaultXDisplay(), kAtomsToCache),
       is_x_event_listened_(false) {
+  Observe(web_contents());
+
   window_ = GTK_WINDOW(gtk_window_new(GTK_WINDOW_TOPLEVEL));
 
   gfx::NativeView native_view =
       web_contents()->GetView()->GetNativeView();
   gtk_container_add(GTK_CONTAINER(window_), native_view);
 
   if (params.bounds.x() != INT_MIN && params.bounds.y() != INT_MIN)
     gtk_window_move(window_, params.bounds.x(), params.bounds.y());
 
   // This is done to avoid a WM "feature" where setting the window size to
@@ skipping 269 matching lines @@
 }
 
 void NativeAppWindowGtk::FlashFrame(bool flash) {
   gtk_window_set_urgency_hint(window_, flash);
 }
 
 bool NativeAppWindowGtk::IsAlwaysOnTop() const {
   return false;
 }
 
-void NativeAppWindowGtk::RenderViewHostChanged() {
+void NativeAppWindowGtk::RenderViewHostChanged(
+    content::RenderViewHost* old_host,
+    content::RenderViewHost* new_host) {
   web_contents()->GetView()->Focus();
 }
 
 gfx::Insets NativeAppWindowGtk::GetFrameInsets() const {
   if (frameless_)
     return gfx::Insets();
   GdkWindow* gdk_window = gtk_widget_get_window(GTK_WIDGET(window_));
   if (!gdk_window)
     return gfx::Insets();
 
@@ skipping 280 matching lines @@
 }
 
 void NativeAppWindowGtk::UpdateDraggableRegions(
     const std::vector<extensions::DraggableRegion>& regions) {
   // Draggable region is not supported for non-frameless window.
   if (!frameless_)
     return;
 
   draggable_region_.reset(ShellWindow::RawDraggableRegionsToSkRegion(regions));
 }