Fix 18949 on GTK ("Options" window does not fit a small display).

chrome/browser/gtk/options/fonts_page_gtk.cc

 // Copyright (c) 2010 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/gtk/options/fonts_page_gtk.h"
 
 #include "app/l10n_util.h"
 #include "app/l10n_util_collator.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/default_encoding_combo_model.h"
@@ skipping 25 matching lines @@
 }  // namespace
 
 FontsPageGtk::FontsPageGtk(Profile* profile) : OptionsPageBase(profile) {
   Init();
 }
 
 FontsPageGtk::~FontsPageGtk() {
 }
 
 void FontsPageGtk::Init() {
-  OptionsLayoutBuilderGtk options_builder;
-
+  scoped_ptr<OptionsLayoutBuilderGtk>
+    options_builder(OptionsLayoutBuilderGtk::Create());
   serif_font_button_ = gtk_font_button_new();
   gtk_font_button_set_use_font(GTK_FONT_BUTTON(serif_font_button_), TRUE);
   gtk_font_button_set_use_size(GTK_FONT_BUTTON(serif_font_button_), TRUE);
   g_signal_connect(serif_font_button_, "font-set",
                    G_CALLBACK(OnSerifFontSetThunk), this);
 
   sans_font_button_ = gtk_font_button_new();
   gtk_font_button_set_use_font(GTK_FONT_BUTTON(sans_font_button_), TRUE);
   gtk_font_button_set_use_size(GTK_FONT_BUTTON(sans_font_button_), TRUE);
   g_signal_connect(sans_font_button_, "font-set",
@@ skipping 10 matching lines @@
           IDS_FONT_LANGUAGE_SETTING_FONT_SELECTOR_SERIF_LABEL).c_str(),
       serif_font_button_,
       l10n_util::GetStringUTF8(
         IDS_FONT_LANGUAGE_SETTING_FONT_SELECTOR_SANS_SERIF_LABEL).c_str(),
       sans_font_button_,
       l10n_util::GetStringUTF8(
         IDS_FONT_LANGUAGE_SETTING_FONT_SELECTOR_FIXED_WIDTH_LABEL).c_str(),
       fixed_font_button_,
       NULL);
 
-  options_builder.AddOptionGroup(l10n_util::GetStringUTF8(
+  options_builder->AddOptionGroup(l10n_util::GetStringUTF8(
         IDS_FONT_LANGUAGE_SETTING_FONT_SUB_DIALOG_FONT_TITLE),
       font_controls, false);
 
   InitDefaultEncodingComboBox();
   std::string encoding_group_description = l10n_util::GetStringUTF8(
       IDS_FONT_LANGUAGE_SETTING_FONT_DEFAULT_ENCODING_SELECTOR_LABEL);
   GtkWidget* encoding_controls = gtk_util::CreateLabeledControlsGroup(NULL,
       encoding_group_description.c_str(),
       default_encoding_combobox_,
       NULL);
-  options_builder.AddOptionGroup(l10n_util::GetStringUTF8(
+  options_builder->AddOptionGroup(l10n_util::GetStringUTF8(
         IDS_FONT_LANGUAGE_SETTING_FONT_SUB_DIALOG_ENCODING_TITLE),
       encoding_controls, false);
 
-  page_ = options_builder.get_page_widget();
+  page_ = options_builder->get_page_widget();
 
   serif_name_.Init(prefs::kWebKitSerifFontFamily, profile()->GetPrefs(), this);
   sans_serif_name_.Init(prefs::kWebKitSansSerifFontFamily,
                         profile()->GetPrefs(), this);
   variable_width_size_.Init(prefs::kWebKitDefaultFontSize,
                             profile()->GetPrefs(), this);
 
   fixed_width_name_.Init(prefs::kWebKitFixedFontFamily, profile()->GetPrefs(),
                          this);
   fixed_width_size_.Init(prefs::kWebKitDefaultFixedFontSize,
@@ skipping 73 matching lines @@
   SetFontsFromButton(&fixed_width_name_,
                      &fixed_width_size_,
                      font_button);
 }
 
 void FontsPageGtk::OnDefaultEncodingChanged(GtkWidget* combo_box) {
   int index = gtk_combo_box_get_active(GTK_COMBO_BOX(combo_box));
   default_encoding_.SetValue(ASCIIToWide(default_encoding_combobox_model_->
       GetEncodingCharsetByIndex(index)));
 }