diff options
| -rw-r--r-- | chrome/browser/views/find_bar_host_interactive_uitest.cc | 2 | ||||
| -rw-r--r-- | views/controls/native/native_view_host_gtk.cc | 15 |
2 files changed, 6 insertions, 11 deletions
diff --git a/chrome/browser/views/find_bar_host_interactive_uitest.cc b/chrome/browser/views/find_bar_host_interactive_uitest.cc index 9636a89..2933ad39 100644 --- a/chrome/browser/views/find_bar_host_interactive_uitest.cc +++ b/chrome/browser/views/find_bar_host_interactive_uitest.cc @@ -106,7 +106,7 @@ IN_PROC_BROWSER_TEST_F(FindInPageTest, CrashEscHandlers) { // Click on the location bar so that Find box loses focus. ClickOnView(VIEW_ID_LOCATION_BAR); -#if defined(OS_WIN) +#if defined(TOOLKIT_VIEWS) || defined(OS_WIN) // Check the location bar is focused. EXPECT_EQ(VIEW_ID_LOCATION_BAR, GetFocusedViewID()); #endif diff --git a/views/controls/native/native_view_host_gtk.cc b/views/controls/native/native_view_host_gtk.cc index 40af166..79a144d 100644 --- a/views/controls/native/native_view_host_gtk.cc +++ b/views/controls/native/native_view_host_gtk.cc @@ -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 @@ void NativeViewHostGtk::ShowWidget(int x, int y, int w, int h) { 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 @@ void NativeViewHostGtk::CreateFixed(bool needs_window) { 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. |