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

chrome/browser/gtk/options/general_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/general_page_gtk.h"
 
 #include <set>
 #include <vector>
 
 #include "app/l10n_util.h"
@@ skipping 57 matching lines @@
 
 GeneralPageGtk::GeneralPageGtk(Profile* profile)
     : OptionsPageBase(profile),
       template_url_model_(NULL),
       default_search_initializing_(true),
       initializing_(true),
       default_browser_worker_(
           new ShellIntegration::DefaultBrowserWorker(this)),
       managed_prefs_banner_(profile->GetPrefs(), kGeneralManagablePrefs,
                             arraysize(kGeneralManagablePrefs)) {
-  OptionsLayoutBuilderGtk options_builder;
-  page_ = options_builder.get_page_widget();
+  scoped_ptr<OptionsLayoutBuilderGtk>
+    options_builder(OptionsLayoutBuilderGtk::CreateOptionallyCompactLayout());
+  page_ = options_builder->get_page_widget();
   accessible_widget_helper_.reset(new AccessibleWidgetHelper(page_, profile));
 
-  options_builder.AddWidget(managed_prefs_banner_.banner_widget(), false);
-  options_builder.AddOptionGroup(
+  options_builder->AddWidget(managed_prefs_banner_.banner_widget(), false);
+  options_builder->AddOptionGroup(
       l10n_util::GetStringUTF8(IDS_OPTIONS_STARTUP_GROUP_NAME),
       InitStartupGroup(), true);
-  options_builder.AddOptionGroup(
+  options_builder->AddOptionGroup(
       l10n_util::GetStringUTF8(IDS_OPTIONS_HOMEPAGE_GROUP_NAME),
       InitHomepageGroup(), false);
-  options_builder.AddOptionGroup(
+  options_builder->AddOptionGroup(
       l10n_util::GetStringUTF8(IDS_OPTIONS_DEFAULTSEARCH_GROUP_NAME),
       InitDefaultSearchGroup(), false);
 #if !defined(OS_CHROMEOS)
-  options_builder.AddOptionGroup(
+  options_builder->AddOptionGroup(
       l10n_util::GetStringUTF8(IDS_OPTIONS_DEFAULTBROWSER_GROUP_NAME),
       InitDefaultBrowserGroup(), false);
 #endif
 
   profile->GetPrefs()->AddPrefObserver(prefs::kRestoreOnStartup, this);
   profile->GetPrefs()->AddPrefObserver(prefs::kURLsToRestoreOnStartup, this);
 
   new_tab_page_is_home_page_.Init(prefs::kHomePageIsNewTabPage,
       profile->GetPrefs(), this);
   homepage_.Init(prefs::kHomePage, profile->GetPrefs(), this);
@@ skipping 579 matching lines @@
   if (color) {
     char* markup = g_markup_printf_escaped(kDefaultBrowserLabelMarkup,
                                            color, text.c_str());
     gtk_label_set_markup(GTK_LABEL(default_browser_status_label_), markup);
     g_free(markup);
   }
 
   gtk_widget_set_sensitive(default_browser_use_as_default_button_,
                            state == ShellIntegration::STATE_NOT_DEFAULT);
 }