Index: chrome/browser/chromeos/options/options_window_view.cc |
diff --git a/chrome/browser/chromeos/options/options_window_view.cc b/chrome/browser/chromeos/options/options_window_view.cc |
index 1e6580fa2fe5cf3193b18b25e4a83752e4b1a87e..cd66b8af2b6a9c595dee7f12558454af61c494d5 100644 |
--- a/chrome/browser/chromeos/options/options_window_view.cc |
+++ b/chrome/browser/chromeos/options/options_window_view.cc |
@@ -143,6 +143,13 @@ void OptionsWindowView::ShowOptionsPage(OptionsPage page, |
// This will show invisible windows and bring visible windows to the front. |
window()->Show(); |
+ // Show all controls in tab after tab's size is allocated. We have |
+ // to do this after size allocation otherwise WrapLabelAtAllocationHack |
+ // in ContentPageGtk would break. |
+ GtkWidget* notebook = static_cast<views::NativeTabbedPaneGtk*>( |
+ tabs_->native_wrapper())->native_view(); |
+ gtk_widget_show_all(notebook); |
+ |
if (page == OPTIONS_PAGE_DEFAULT) { |
// Remember the last visited page from local state. |
page = static_cast<OptionsPage>(last_selected_page_.GetValue()); |