Merge NOTIFICATION_RENDER_VIEW_HOST_CHANGED into NOTIFICATION_WEB_CONTENTS_SWAPPED.

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

Index: chrome/browser/ui/gtk/apps/native_app_window_gtk.cc
diff --git a/chrome/browser/ui/gtk/apps/native_app_window_gtk.cc b/chrome/browser/ui/gtk/apps/native_app_window_gtk.cc
index 4819a02d757ac70af35222d71f5efa34c8fef23c..aabb38848952c0a88c15101229bbdbbd7e80ea92 100644
--- a/chrome/browser/ui/gtk/apps/native_app_window_gtk.cc
+++ b/chrome/browser/ui/gtk/apps/native_app_window_gtk.cc
@@ -51,6 +51,8 @@ NativeAppWindowGtk::NativeAppWindowGtk(ShellWindow* shell_window,
       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 =
@@ -340,7 +342,9 @@ bool NativeAppWindowGtk::IsAlwaysOnTop() const {
   return false;
 }
 
-void NativeAppWindowGtk::RenderViewHostChanged() {
+void NativeAppWindowGtk::RenderViewHostChanged(
+    content::RenderViewHost* old_host,
+    content::RenderViewHost* new_host) {
   web_contents()->GetView()->Focus();
 }