Revert revisions 47902 and 47900....

views/controls/native/native_view_host_gtk.cc

Index: views/controls/native/native_view_host_gtk.cc
===================================================================
--- views/controls/native/native_view_host_gtk.cc	(revision 47900)
+++ views/controls/native/native_view_host_gtk.cc	(working copy)
@@ -10,7 +10,6 @@
 #include "base/logging.h"
 #include "views/controls/native/native_view_host.h"
 #include "views/focus/focus_manager.h"
-#include "views/widget/gtk_views_fixed.h"
 #include "views/widget/widget_gtk.h"
 
 namespace views {
@@ -229,17 +228,13 @@
     fixed_h = std::min(installed_clip_bounds_.height(), h);
   }
 
-  // Size and place the hosted NativeView. It should be done BEFORE placing
-  // fixed_ itself, otherwise controls will initially appear at 0,0 of fixed_
-  // parent.
-  GtkAllocation alloc = { child_x, child_y, child_w, child_h };
-  gtk_widget_size_allocate(host_->native_view(), &alloc);
-  gtk_views_fixed_set_use_allocated_size(host_->native_view(), true);
-  gtk_fixed_move(GTK_FIXED(fixed_), host_->native_view(), child_x, child_y);
-
   // Size and place the fixed_.
   GetHostWidget()->PositionChild(fixed_, fixed_x, fixed_y, fixed_w, fixed_h);
 
+  // Size and place the hosted NativeView.
+  gtk_widget_set_size_request(host_->native_view(), child_w, child_h);
+  gtk_fixed_move(GTK_FIXED(fixed_), host_->native_view(), child_x, child_y);
+
   gtk_widget_show(fixed_);
   gtk_widget_show(host_->native_view());
 }
@@ -277,7 +272,7 @@
 
   DestroyFixed();
 
-  fixed_ = gtk_views_fixed_new();
+  fixed_ = gtk_fixed_new();
   gtk_widget_set_name(fixed_, "views-native-view-host-fixed");
   gtk_fixed_set_has_window(GTK_FIXED(fixed_), needs_window);
   // Defeat refcounting. We need to own the fixed.